From e94f8f83517641b59c3a20b53eb94b80f0b7ef72 Mon Sep 17 00:00:00 2001
From: Erik Winlof <erik.winlof@alfresco.com>
Date: Wed, 3 Sep 2014 12:13:50 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    78429:
 Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       75801: ACE-2149: EOL
 AVM / WCM        - Thorough sweep of 'avm' and 'wcm' references        -
 Picked up on many 'deployment' and related classes and configuration        -
 Repo starts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/action-services-context.xml   |   53 -
 config/alfresco/application-context-core.xml  |    5 -
 config/alfresco/bootstrap-context.xml         |   10 -
 .../bootstrap/customMessagesSpace.xml         |    2 +-
 .../customWebClientExtensionSpace.xml         |    2 +-
 config/alfresco/bootstrap/webScripts.xml      |   82 +-
 .../bootstrap/webScriptsExtensions.xml        |    2 +-
 .../alfresco/bootstrap/webScriptsReadme.xml   |    4 +-
 .../webscripts/avmbrowse.get.desc.xml         |    8 -
 .../webscripts/avmbrowse.get.html.ftl         |   31 -
 .../bootstrap/webscripts/avmbrowse.get.js     |   36 -
 .../webscripts/avmstores.get.desc.xml         |    8 -
 .../webscripts/avmstores.get.html.ftl         |   18 -
 config/alfresco/cache-context.xml             |   33 -
 config/alfresco/clt-context.xml               |   83 --
 config/alfresco/core-services-context.xml     |   78 +-
 .../alfresco/deployment-service-context.xml   |  170 ---
 .../patch-common-SqlMap.xml                   |   26 -
 .../permissions-common-SqlMap.xml             |    9 -
 config/alfresco/import-export-context.xml     |   41 -
 .../model-specific-services-context.xml       |    1 -
 config/alfresco/model/applicationModel.xml    |    1 -
 config/alfresco/model/contentModel.xml        |    4 +-
 .../alfresco/model/permissionDefinitions.xml  |   86 --
 config/alfresco/model/wcmAppModel.xml         |  669 ----------
 config/alfresco/model/wcmModel.xml            |   81 --
 config/alfresco/node-services-context.xml     |   18 -
 config/alfresco/remote-avm-test-context.xml   |   99 --
 config/alfresco/remote-services-context.xml   |   67 -
 config/alfresco/script-services-context.xml   |   18 -
 .../Search/common-search-context.xml          |   35 -
 .../Search/lucene/bootstrap-context.xml       |    8 -
 .../Search/lucene/index-recovery-context.xml  |   64 -
 .../Search/lucene/index-recovery.properties   |    1 -
 .../Search/lucene/lucene-search-context.xml   |   95 --
 .../Search/lucene/opencmis-context.xml        |    6 -
 .../Search/noindex/noindex-search-context.xml |    6 -
 .../Search/solr/solr-search-context.xml       |    6 -
 .../mail-template-services-context.xml        |    9 -
 .../default/file-servers-context.xml          |   18 -
 .../default/file-servers.properties           |    8 -
 .../default/network-protocol-context.xml      |   23 -
 .../deployment-receiver-context.properties    |    4 -
 .../default/deployment-receiver-context.xml   |   72 --
 config/alfresco/template-services-context.xml |    9 -
 .../templates/following-email-templates.xml   |    2 +-
 .../templates/invite-email-templates.xml      |   14 +-
 .../alfresco/templates/new-user-templates.xml |   14 +-
 .../templates/notify_email_templates.xml      |   14 +-
 config/alfresco/templates/readme_template.xml |    2 +-
 .../AbstractServerConfigurationBean.java      |   23 -
 .../filesys/AlfrescoConfigSection.java        |   15 -
 .../filesys/NfsServerNodeMonitor.java         |    2 +-
 .../filesys/alfresco/AlfrescoDiskDriver.java  |   11 -
 .../repo/action/ActionServiceRemote.java      |  242 ----
 .../CopyToWebProjectActionExecuter.java       |  128 --
 .../admin/IndexConfigurationCheckerImpl.java  |    1 -
 .../repo/admin/Log4JHierarchyInit.java        |   15 +-
 .../impl/AuthorityDefaultZonesPatch.java      |    4 -
 .../patch/impl/ContentUrlConverterPatch.java  |  119 +-
 .../alfresco/repo/dictionary/TestModel.java   |    2 -
 .../alfresco/repo/domain/PropertyValue.java   | 1124 -----------------
 .../repo/domain/node/AbstractNodeDAOImpl.java |    2 +-
 .../permissions/AbstractAclCrudDAOImpl.java   |   15 +-
 .../repo/domain/permissions/AclCrudDAO.java   |    1 -
 .../repo/domain/permissions/AclDAO.java       |    4 +-
 .../repo/domain/permissions/AclDAOImpl.java   |   29 +-
 .../permissions/ibatis/AclCrudDAOImpl.java    |   16 -
 .../propval/AbstractPropertyValueDAOImpl.java |    5 +-
 .../repo/domain/schema/SchemaBootstrap.java   |    3 +-
 .../org/alfresco/repo/jscript/Search.java     |    6 +-
 .../repo/node/db/DbNodeServiceImpl.java       |   10 -
 .../node/index/AbstractReindexComponent.java  |    7 -
 .../search/impl/lucene/index/IndexInfo.java   |  222 ----
 .../alfresco/repo/site/SiteServiceImpl.java   |    6 +-
 .../org/alfresco/repo/template/Workflow.java  |    6 -
 .../cmr/security/AuthorityService.java        |    5 -
 .../util/RuntimeSystemPropertiesSetter.java   |    7 -
 .../util/schemacomp/MultiFileDumper.java      |    4 +-
 .../org/alfresco/filesys/FTPServerTest.java   |   13 -
 .../dictionary/RepoDictionaryDAOTest.java     |    2 -
 .../repo/domain/PropertyValueTest.java        |   89 --
 .../script/ScriptAuthorityServiceTest.java    |   18 -
 .../impl/model/PermissionModelTest.java       |    7 +-
 .../extension/model/testContentModel.xml      |    4 +-
 source/test-resources/jbpm-test/jbpm.cfg.xml  |    1 -
 .../test-resources/test/alfresco/jbpm.cfg.xml |    1 -
 .../test/alfresco/model/testWcmModel.xml      |   24 -
 .../wcm-template-node-test-context.xml        |   24 -
 source/test-resources/wcm/jbpm.cfg.xml        |   83 --
 source/test-resources/wcm/small-61-items.zip  |  Bin 10044 -> 0 bytes
 .../test-resources/wcm/wcm-jbpm-context.xml   |   11 -
 .../wcm/wcm-test-preview-context.xml          |   22 -
 93 files changed, 62 insertions(+), 4426 deletions(-)
 delete mode 100644 config/alfresco/bootstrap/webscripts/avmbrowse.get.desc.xml
 delete mode 100644 config/alfresco/bootstrap/webscripts/avmbrowse.get.html.ftl
 delete mode 100644 config/alfresco/bootstrap/webscripts/avmbrowse.get.js
 delete mode 100644 config/alfresco/bootstrap/webscripts/avmstores.get.desc.xml
 delete mode 100644 config/alfresco/bootstrap/webscripts/avmstores.get.html.ftl
 delete mode 100644 config/alfresco/clt-context.xml
 delete mode 100644 config/alfresco/deployment-service-context.xml
 delete mode 100644 config/alfresco/model/wcmAppModel.xml
 delete mode 100644 config/alfresco/model/wcmModel.xml
 delete mode 100644 config/alfresco/remote-avm-test-context.xml
 delete mode 100644 config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.properties
 delete mode 100644 config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.xml
 delete mode 100644 source/java/org/alfresco/repo/action/ActionServiceRemote.java
 delete mode 100644 source/java/org/alfresco/repo/action/executer/CopyToWebProjectActionExecuter.java
 delete mode 100644 source/java/org/alfresco/repo/domain/PropertyValue.java
 delete mode 100644 source/test-java/org/alfresco/repo/domain/PropertyValueTest.java
 delete mode 100644 source/test-resources/test/alfresco/model/testWcmModel.xml
 delete mode 100644 source/test-resources/test/alfresco/wcm-template-node-test-context.xml
 delete mode 100644 source/test-resources/wcm/jbpm.cfg.xml
 delete mode 100644 source/test-resources/wcm/small-61-items.zip
 delete mode 100644 source/test-resources/wcm/wcm-jbpm-context.xml
 delete mode 100644 source/test-resources/wcm/wcm-test-preview-context.xml

diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index 6bde8c757e..0c0b5d7cba 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -424,15 +424,6 @@
         <property name="checkOutCheckInService" ref="CheckOutCheckInService" />
     </bean>
     
-    <bean id="copy-to-web-project" class="org.alfresco.repo.action.executer.CopyToWebProjectActionExecuter" parent="action-executer">
-        <property name="nodeService">
-            <ref bean="NodeService" />
-        </property>
-        <property name="crossRepositoryCopyService">
-            <ref bean="CrossRepositoryCopyService" />
-        </property>
-    </bean>
-
     <bean id="move" class="org.alfresco.repo.action.executer.MoveActionExecuter" parent="action-executer">
         <property name="nodeService" ref="NodeService" />
         <property name="fileFolderService">
@@ -623,50 +614,6 @@
         </property>
     </bean>
     
-    <!-- deprecated - see "wcm-submit" (wcm-services-context.xml) -->
-
-    <!-- deprecated - note: still used by Web-Client (*Deploy*) -->
-    <bean id="avm-deploy-website" class="org.alfresco.repo.avm.actions.AVMDeployWebsiteAction" parent="action-executer">
-      
-      <!--  Run avm-deploy-website action on the deployment queue -->
-      <property name="queueName">
-          <value>deployment</value>
-      </property>    
-      <property name="deploymentService">
-            <ref bean="DeploymentService"/>
-      </property>
-      <property name="transactionService">
-            <ref bean="TransactionService"/>
-      </property>
-      <property name="contentService">
-          <ref bean="ContentService"/>
-      </property>
-      <property name="nodeService">
-          <ref bean="NodeService"/>
-      </property>
-      <property name="publicAction">
-            <value>false</value>
-      </property>
-      <property name="defaultRemoteUsername">
-         <value>admin</value>
-      </property>
-      <property name="defaultRemotePassword">
-         <value>admin</value>
-      </property>
-      <property name="defaultAlfrescoRmiPort">
-         <value>${alfresco.rmi.services.port}</value>
-      </property>
-      <property name="defaultReceiverRmiPort">
-         <value>44100</value>
-      </property>
-      <property name="defaultTargetName">
-         <value>default</value>
-      </property>
-      <property name="delay">
-         <value>30</value>
-      </property>
-    </bean>
-    
     <bean id="count-children" class="org.alfresco.repo.action.executer.CountChildrenActionExecuter" parent="action-executer">
       <property name="nodeService">
           <ref bean="NodeService"/>
diff --git a/config/alfresco/application-context-core.xml b/config/alfresco/application-context-core.xml
index ad699fc394..d0ba295912 100644
--- a/config/alfresco/application-context-core.xml
+++ b/config/alfresco/application-context-core.xml
@@ -37,13 +37,8 @@
     <import resource="classpath:alfresco/bootstrap-context.xml" />
     <import resource="classpath:alfresco/repo-admin-context.xml"/>
     <import resource="classpath:alfresco/workflow-context.xml" />
-    <!-- Sparta: disable/remove WCM/AVM
-    <import resource="classpath:alfresco/avm-services-context.xml" />
-    <import resource="classpath:alfresco/wcm-services-context.xml"/>
-    -->
     <import resource="classpath:alfresco/audit-services-context.xml" />
     <import resource="classpath:alfresco/attributes-service-context.xml"/>
-    <import resource="classpath:alfresco/deployment-service-context.xml"/>
     <import resource="classpath:alfresco/site-services-context.xml"/>
     <import resource="classpath:alfresco/notification-services-context.xml"/>
     <import resource="classpath:alfresco/activities/activities-feed-context.xml" />
diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 4ae6581ac4..baa44825c0 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -101,12 +101,9 @@
        </property>
        <property name="schemaReferenceUrls">
           <list>
-             <!-- Sparta: ignore schema reference for now
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/Schema-Reference-ALF.xml</value>
-             <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/Schema-Reference-AVM.xml</value>
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/Schema-Reference-JBPM.xml</value>
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/Schema-Reference-ACT.xml</value>
-             -->
           </list>
        </property>
     </bean>
@@ -173,10 +170,6 @@
     <bean id="siteLoadBootstrap-Spaces" parent="spacesStoreImporter" singleton="true" />
     <bean id="siteLoadBootstrap-Users" parent="userStoreImporter" singleton="true" />
     
-    <!-- Sparta: remove WCM/AVM
-    <bean id="siteLoadBootstrap-AVM" parent="sitesAVMZipBootstrap-base" singleton="true" />
-    -->
-   
     <bean id="workflowBootstrap" parent="workflowDeployer">
         <property name="workflowDefinitions">
             <list>
@@ -290,7 +283,6 @@
         <property name="models">
             <list>
                <value>alfresco/workflow/workflowModel.xml</value>
-               <value>alfresco/workflow/wcmWorkflowModel.xml</value>
                <value>alfresco/workflow/invitation-nominated-workflow-model.xml</value>
                <value>alfresco/workflow/invitation-moderated-workflow-model.xml</value>
                <value>alfresco/workflow/publishingWorkflowModel.xml</value>
@@ -299,7 +291,6 @@
         <property name="labels">
             <list>
                <value>alfresco/workflow/workflow-messages</value>
-               <value>alfresco/workflow/wcm-workflow-messages</value>
                <value>alfresco/workflow/invitation-nominated-workflow-messages</value>
                <value>alfresco/workflow/invitation-moderated-workflow-messages</value>
             </list>
@@ -686,7 +677,6 @@
       <property name="personService" ref="personService" />
       <property name="fileFolderService" ref="fileFolderService" />
       <property name="searchService" ref="searchService" />
-      <property name="avmService" ref="AVMService" />
       <property name="companyHomeStore"><value>${spaces.store}</value></property>
       <property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>
       <property name="singletonCache" ref="immutableSingletonCache" />
diff --git a/config/alfresco/bootstrap/customMessagesSpace.xml b/config/alfresco/bootstrap/customMessagesSpace.xml
index c18b45c1b2..7dd99c34e2 100644
--- a/config/alfresco/bootstrap/customMessagesSpace.xml
+++ b/config/alfresco/bootstrap/customMessagesSpace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" 
+  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" 
              view:childName="app:messages">
     <view:aspects>
       <app:uifacets></app:uifacets>
diff --git a/config/alfresco/bootstrap/customWebClientExtensionSpace.xml b/config/alfresco/bootstrap/customWebClientExtensionSpace.xml
index 6b5351aa89..b1f71c5103 100644
--- a/config/alfresco/bootstrap/customWebClientExtensionSpace.xml
+++ b/config/alfresco/bootstrap/customWebClientExtensionSpace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" 
+  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" 
              view:childName="app:webclient_extension">
     <view:aspects>
       <app:uifacets></app:uifacets>
diff --git a/config/alfresco/bootstrap/webScripts.xml b/config/alfresco/bootstrap/webScripts.xml
index a7da5c6b9a..5aafe6cd19 100644
--- a/config/alfresco/bootstrap/webScripts.xml
+++ b/config/alfresco/bootstrap/webScripts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" view:childName="cm:webscripts">
+  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" view:childName="cm:webscripts">
     <view:aspects>
       <app:uifacets></app:uifacets>
     </view:aspects>
@@ -371,86 +371,6 @@
                             </view:properties>
                             <view:associations></view:associations>
                           </cm:content>
-                          <cm:content view:childName="cm:avmstores.get.desc.xml">
-                            <view:aspects>
-                              <cm:titled></cm:titled>
-                              <cm:author></cm:author>
-                              <app:inlineeditable></app:inlineeditable>
-                            </view:aspects>
-                            <view:properties>
-                              <app:editInline>true</app:editInline>
-                              <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/avmstores.get.desc.xml|mimetype=text/xml|size=|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>avmstores.get.desc.xml</cm:title>
-                              <cm:author></cm:author>
-                              <cm:name>avmstores.get.desc.xml</cm:name>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </cm:content>
-                          <cm:content view:childName="cm:avmstores.get.html.ftl">
-                            <view:aspects>
-                              <cm:titled></cm:titled>
-                              <cm:author></cm:author>
-                              <app:inlineeditable></app:inlineeditable>
-                            </view:aspects>
-                            <view:properties>
-                              <app:editInline>true</app:editInline>
-                              <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/avmstores.get.html.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>avmstores.get.html.ftl</cm:title>
-                              <cm:author></cm:author>
-                              <cm:name>avmstores.get.html.ftl</cm:name>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </cm:content>
-                          <cm:content view:childName="cm:avmbrowse.get.js">
-                            <view:aspects>
-                              <cm:titled></cm:titled>
-                              <app:inlineeditable></app:inlineeditable>
-                              <cm:author></cm:author>
-                            </view:aspects>
-                            <view:properties>
-                              <app:editInline>true</app:editInline>
-                              <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/avmbrowse.get.js|mimetype=application/x-javascript|size=|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>avmbrowse.get.js</cm:title>
-                              <cm:author></cm:author>
-                              <cm:name>avmbrowse.get.js</cm:name>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </cm:content>
-                          <cm:content view:childName="cm:avmbrowse.get.desc.xml">
-                            <view:aspects>
-                              <cm:titled></cm:titled>
-                              <cm:author></cm:author>
-                              <app:inlineeditable></app:inlineeditable>
-                            </view:aspects>
-                            <view:properties>
-                              <app:editInline>true</app:editInline>
-                              <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/avmbrowse.get.desc.xml|mimetype=text/xml|size=|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>avmbrowse.get.desc.xml</cm:title>
-                              <cm:author></cm:author>
-                              <cm:name>avmbrowse.get.desc.xml</cm:name>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </cm:content>
-                          <cm:content view:childName="cm:avmbrowse.get.html.ftl">
-                            <view:aspects>
-                              <cm:titled></cm:titled>
-                              <cm:author></cm:author>
-                              <app:inlineeditable></app:inlineeditable>
-                            </view:aspects>
-                            <view:properties>
-                              <app:editInline>true</app:editInline>
-                              <cm:description></cm:description>
-                              <cm:content>contentUrl=classpath:alfresco/bootstrap/webscripts/avmbrowse.get.html.ftl|mimetype=text/plain|size=|encoding=UTF-8|locale=en_US_</cm:content>
-                              <cm:title>avmbrowse.get.html.ftl</cm:title>
-                              <cm:author></cm:author>
-                              <cm:name>avmbrowse.get.html.ftl</cm:name>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </cm:content>
                         </cm:contains>
                       </view:associations>
                     </cm:folder>
diff --git a/config/alfresco/bootstrap/webScriptsExtensions.xml b/config/alfresco/bootstrap/webScriptsExtensions.xml
index 18c9470c74..d2901442d2 100644
--- a/config/alfresco/bootstrap/webScriptsExtensions.xml
+++ b/config/alfresco/bootstrap/webScriptsExtensions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" view:childName="cm:extensionwebscripts">
+  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" view:childName="cm:extensionwebscripts">
     <view:aspects>
       <app:uifacets></app:uifacets>
     </view:aspects>
diff --git a/config/alfresco/bootstrap/webScriptsReadme.xml b/config/alfresco/bootstrap/webScriptsReadme.xml
index c804ce12bd..6100fd7e08 100644
--- a/config/alfresco/bootstrap/webScriptsReadme.xml
+++ b/config/alfresco/bootstrap/webScriptsReadme.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <view:reference xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:alf="http://www.alfresco.org" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:pathref="/app:company_home/app:dictionary/cm:webscripts">
+  <view:reference xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:alf="http://www.alfresco.org" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:pathref="/app:company_home/app:dictionary/cm:webscripts">
     <view:aspects>
       <cm:templatable></cm:templatable>
     </view:aspects>
@@ -8,7 +8,7 @@
       <cm:template>/app:company_home/app:dictionary/app:content_templates/cm:readme.ftl</cm:template>
     </view:properties>
   </view:reference>
-  <view:reference xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:alf="http://www.alfresco.org" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:pathref="/app:company_home/app:dictionary/cm:extensionwebscripts">
+  <view:reference xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:alf="http://www.alfresco.org" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:pathref="/app:company_home/app:dictionary/cm:extensionwebscripts">
     <view:aspects>
       <cm:templatable></cm:templatable>
     </view:aspects>
diff --git a/config/alfresco/bootstrap/webscripts/avmbrowse.get.desc.xml b/config/alfresco/bootstrap/webscripts/avmbrowse.get.desc.xml
deleted file mode 100644
index b9fbdc6ec1..0000000000
--- a/config/alfresco/bootstrap/webscripts/avmbrowse.get.desc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<webscript>
-  <shortname>AVM Browse Sample</shortname>
-  <description>Sample demonstrating the listing of AVM folder contents</description>
-  <url>/sample/avm/path/{storeid}/{path}</url>
-  <format default="html">argument</format>
-  <authentication>admin</authentication>
-  <transaction>required</transaction>
-</webscript>
diff --git a/config/alfresco/bootstrap/webscripts/avmbrowse.get.html.ftl b/config/alfresco/bootstrap/webscripts/avmbrowse.get.html.ftl
deleted file mode 100644
index 65f619636d..0000000000
--- a/config/alfresco/bootstrap/webscripts/avmbrowse.get.html.ftl
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <title>AVM Folder: ${folder.displayPath}</title>
-  </head>
-  <body>
-    <a href="${url.serviceContext}/sample/avm/stores">AVM Store</a>: ${store.id}
-    <br>
-    <br>
-    AVM Folder: ${folder.displayPath}
-    <br>
-    <br>
-    <table>
-     <#if folder.parent?exists>
-     <tr>
-       <td>${folder.parent.properties.creator}<td>&nbsp;<td>&nbsp<td>&nbsp;<td>${folder.parent.properties.modified?datetime}<td>&nbsp;<td><td><a href="${url.serviceContext}/sample/avm/path/${store.id}<#if folder.parent.parent?exists><@encodepath node=folder.parent/><#else>/</#if>">..</a>
-     </tr>
-     </#if>
-<#list folder.children as child>
-     <tr>
-       <#if child.isContainer>
-         <td>${child.properties.creator}<td>&nbsp;<td>&nbsp<td>&nbsp;<td>${child.properties.modified?datetime}<td>&nbsp;<td>&gt;<td><a href="${url.serviceContext}/sample/avm/path/${store.id}<@encodepath node=child/>">${child.name}</a>
-       <#else>
-         <td>${child.properties.creator}<td>&nbsp;<td>${child.size}<td>&nbsp;<td>${child.properties.modified?datetime}<td>&nbsp;<td><td><a href="${url.serviceContext}/api/node/content/${child.nodeRef.storeRef.protocol}/${child.nodeRef.storeRef.identifier}/${child.nodeRef.id}/${child.name?url}">${child.name}</a>
-       </#if>
-     </tr>
-</#list>
-    </table>
-  </body>
-</html>
-
-<#macro encodepath node><#if node.parent?exists><@encodepath node=node.parent/>/${node.name?url}</#if></#macro>
\ No newline at end of file
diff --git a/config/alfresco/bootstrap/webscripts/avmbrowse.get.js b/config/alfresco/bootstrap/webscripts/avmbrowse.get.js
deleted file mode 100644
index 6e3c98c731..0000000000
--- a/config/alfresco/bootstrap/webscripts/avmbrowse.get.js
+++ /dev/null
@@ -1,36 +0,0 @@
-script:
-{
-    // extract avm store id and path
-    var fullpath = url.extension.split("/");
-    if (fullpath.length == 0)
-    {
-      status.code = 400;
-      status.message = "Store id has not been provided.";
-      status.redirect = true;
-      break script;
-    }
-    var storeid = fullpath[0];
-    var path = (fullpath.length == 1 ? "/" : "/" + fullpath.slice(1).join("/"));
-    
-    // locate avm node from path
-    var store = avm.lookupStore(storeid);
-    if (store == undefined)
-    {
-      status.code = 404;
-      status.message = "Store " + storeid + " not found.";
-      status.redirect = true;
-      break script;
-    }
-    var node = avm.lookupNode(storeid + ":" + path);
-    if (node == undefined)
-    {
-      status.code = 404;
-      status.message = "Path " + path + " within store " + storeid + " not found.";
-      status.redirect = true;
-      break script;
-    }
-    
-    // setup model for templates
-    model.store = store;
-    model.folder = node;    
-}
\ No newline at end of file
diff --git a/config/alfresco/bootstrap/webscripts/avmstores.get.desc.xml b/config/alfresco/bootstrap/webscripts/avmstores.get.desc.xml
deleted file mode 100644
index 22d81a7438..0000000000
--- a/config/alfresco/bootstrap/webscripts/avmstores.get.desc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<webscript>
-  <shortname>AVM Stores Sample</shortname>
-  <description>Sample demonstrating the listing of AVM stores</description>
-  <url>/sample/avm/stores</url>
-  <format default="html"/>
-  <authentication>admin</authentication>
-  <transaction>required</transaction>
-</webscript>
diff --git a/config/alfresco/bootstrap/webscripts/avmstores.get.html.ftl b/config/alfresco/bootstrap/webscripts/avmstores.get.html.ftl
deleted file mode 100644
index bf465c5743..0000000000
--- a/config/alfresco/bootstrap/webscripts/avmstores.get.html.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-  <head>
-    <title>AVM Stores</title>
-  </head>
-  <body>
-    AVM Stores
-    <br>
-    <br>
-    <table>
-     <tr>
-<#list avm.stores as store>
-     <tr>
-        <td>${store.creator}<td>&nbsp;<td>${store.createdDate?datetime}<td>&nbsp;<td><a href="${url.serviceContext}/sample/avm/path/${store.id}/">${store.id}
-     </tr>
-</#list>
-    </table>
-  </body>
-</html>
diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index fadfc0856a..c4abe6b79f 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -267,39 +267,6 @@
       <constructor-arg value="cache.ticketsCache"/>
    </bean>
       
-   <!-- ===================================== -->
-   <!-- Lookup for AVM entities               -->
-   <!-- ===================================== -->
-   
-   <!-- The cross-transaction shared cache for AVM Store entities -->
-   
-   <bean name="avmStoreSharedCache" class="org.alfresco.repo.cache.NullCache"/>
-
-   
-   <!-- The cross-transaction shared cache for AVM entities (various - using cache region) -->
-   
-   <bean name="avmEntitySharedCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.avmEntitySharedCache"/>
-   </bean>
-   
-   <!-- The cross-transaction shared cache for AVM VersionRoot entities -->
-   
-   <bean name="avmVersionRootEntitySharedCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.avmVersionRootEntitySharedCache"/>
-   </bean>
-   
-   <!-- The cross-transaction shared cache for AVM Node entities -->
-   
-   <bean name="avmNodeSharedCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.avmNodeSharedCache"/>
-   </bean>
-   
-   <!-- The cross-transaction shared cache for AVM Node Aspects entities -->
-   
-   <bean name="avmNodeAspectsSharedCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.avmNodeAspectsSharedCache"/>
-   </bean>
-   
    <!-- ===================================== -->
    <!-- WebServices Query Session Cache       -->
    <!-- ===================================== -->
diff --git a/config/alfresco/clt-context.xml b/config/alfresco/clt-context.xml
deleted file mode 100644
index 8892f4bc82..0000000000
--- a/config/alfresco/clt-context.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-    <!-- Client Ticket Holder -->
-    <bean id="clientTicketHolder" class="org.alfresco.repo.remote.ClientTicketHolderGlobal"/>
-
-    <!-- Remote AVM interface -->
-    <bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
-        <property name="avmRemoteTransport">
-            <ref bean="avmRemoteTransport"/>
-        </property>
-        <property name="clientTicketHolder">
-            <ref bean="clientTicketHolder"/>
-        </property>
-    </bean>
-    
-    <bean id="avmRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-        <property name="serviceUrl">
-            <value>rmi://localhost:50500/avm</value>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
-        </property>
-        <property name="refreshStubOnConnectFailure">
-            <value>true</value>
-        </property>
-    </bean>
-
-	<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceRemote">
-	    <property name="avmSyncServiceTransport">
-	    	<ref bean="avmSyncServiceTransport"/>
-	    </property>
-	    <property name="clientTicketHolder">
-	        <ref bean="clientTicketHolder"/>
-	    </property>
-	</bean>
-
-    <bean id="avmSyncServiceTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-        <property name="serviceUrl">
-            <value>rmi://localhost:50500/avmsync</value>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
-        </property>
-        <property name="refreshStubOnConnectFailure">
-            <value>true</value>
-        </property>
-    </bean>    
-    
-    <bean id="authenticationService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-        <property name="serviceUrl">
-            <value>rmi://localhost:50500/authentication</value>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.security.AuthenticationService</value>
-        </property>
-        <property name="refreshStubOnConnectFailure">
-            <value>true</value>
-        </property>
-    </bean>
-    
-    <bean id="repoRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-        <property name="serviceUrl">
-            <value>rmi://localhost:50500/repo</value>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.RepoRemoteTransport</value>
-        </property>
-        <property name="refreshStubOnConnectFailure">
-            <value>true</value>
-        </property>
-    </bean>
-    
-    <bean id="repoRemote" class="org.alfresco.repo.remote.RepoRemoteImpl">
-        <property name="repoRemoteTransport">
-            <ref bean="repoRemoteTransport"/>
-        </property>
-        <property name="clientTicketHolder">
-            <ref bean="clientTicketHolder"/>
-        </property>
-    </bean>
-</beans>
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index a121a37b1d..3d8463b9d6 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -194,44 +194,6 @@
         </property>
     </bean>
 
-    <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
-       <property name="server" ref="alfrescoMBeanServer"/>
-       <property name="beans">
-         <map>
-           <!--  Used by Alfresco WCM Virtualisation server -->
-           <entry key="Alfresco:Name=VirtServerRegistry,Type=VirtServerRegistry" value-ref="VirtServerRegistry"/>
-         </map>
-       </property>
-       <property name="registrationBehaviorName" value="REGISTRATION_REPLACE_EXISTING"/>       
-    </bean>
-
-    <!-- MBeans registered with alfrescoMBeanServer -->
-    <bean id="VirtServerRegistry"
-          class="org.alfresco.mbeans.VirtServerRegistry"
-          init-method="initialize" >
-
-        <!-- Authentication info to contact remote virtualization server  -->
-        <!-- NOTE:                                                        -->
-        <!--    On the machine hosting the virtualization server,         -->
-        <!--    $VIRTUAL_TOMCAT_HOME/conf/alfresco-jmxrmi.password and    -->
-        <!--    $VIRTUAL_TOMCAT_HOME/conf/alfresco-jmxrmi.access          -->
-        <!--    should have the same data as the corresponding files      -->
-        <!--    contained here within the Alfresco webapp server.         -->
-        <!--    By default, they do; however, if you change the password  -->
-        <!--    file on one server, be sure to change it on the other.    -->
-        <!--                                                              -->
-        <!-- WARNING:                                                     -->
-        <!--    For security, be certain that *only* the uid under which  -->
-        <!--    the servers run have read access to the password files    -->
-        <!--    (e.g.:  under Unix, chmod them to "400").                 -->
-
-        <property name="passwordFile"
-                  value="${alfresco.jmx.dir}/alfresco-jmxrmi.password"/>
-
-        <property name="accessFile"
-                  value="${alfresco.jmx.dir}/alfresco-jmxrmi.access"/>
-    </bean>
-
     <!--
          http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#log4j.properties
     -->
@@ -465,11 +427,9 @@
                 <value>alfresco.messages.schema-update</value>
                 <value>alfresco.messages.webdav-messages</value>
                 <value>alfresco.messages.copy-service</value>
-                <value>alfresco.messages.avm-messages</value>
                 <value>alfresco.messages.content-filter-languages</value>
                 <value>alfresco.messages.jbpm-engine-messages</value>
                 <value>alfresco.messages.activiti-engine-messages</value>
-                <value>alfresco.messages.wdr-messages</value>
                 <value>alfresco.messages.subscription-service</value>
                 <value>alfresco.messages.replication</value>
                 <value>alfresco.messages.categories</value>
@@ -792,14 +752,12 @@
                 <!-- Content models -->
                 <value>alfresco/model/contentModel.xml</value>
                 <value>alfresco/model/bpmModel.xml</value>
-                <value>alfresco/model/wcmModel.xml</value>
                 <value>alfresco/model/forumModel.xml</value>
                 <value>alfresco/model/imapModel.xml</value>
                 <value>alfresco/model/transferModel.xml</value>
 
                 <!-- Content models -->
                 <value>alfresco/model/applicationModel.xml</value>
-                <value>alfresco/model/wcmAppModel.xml</value>
 
                 <!-- Implementation models -->
                 <value>org/alfresco/repo/action/actionModel.xml</value>
@@ -851,7 +809,6 @@
                 <value>alfresco/messages/email-server-model</value>
                 <value>alfresco/messages/data-list-model</value>
                 <value>alfresco/messages/transfer-model</value>
-                <value>alfresco/messages/wcmapp-model</value>
                 <value>alfresco/messages/publishing-model</value>
                 <value>alfresco/messages/site-model</value>
             </list>
@@ -1240,24 +1197,7 @@
       </property>
    </bean>
    
-   <!-- Sparta: remove WCM/AVM
-   <bean id="avmLuceneIndexerAndSearcherFactory" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
-      <property name="sourceApplicationContextFactory">
-         <ref bean="Search" />
-      </property>
-      <property name="sourceBeanName">
-         <value>search.avmLuceneIndexerAndSearcherFactory</value>
-      </property>
-      <property name="interfaces">
-         <list>
-            <value>org.alfresco.repo.search.IndexerAndSearcher</value>
-            <value>org.alfresco.repo.search.impl.lucene.LuceneConfig</value>
-         </list>
-      </property>
-   </bean>
-   -->
-   
-     <bean id="admLuceneIndexerAndSearcherFactory" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory" depends-on="Search" >
+   <bean id="admLuceneIndexerAndSearcherFactory" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory" depends-on="Search" >
       <property name="sourceApplicationContextFactory">
          <ref bean="Search" />
       </property>
@@ -1344,22 +1284,6 @@
       </property>
    </bean>
    
-   <!-- Sparta: remove WCM/AVM
-   <bean id="avmIndexRecoveryComponent" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
-      <property name="sourceApplicationContextFactory">
-         <ref bean="Search" />
-      </property>
-      <property name="sourceBeanName">
-         <value>search.avmIndexRecoveryComponent</value>
-      </property>
-      <property name="interfaces">
-         <list>
-            <value>org.alfresco.repo.node.index.IndexRecovery</value>
-         </list>
-      </property>
-   </bean>
-   -->
-   
    <!-- only required for lucene index test support -->
    
    <bean id="LuceneFullTextSearchIndexer" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
diff --git a/config/alfresco/deployment-service-context.xml b/config/alfresco/deployment-service-context.xml
deleted file mode 100644
index b3b2783f22..0000000000
--- a/config/alfresco/deployment-service-context.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<beans>
-
-    <!-- Deployment Service Configuration -->  
-    
-    <!--  Payload transformers -->
-     <bean id="deploymentTestTransformer" class="org.alfresco.deployment.test.TestDeploymentTransportTransformer">
-     </bean>   
-     
-     <bean id="deploymentEncryptor" class="org.alfresco.deployment.transformers.SampleEncryptionTransformer">
-        <property name="password">
-         	<value>Alfresco</value>
-        </property>
-        <property name="cipherName">
-         	<value>PBEWithMD5AndDES</value>
-        </property>
-     </bean>  
-     
-     <bean id="deploymentCompressor" class="org.alfresco.deployment.transformers.CompressionTransformer">
-     </bean>  
-     
-     <!--  Transport adapters to communicate with remote File System Receivers -->     
-     <!--  Communicate with an Deployment Server over RMI - Default method for Alfresco-->
-     <bean id="rmiFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
-     </bean>
-     
-     <!--  communicate with an Deployment Server over RMI with the content encrypted  -->
-     <bean id="encryptedRMIFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
-          <property name="transformers">
-            <list>
-            	<ref bean="deploymentEncryptor"></ref>
-            </list>
-        </property>
-     </bean>
-     
-     <!--  communicate with an Deployment Server over RMI with the content compressed then encrypted  -->
-     <bean id="compressEncryptedRMIFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterRMI">
-          <property name="transformers">
-            <list>
-            	<ref bean="deploymentEncryptor"></ref>
-            	<ref bean="deploymentCompressor"></ref>
-            </list>
-        </property>
-     </bean>
-     
-     <!--  how to communicate with an Deployment Server over Spring HTTP -->
-     <bean id="springHttpFSRAdapter" class="org.alfresco.repo.deploy.DeploymentReceiverTransportAdapterSpringHTTP">
-        <property name="urlPattern">
-         	<value>http://{0}:{1}/ADSR/deployment</value>
-        </property>
-     </bean>
-     
-
-     <!--  Deployment Service -->
-     <bean id="deploymentService" class="org.alfresco.repo.deploy.DeploymentServiceImpl" init-method="init">
-        <property name="avmService">
-            <ref bean="AVMService"/>
-        </property>
-        
-        <property name="nodeService">
-            <ref bean="nodeService"/>
-        </property>
-
-        <property name="avmNodeService">
-            <ref bean="avmNodeService"/>
-        </property>
-        
-        <property name="namespacePrefixResolver">
-            <ref bean="namespaceService" />
-        </property>
-
-        <property name="searchService">
-            <ref bean="searchService" />
-        </property>
-
-        <property name="transactionService">
-            <ref bean="transactionService"/>
-        </property>
-        
-        <property name="jobLockService">
-        	<ref bean="jobLockService"/>
-        </property>
-        
-        <!-- how many files to send in parallel -->
-        <property name="numberOfSendingThreads">
-            <value>${deployment.service.numberOfSendingThreads}</value>
-        </property>
-        
-        <!-- Short timeout, to detect a shutdown server -->
-        <property name="targetLockRefreshTime">
-            <value>${deployment.service.targetLockRefreshTime}</value>
-        </property>
-        
-        <!-- Long timeout, how long to wait for the next step in the deployment process, may need to be fairly 
-        long to cope with large transfers over slow networks -->
-        <property name="targetLockTimeToLive">
-            <value>${deployment.service.targetLockTimeout}</value>
-        </property>
-        
-        <!-- Which adapters are provided to communicate with remote File System Receivers -->
-        <property name="deploymentReceiverTransportAdapters">
-            <map>
-               <entry key="default">
-               		<ref bean="rmiFSRAdapter"></ref>
-               </entry>
-               
-           <!-- Uncomment to enable spring HTTP      
-           	   <entry key="spring HTTP">
-               		<ref bean="springHttpFSRAdapter"></ref>
-               </entry>
-           -->
-        
-           <!-- Uncomment to enable encrypted RMI 
-           		<entry key="encrypted RMI">
-               		<ref bean="encryptedRMIFSRAdapter"></ref>
-               </entry>
-            -->
-
-			<!-- Uncomment to enable compressed and encrypted RMI
-               <entry key="rmi compressed and encrypted">
-               		<ref bean="compressEncryptedRMIFSRAdapter"></ref>
-               </entry>
-            -->
-            </map>
-        </property>
-     </bean>
-
-    
-    <bean id="deploymentServiceReadTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
-        <property name="advice">
-            <ref bean="retryingReadTxnAdvice"/>
-        </property>
-        <property name="mappedNames">
-            <list>
-                <value>getRemoteActionService</value>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="deploymentServiceWriteTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
-        <property name="advice">
-            <ref bean="retryingWriteTxnAdvice"/>
-        </property>
-        <property name="mappedNames">
-            <list>
-                <value>deployDifferenceFS</value>
-                <value>deployDifference</value>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="DeploymentService" class="org.springframework.aop.framework.ProxyFactoryBean">
-        <property name="proxyInterfaces">
-            <list>
-                <value>org.alfresco.service.cmr.avm.deploy.DeploymentService</value>
-            </list>
-        </property>
-        <property name="targetName">
-            <value>deploymentService</value>
-        </property>
-        <property name="interceptorNames">
-            <list>
-                <value>deploymentServiceWriteTxnAdvisor</value>
-                <value>deploymentServiceReadTxnAdvisor</value>
-                <value>checkTxnAdvisor</value>
-            </list>
-        </property>
-    </bean>
-</beans>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
index 8e8de54ecd..5acf11f8e1 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
@@ -43,13 +43,6 @@
         <result property="rootDir" column="rootDir" jdbcType="VARCHAR" javaType="java.lang.String"/>
     </resultMap>
     
-    <resultMap type="java.util.HashMap" id="result_avmLock">
-        <result property="wpStoreId" column="wpStoreId" jdbcType="VARCHAR" javaType="java.lang.String"/>
-        <result property="relPath" column="relPath" jdbcType="VARCHAR" javaType="java.lang.String"/>
-        <result property="avmStore" column="avmStore" jdbcType="VARCHAR" javaType="java.lang.String"/>
-        <result property="owner1" column="owner1" jdbcType="VARCHAR" javaType="java.lang.String"/>
-    </resultMap>
-    
     <resultMap type="java.util.HashMap" id="result_PBB">
         <result property="componentName" column="componentName" jdbcType="VARCHAR" javaType="java.lang.String"/>
         <result property="propName" column="propName" jdbcType="VARCHAR" javaType="java.lang.String"/>
@@ -148,29 +141,10 @@
     <!-- Selects        -->
     <!--                -->
 
-    <select id="select_avmMaxNodeId" resultType="java.lang.Long">
-        select max(id) from avm_nodes
-    </select>
-
     <select id="select_admMaxNodeId" resultType="java.lang.Long">
         select max(id) from alf_node
     </select>
     
-    <select id="select_avmNodesWithOldContentProperties" parameterType="Ids" resultType="java.lang.Long">
-        select
-            id
-        from
-            avm_nodes
-        where
-            id &gt;= #{idOne}
-            and id &lt; #{idTwo}
-            and class_type = 'plainfile'
-            and content_url is not null
-            and content_url not like 'id:%' <include refid="alfresco.util.escape"/>
-        order by
-            id ASC
-    </select>
-
     <select id="select_admOldContentProperties" parameterType="Ids" resultMap="result_admOldContentProp">
         <![CDATA[
         select
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml
index 3bc85e460f..02dd7db80e 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml
@@ -394,15 +394,6 @@
             acl_id = ?
     </select>
     
-    <select id="select_AVMNodesByAclId" parameterMap="parameter_IdMap" resultType="long">
-        select
-            id
-        from
-            avm_nodes
-        where
-            acl_id = ?
-    </select>
-    
     <select id="select_AclMembersByAclId" parameterMap="parameter_IdMap" resultMap="result_AclMember">
         select
             *
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index 5974a5bde5..546a63effb 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -187,14 +187,6 @@
       </property>
     </bean>
     
-    <bean id="avmZipExporterService" class="org.alfresco.repo.exporter.AVMZipExporterServiceImpl">
-       <property name="avmService" ref="AVMService"/>
-    </bean>
-
-    <bean id="avmZipImporter" class="org.alfresco.repo.importer.AVMZipImporter">
-       <property name="avmService" ref="AVMService"/>
-    </bean>
-
     <!-- System Info Importer -->
     
     <bean id="systemInfoImporter" class="org.alfresco.repo.importer.system.SystemInfoBootstrap" abstract="true">
@@ -248,30 +240,6 @@
         -->
    </bean>
 
-    <bean id="avmZipBootstrap" class="org.alfresco.repo.importer.AVMZipBootstrap" abstract="true">
-        <property name="transactionService">
-            <ref bean="transactionService"/>
-        </property>
-        <property name="retryingTransactionHelper">
-            <ref bean="storeImporterTransactionHelper"/>
-        </property>
-        <property name="authenticationContext">
-            <ref bean="authenticationContext" />
-        </property>
-        <property name="nodeService">
-            <ref bean="nodeService"/>
-        </property>
-        <property name="avmZipImporter">
-            <ref bean="avmZipImporter"/>
-        </property>
-        <property name="avmService">
-            <ref bean="AVMService"/>
-        </property>
-        <property name="allowWrite">
-            <value>${server.transaction.allow-writes}</value>
-        </property>
-    </bean>
-
     <bean id="storeImporterViews" class="org.alfresco.repo.importer.ImporterBootstrapViews" abstract="true">
     </bean>
 
@@ -378,8 +346,6 @@
                 <prop key="spaces.templates.rss.childname">${spaces.templates.rss.childname}</prop>
                 <prop key="spaces.savedsearches.childname">${spaces.savedsearches.childname}</prop>
                 <prop key="spaces.scripts.childname">${spaces.scripts.childname}</prop>
-                <prop key="spaces.wcm.childname">${spaces.wcm.childname}</prop>
-                <prop key="spaces.wcm_content_forms.childname">${spaces.wcm_content_forms.childname}</prop>
                 <prop key="spaces.content_forms.childname">${spaces.content_forms.childname}</prop>
                 <prop key="spaces.user_homes.childname">${spaces.user_homes.childname}</prop>
                 <prop key="spaces.sites.childname">${spaces.sites.childname}</prop>
@@ -400,7 +366,6 @@
                 <prop key="spaces.scheduled_actions.childname">${spaces.scheduled_actions.childname}</prop>
                 <prop key="spaces.rendition.rendering_actions.childname">${spaces.rendition.rendering_actions.childname}</prop>
                 <prop key="spaces.replication.replication_actions.childname">${spaces.replication.replication_actions.childname}</prop>
-                <prop key="spaces.wcm_deployed.childname">${spaces.wcm_deployed.childname}</prop>
                 <prop key="spaces.publishing.root.childname">${spaces.publishing.root.childname}</prop>
                 <prop key="spaces.nodetemplates.childname">${spaces.nodetemplates.childname}</prop>
                 <prop key="spaces.shared.childname">${spaces.shared.childname}</prop>
@@ -707,10 +672,4 @@
         </property>
     </bean>
 
-    <bean id="sitesAVMZipBootstrap-base" parent="avmZipBootstrap" abstract="true">
-        <property name="avmRoot">
-            <value>sitestore:/</value>
-        </property>
-    </bean>
-
 </beans>
diff --git a/config/alfresco/model-specific-services-context.xml b/config/alfresco/model-specific-services-context.xml
index 178aea6d17..68c128939e 100644
--- a/config/alfresco/model-specific-services-context.xml
+++ b/config/alfresco/model-specific-services-context.xml
@@ -74,7 +74,6 @@
             <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.scripts.childname}</value>
             <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.webscripts.childname}</value>
             <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.extension_webscripts.childname}</value>
-            <value>/${spaces.company_home.childname}/${spaces.wcm_deployed.childname}</value>
          </list>
       </property>
    </bean>
diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml
index cd3bc34a4c..63ff978621 100644
--- a/config/alfresco/model/applicationModel.xml
+++ b/config/alfresco/model/applicationModel.xml
@@ -9,7 +9,6 @@
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
       <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
       <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
-      <import uri="http://www.alfresco.org/model/wcmmodel/1.0" prefix="wcm"/>
    </imports>
    
    <namespaces>
diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index c269a77203..1f259c3fb0 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -1202,9 +1202,7 @@
          </properties>
       </aspect>
       
-      <!-- An aspect to make a node reference another node. Needed to
-           support cross repository references. There is a sys:reference type but
-           that is awkard for AVM Nodes which are less flexible as to type. -->
+      <!-- An aspect to make a node reference another node. -->
       <aspect name="cm:referencesnode">
          <title>References Node</title>
          <properties>
diff --git a/config/alfresco/model/permissionDefinitions.xml b/config/alfresco/model/permissionDefinitions.xml
index a431eb704e..774f7d0527 100644
--- a/config/alfresco/model/permissionDefinitions.xml
+++ b/config/alfresco/model/permissionDefinitions.xml
@@ -19,8 +19,6 @@
    <namespaces>
       <namespace uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
       <namespace uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
-      <namespace uri="http://www.alfresco.org/model/wcmmodel/1.0" prefix="wcm"/>
-      <namespace uri="http://www.alfresco.org/model/wcmappmodel/1.0" prefix="wca"/>
    </namespaces>
 
    <!--                                                                                   -->
@@ -106,7 +104,6 @@
       <permissionGroup name="CreateAssociations" expose="true" allowFullControl="false" />  
       <permissionGroup name="ReadPermissions" expose="true" allowFullControl="false" />  
       <permissionGroup name="ChangePermissions" expose="true" allowFullControl="false" />  
-      <permissionGroup name="Flatten" expose="true" allowFullControl="false" />  
     
       <!-- =========== -->
       <!-- Permissions -->
@@ -281,15 +278,6 @@
         -->
       </permission>
        
-      <!-- AVM specific -->
-       
-      <permission name="_Flatten" expose="false" >
-        <grantedToGroup permissionGroup="Flatten" />
-        <!-- Commented out parent permission check ...
-        <requiredPermission on="parent" name="_ReadChildren" implies="false"/>
-        -->
-      </permission>
-      
    </permissionSet>
    
    <!-- ================================================ -->
@@ -352,23 +340,6 @@
           <includePermissionGroup type="sys:base" permissionGroup="CreateAssociations"/>
       </permissionGroup>
        
-      <!-- avm related permissions -->
-       
-       <!-- AVM website specific roles.                                               -->
-      <permissionGroup name="ContentManager" allowFullControl="true" expose="false" />
-      
-      <permissionGroup name="ContentPublisher" allowFullControl="false" expose="false">
-         <includePermissionGroup permissionGroup="Collaborator" type="cm:cmobject" />
-      </permissionGroup>
-      
-      <permissionGroup name="ContentContributor" allowFullControl="false" expose="false">
-         <includePermissionGroup permissionGroup="Contributor" type="cm:cmobject" />
-      </permissionGroup>
-      
-      <permissionGroup name="ContentReviewer" allowFullControl="false" expose="false">
-         <includePermissionGroup permissionGroup="Editor" type="cm:cmobject" />
-      </permissionGroup>
-       
    </permissionSet>
    
    <!-- =============================== -->
@@ -402,59 +373,6 @@
       
    </permissionSet>
    
-   <!-- ========================================== -->
-   <!-- Permissions specific to avm website folder -->
-   <!-- ========================================== -->
-   
-   <permissionSet type="wcm:avmfolder" expose="selected">                                       
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-    
-   <permissionSet type="wcm:avmplainfolder" expose="selected">                                       
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-    
-   <permissionSet type="wcm:avmlayeredfolder" expose="selected">                                       
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-    
-   <permissionSet type="wcm:avmcontent" expose="selected">                                       
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-    
-   <permissionSet type="wcm:avmplaincontent" expose="selected">                                       
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-    
-   <permissionSet type="wcm:avmlayeredcontent" expose="selected">                                       
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-    
-   <permissionSet type="wca:webfolder" expose="selected">                                           
-      <permissionGroup name="ContentManager" extends="true" expose="true" />
-      <permissionGroup name="ContentPublisher" extends="true" expose="true" />
-      <permissionGroup name="ContentContributor" extends="true" expose="true" />
-      <permissionGroup name="ContentReviewer" extends="true" expose="true" />
-   </permissionSet>
-   
    <!-- ============================================== -->
    <!-- Permissions associated with the Ownable aspect -->
    <!-- ============================================== -->
@@ -553,8 +471,4 @@
    <!-- Cancel check out is granted to the locak owner                                   -->
    <globalPermission permission="CancelCheckOut" authority="ROLE_LOCK_OWNER"/>
    
-   <!-- Usere need to be able to remove stuff from thier own sandbox -->
-    
-   <globalPermission permission="Flatten" authority="ROLE_WCM_STORE_OWNER" />
-       
 </permissions>
diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml
deleted file mode 100644
index 6ba99d531a..0000000000
--- a/config/alfresco/model/wcmAppModel.xml
+++ /dev/null
@@ -1,669 +0,0 @@
-<model name="wca:applicationmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-   <description>Alfresco WCM Application Model</description>
-   <author>Alfresco</author>
-   <published>2006-11-27</published>
-   <version>1.0</version>
-
-   <imports>
-      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
-      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
-      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
-      <import uri="http://www.alfresco.org/model/wcmmodel/1.0" prefix="wcm"/>
-   </imports>
-   
-   <namespaces>
-      <namespace uri="http://www.alfresco.org/model/wcmappmodel/1.0" prefix="wca"/>
-   </namespaces>
-   
-   <constraints>
-      <constraint name="wca:deploytypes" type="LIST">
-         <parameter name="allowedValues">
-            <list>
-               <value>alfresco</value>
-               <value>file</value>
-            </list>
-         </parameter>
-      </constraint>
-      
-      <constraint name="wca:deployservertypes" type="LIST">
-         <parameter name="allowedValues">
-            <list>
-               <value>live</value>
-               <value>test</value>
-            </list>
-         </parameter>
-      </constraint>
-   </constraints>
-   
-   <types>
-   
-      <type name="wca:webfolder">
-         <title>WCM Web Project Folder</title>
-         <parent>wcm:avmfolder</parent>
-         <properties>
-            <!-- root name of the avm staging stores for this web folder -->
-            <property name="wca:avmstore">
-               <title>AVM Store Root</title>
-               <type>d:text</type>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>false</tokenised>
-               </index>
-            </property>
-            <property name="wca:defaultwebapp">
-               <title>Default Webapp</title>
-               <type>d:text</type>
-            </property>
-            <!-- the following properties are deprecated as of v2.2 -->
-            <property name="wca:deployto">
-               <title>Deploy To</title>
-               <type>d:text</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="wca:selecteddeployto">
-               <title>Servers Selected For Deployment</title>
-               <type>d:text</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="wca:selecteddeployversion">
-               <title>Snapshot Version Selected For Deployment</title>
-               <type>d:int</type>
-            </property>
-            <!-- end of deprecation -->
-            <property name="wca:issource">
-               <title>Used as a template website</title>
-               <type>d:boolean</type>
-            </property>
-            <!-- Preview URI Service Provider Name (since 3.2) -->
-            <property name="wca:previewprovidername">
-               <title>Preview Provider</title>
-               <type>d:text</type>
-            </property>
-         </properties>
-         <associations>
-            <child-association name="wca:webuser">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:webuser</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-            <child-association name="wca:webform">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:webform</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-            <child-association name="wca:webworkflowdefaults">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:webworkflowdefaults</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-            <!-- the following association is deprecated as of v2.2 -->
-            <child-association name="wca:deploymentreport">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:deploymentreport</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-            <!-- end of deprecation -->
-            <child-association name="wca:deploymentserver">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:deploymentserver</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-            <child-association name="wca:deploymentattempt">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:deploymentattempt</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-         </associations>
-      </type>
-      
-      <type name="wca:webuser">
-         <title>Website User Information</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:username">
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:role">
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-      </type>
-      
-      <type name="wca:webform">
-         <title>Website Web Form</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:formname">
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>false</tokenised>
-               </index>
-            </property>
-         </properties>
-         <associations>
-            <child-association name="wca:webformtemplate">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:webformtemplate</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-            <child-association name="wca:workflowdefaults">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:workflowdefaults</class>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </target>
-            </child-association>
-         </associations>
-         <mandatory-aspects>
-            <aspect>cm:titled</aspect>
-            <aspect>wca:outputpathpattern</aspect>
-         </mandatory-aspects>
-      </type>
-      
-      <type name="wca:webformtemplate">
-         <title>Website Web Form Template</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:baserenderingenginetemplatename">
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-         <mandatory-aspects>
-            <aspect>wca:outputpathpattern</aspect>
-         </mandatory-aspects>
-      </type>
-      
-      <type name="wca:workflowdefaults">
-         <title>Workflow Defaults</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:workflowname">
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:workflowdefaultproperties">
-               <type>d:content</type>
-               <mandatory>false</mandatory>
-               <index enabled="false" />
-            </property>
-         </properties>
-      </type>
-      
-      <type name="wca:webworkflowdefaults">
-         <title>Web Workflow Defaults</title>
-         <parent>wca:workflowdefaults</parent>
-         <mandatory-aspects>
-            <aspect>wca:filenamepattern</aspect>
-         </mandatory-aspects>
-      </type>
-      
-      <type name="wca:renditionproperties">
-         <title>Properties for renditions</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:mimetypeforrendition">
-               <title>Mimetype for generated assets</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-         <mandatory-aspects>
-            <aspect>wca:outputpathpattern</aspect>
-         </mandatory-aspects>
-      </type>
-
-      <type name="wca:formfolder">
-         <title>XForms Capture Form Folder</title>
-         <parent>cm:folder</parent>
-      </type>
-      
-      <type name="wca:deploymentserver">
-         <title>Website Deployment Server</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:deploytype">
-               <title>Deployment Type</title>
-               <type>d:text</type>
-               <constraints>
-                  <constraint ref="wca:deploytypes" />
-               </constraints>
-            </property>
-            <property name="wca:deployservertype">
-               <title>Deployment Server Type</title>
-               <type>d:text</type>
-               <constraints>
-                  <constraint ref="wca:deployservertypes" />
-               </constraints>
-            </property>
-            <property name="wca:deployserverhost">
-               <title>Host</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>false</tokenised>
-               </index>
-            </property>
-            <property name="wca:deployserverport">
-               <title>Port</title>
-               <type>d:int</type>
-            </property>
-            <property name="wca:deployservername">
-               <title>Display Name</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployservergroup">
-               <title>Display Name</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca: deployserveradaptername">
-               <title>Deployment Server Adapter Name</title>
-               <type>d:text</type>
-            </property>          
-            <property name="wca:deployserverusername">
-               <title>Username</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployserverpassword">
-               <title>Password</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployserverurl">
-               <title>Runtime URL</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployservertarget">
-               <title>Deploy Target</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deploysourcepath">
-               <title>Source Path</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployexcludes">
-               <title>Excludes</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployserverallocatedto">
-               <title>Allocated To</title>
-               <type>d:text</type>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>false</tokenised>
-               </index>
-            </property>
-            <property name="wca:deployonapproval">
-               <title>Deploy On Approval</title>
-               <type>d:boolean</type>
-            </property>
-         </properties>
-      </type>
-      
-      <type name="wca:deploymentattempt">
-         <title>Website Deployment Attempt</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="wca:deployattemptid">
-               <title>Deploy Attempt ID</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>false</tokenised>
-               </index>
-            </property>
-            <property name="wca:deployattempttype">
-               <title>Attempt Type</title>
-               <type>d:text</type>
-               <constraints>
-                  <constraint ref="wca:deployservertypes" />
-               </constraints>
-            </property>
-            <property name="wca:deployattemptstore">
-               <title>Attempt Type</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>false</tokenised>
-               </index>
-            </property>
-            <property name="wca:deployattemptversion">
-               <title>Snapshot Version Deployed</title>
-               <type>d:int</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:deployattemptservers">
-               <title>Servers Deployed To</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-               <multiple>true</multiple>
-            </property>
-            <property name="wca:deployattempttime">
-               <title>Time Of Deploy Attempt</title>
-               <type>d:datetime</type>
-               <mandatory enforced="true">true</mandatory>
-			   <index enabled="true">
-				  <atomic>true</atomic>
-				  <stored>false</stored> 
-                  <tokenised>both</tokenised>
-               </index>
-            </property>
-         </properties>
-         <associations>
-            <child-association name="wca:deploymentreports">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:deploymentreport</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </child-association>
-         </associations>
-      </type>
-      
-      <type name="wca:deploymentreport">
-         <title>Website Deployment Report</title>
-         <parent>cm:content</parent>
-         <properties>
-            <property name="wca:deployserver">
-               <title>Server Deployed To</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:deployversion">
-               <title>Snapshot Version Deployed</title>
-               <type>d:int</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:deploystarttime">
-               <title>Time Deploy Started</title>
-               <type>d:datetime</type>
-               <mandatory enforced="true">true</mandatory>
-			   <index enabled="true">
-				  <atomic>true</atomic>
-				  <stored>false</stored> 
-                  <tokenised>both</tokenised>
-               </index>
-            </property>
-            <property name="wca:deployendtime">
-               <title>Time Deploy Finished</title>
-               <type>d:datetime</type>
-               <mandatory enforced="true">true</mandatory>
-			   <index enabled="true">
-				  <atomic>true</atomic>
-				  <stored>false</stored> 
-                  <tokenised>both</tokenised>
-               </index>
-            </property>
-            <property name="wca:deploysuccessful">
-               <title>Deployment Successful</title>
-               <type>d:boolean</type>
-               <default>false</default>
-            </property>
-            <property name="wca:deployfailedreason">
-               <title>Failure Reason</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployservernameused">
-               <title>Server Display Name</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployserverusernameused">
-               <title>Username Used</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployservertargetused">
-               <title>Target Used</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deploysourcepathused">
-               <title>Source Path Used</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployexcludesused">
-               <title>Excludes Used</title>
-               <type>d:text</type>
-            </property>
-            <property name="wca:deployserverurlused">
-               <title>Source Path Used</title>
-               <type>d:text</type>
-            </property>
-         </properties>
-      </type>
-   </types>
-
-   <aspects>
-      
-      <aspect name="wca:webapp">
-         <title>Webapp</title>
-      </aspect>
-      
-      <aspect name="wca:filenamepattern">
-         <title>Filename Pattern</title>
-         <properties>
-            <property name="wca:filenamepattern">
-               <type>d:text</type>
-            </property>
-         </properties>
-      </aspect>
-      
-      <aspect name="wca:outputpathpattern">
-         <title>Output Path Pattern</title>
-         <properties>
-            <property name="wca:outputpathpattern">
-               <type>d:text</type>
-            </property>
-         </properties>
-      </aspect>
-      
-      <!-- An XForms capture form aspect. -->
-      <aspect name="wca:form">
-         <title>XForms Form</title>
-         <properties>
-            <property name="wca:xmlschemarootelementname">
-               <title>Schema Root Element Name</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:xmlschema">
-               <title>Schema</title>
-               <type>d:noderef</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-         <associations>
-            <association name="wca:renderingenginetemplates">
-               <title>Form Data Renderers</title>
-               <source>
-                  <role>wca:capture</role>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:renderingenginetemplate</class>
-                  <role>wca:presentation</role>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-              </target>
-            </association>
-            <child-association name="wca:formworkflowdefaults">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:workflowdefaults</class>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </target>
-            </child-association>
-         </associations>
-      </aspect>
-      
-      <!-- An XML to something else transformer. -->
-      <aspect name="wca:renderingenginetemplate">
-         <title>A Rendering Engine</title>
-         <properties>
-            <property name="wca:parentrenderingenginename">
-               <title>Type</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:formsource">
-               <title>Form Source</title>
-               <type>d:noderef</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-         <associations>
-            <child-association name="wca:renditionproperties">
-               <title>Rendition Properties</title>
-               <source>
-                  <role>wca:capture</role>
-                  <mandatory>false</mandatory>
-                  <many>false</many>
-               </source>
-               <target>
-                  <class>wca:renditionproperties</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-              </target>
-            </child-association>
-         </associations>
-      </aspect>
-
-      <aspect name="wca:forminstancedata">
-         <title>XML file generated by a form</title>
-         <properties>
-            <property name="wca:parentformname">
-               <title>Form that generated this asset</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:originalparentpath">
-              <title>The original parent path when this form instance data was created - used for regenerating accurately.</title>
-              <type>d:text</type>
-              <mandatory>false</mandatory>
-            </property>
-
-            <property name="wca:renditions">
-               <title>Renditions of this form instance data</title>
-               <type>d:text</type>
-               <multiple>true</multiple>
-            </property>
-         </properties>
-      </aspect>
-
-      <aspect name="wca:rendition">
-         <title>Output file generated by a rendering engine template</title>
-         <properties>
-            <property name="wca:parentrenderingenginetemplate">
-               <title>Form data renderer that generated this asset</title>
-               <type>d:noderef</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:parentrenditionproperties">
-               <title>Rendition properties used for this rendition</title>
-               <type>d:noderef</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="wca:primaryforminstancedata">
-               <title>Primary XML Asset used to generate this asset</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-      </aspect>
-      
-      <aspect name="wca:expires">
-         <title>Content that has or can expire</title>
-         <properties>
-            <property name="wca:expirationDate">
-               <title>Expiration Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="true">true</mandatory>
-			   <index enabled="true">
-				  <atomic>true</atomic>
-				  <stored>false</stored> 
-                  <tokenised>both</tokenised>
-               </index>
-            </property>
-         </properties>
-      </aspect>
-      
-      <aspect name="wca:deployed">
-         <title>Has this content been deployed from wcm</title>
-         <properties>
-            <property name="wca:guid">
-               <title>WCM unique version</title>
-               <type>d:text</type>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-         </properties>
-      </aspect>
-      
-   </aspects>
-
-</model>
diff --git a/config/alfresco/model/wcmModel.xml b/config/alfresco/model/wcmModel.xml
deleted file mode 100644
index 309d276c07..0000000000
--- a/config/alfresco/model/wcmModel.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<model name="wcm:wcmmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-   <description>WCM Specific Types</description>
-   <author>Alfresco</author>
-   <published>2006-10-06</published>
-   <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"/>
-      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
-   </imports>
-
-   <namespaces>
-      <namespace uri="http://www.alfresco.org/model/wcmmodel/1.0" prefix="wcm"/>
-   </namespaces>
-   
-   <types>
-      <!-- Consider this an abstract type for most purposes. -->
-      <type name="wcm:avmcontent">
-         <title>AVM Content</title>
-         <parent>cm:content</parent>
-      </type>
-      
-      <type name="wcm:avmplaincontent">
-         <title>AVM Plain content</title>
-         <parent>wcm:avmcontent</parent>
-      </type>
-      
-      <type name="wcm:avmlayeredcontent">
-         <title>AVM Layered Content</title>
-         <parent>cm:content</parent>
-         <properties>
-            <property name="wcm:avmfileindirection">
-               <title>File Layer Indirection</title>
-               <type>d:noderef</type>
-               <mandatory>true</mandatory>
-            </property>
-         </properties>
-      </type>
-      
-      <!-- Consider this abstract for most purposes. -->
-      <type name="wcm:avmfolder">
-         <title>AVM Folder</title>
-         <parent>cm:folder</parent>
-      </type>
-          
-      <type name="wcm:avmplainfolder">
-         <title>AVM Plain Folder</title>
-         <parent>wcm:avmfolder</parent>
-      </type>
-          
-      <type name="wcm:avmlayeredfolder">
-         <title>AVM Layered Folder</title>
-         <parent>wcm:avmfolder</parent>
-         <properties>
-            <property name="wcm:avmdirindirection">
-               <title>Directory Layer Indirection</title>
-               <type>d:noderef</type>
-               <mandatory>true</mandatory>
-             </property>
-          </properties>
-      </type>
-
-   </types>
-   
-   <aspects>
-       <!-- Captures the node that a node was reverted from. -->
-       <aspect name="wcm:reverted">
-           <title>Contains a reference to the node that this node was reverted from.</title>
-           <properties>
-               <property name="wcm:revertedid">
-                   <title>The id of the node this was reverted from.</title>
-                   <type>d:long</type>
-                   <mandatory>true</mandatory>
-               </property>
-           </properties>
-       </aspect>
-   </aspects>
-   
-</model>
diff --git a/config/alfresco/node-services-context.xml b/config/alfresco/node-services-context.xml
index 100fb988ac..61ff230c80 100644
--- a/config/alfresco/node-services-context.xml
+++ b/config/alfresco/node-services-context.xml
@@ -76,7 +76,6 @@
          <map>
             <entry key="workspace"><ref bean="mtAwareNodeService"></ref></entry>
             <entry key="versionStore"><ref bean="versionNodeService"></ref></entry>
-            <entry key="avm"><ref bean="avmNodeService"/></entry>
          </map>
       </property>
    </bean>
@@ -167,22 +166,6 @@
         <property name="methodSecurity" ref="ArchivedNodes_security_listArchivedNodes"/>
    </bean>  
 
-   <!-- AVMNodeService -->
-   <bean id="avmNodeService" class="org.alfresco.repo.avm.AVMNodeService" init-method="init">
-      <property name="dictionaryService">
-         <ref bean="dictionaryService"/>
-      </property>
-      <property name="avmService">
-         <ref bean="avmService"/>
-      </property>
-      <property name="policyComponent">
-         <ref bean="policyComponent"/>
-      </property>
-      <property name="tenantService">
-         <ref bean="tenantService"/>
-      </property>
-   </bean>
-
    <!-- ensures model-compliance of node structures -->
    <bean id="integrityChecker" class="org.alfresco.repo.node.integrity.IntegrityChecker" init-method="init">
       <property name="policyComponent" ref="policyComponent"/>
@@ -272,7 +255,6 @@
       <property name="permissionService" ref="permissionServiceImpl" />
       <property name="policyComponent" ref="policyComponent"/>
       <property name="storeArchiveMap" ref="storeArchiveMap"/>
-      <property name="avmNodeService" ref="avmNodeService"/>
       <property name="nodeIndexer" ref="nodeIndexer"/>
       <property name="policyBehaviourFilter" ref="policyBehaviourFilter" />
       <property name="tenantService" ref="tenantService"/>
diff --git a/config/alfresco/remote-avm-test-context.xml b/config/alfresco/remote-avm-test-context.xml
deleted file mode 100644
index 940c48d88c..0000000000
--- a/config/alfresco/remote-avm-test-context.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING/DTD BEAN//EN"
-	"http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-    <!-- Remote authentication service. -->
-    <bean id="authenticationService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-        <property name="serviceUrl">
-            <value>rmi://localhost:50500/authentication</value>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.security.AuthenticationService</value>
-        </property>
-        <property name="refreshStubOnConnectFailure">
-            <value>true</value>
-        </property>
-    </bean>
-
-    <!-- Client Ticket Holder Bean. -->
-    <bean id="clientTicketHolder" class="org.alfresco.repo.remote.ClientTicketHolderGlobal"/>
-
-	<!-- Remote interface for AVM. -->
-	<bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
-	    <property name="avmRemoteTransport">
-	        <ref bean="avmRemoteTransport"/>
-	    </property>
-	    <property name="clientTicketHolder">
-	        <ref bean="clientTicketHolder"/>
-	    </property>
-	</bean>
-
-	<!-- RMI Proxy bean for avmRemoteTransport -->
-	<bean id="avmRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-		<property name="serviceUrl">
-			<value>rmi://localhost:50500/avm</value>
-		</property>
-		<property name="serviceInterface">
-			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
-		</property>
-		<property name="refreshStubOnConnectFailure">
-			<value>true</value>
-		</property>
-	</bean>
-
-	<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceRemote">
-	    <property name="avmSyncServiceTransport">
-	    	<ref bean="avmSyncServiceTransport"/>
-	    </property>
-	    <property name="clientTicketHolder">
-	        <ref bean="clientTicketHolder"/>
-	    </property>
-	</bean>
-
-    <bean id="avmSyncServiceTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-        <property name="serviceUrl">
-            <value>rmi://localhost:50500/avmsync</value>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
-        </property>
-        <property name="refreshStubOnConnectFailure">
-            <value>true</value>
-        </property>
-    </bean>
-    
-    
-    <!-- NameMatcher beans for filtering what shows up as different in compares. -->
-    <bean id="excludeRegexMatcher" class="org.alfresco.util.RegexNameMatcher">
-        <property name="patterns">
-            <!--
-            NOTE:  Regexes are implicitly anchored with ^ and $ in this context.
-            -->
-            <list>
-                <value>.*/#[^/]*</value>    <!-- A leaf starting with '#' -->
-            </list>
-        </property>
-    </bean>
-
-    <bean id="excludeExtensionMatcher" class="org.alfresco.repo.avm.util.FileExtensionNameMatcher">
-        <property name="extensions">
-            <list>
-                <value>.o</value>
-                <value>.bak</value>
-                <value>.tmp</value>
-                <value>~</value>
-            </list>
-        </property>
-    </bean>
-    
-    <bean id="globalPathExcluder" class="org.alfresco.util.OrCompositeNameMatcher">
-        <property name="matchers">
-            <list>
-                <ref bean="excludeExtensionMatcher"/>
-                <ref bean="excludeRegexMatcher"/>
-            </list>
-        </property>
-    </bean>
-    
-</beans>
diff --git a/config/alfresco/remote-services-context.xml b/config/alfresco/remote-services-context.xml
index 1c784f7751..b4aa7171d0 100644
--- a/config/alfresco/remote-services-context.xml
+++ b/config/alfresco/remote-services-context.xml
@@ -4,73 +4,6 @@
 
 <beans>
 
-	<!--  Alfresco Remote Services Definition -->
-	<bean id="avmRemoteTransport" class="org.alfresco.repo.avm.AVMRemoteTransportService"
-		init-method="init" destroy-method="shutDown">
-		<property name="idleTimeout">
-			<value>${avm.remote.idlestream.timeout}</value>
-		</property>
-		<property name="avmService">
-			<ref bean="AVMService"/>
-		</property>
-		<property name="authenticationService">
-		    <ref bean="AuthenticationService"/>
-		</property>
-	</bean>
-	
-	<!-- The RMI wrapper around the AVM remote interface. -->
-	
-	<bean id="avmRemoteService" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
-		<property name="service">
-			<ref bean="avmRemoteTransport"/>
-		</property>
-		<property name="serviceInterface">
-			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
-		</property>
-		<property name="serviceName">
-			<value>avm</value>
-		</property>
-		<property name="servicePort">
-			<value>${avm.rmi.service.port}</value>
-		</property>
-	    <property name="enabled">
-			<value>${avm.rmi.service.enabled}</value>
-		</property>
-		<property name="clientSocketFactory">
-			<ref bean="hostConfigurableSocketFactory" />
-		</property>
-	</bean>
-			
-    <bean id="avmSyncServiceTransport" class="org.alfresco.repo.avm.AVMSyncServiceTransportImpl">
-        <property name="authenticationService">
-            <ref bean="AuthenticationService"/>
-        </property>
-        <property name="avmSyncService">
-            <ref bean="AVMSyncService"/>
-        </property>
-    </bean>
-			
-    <bean id="avmSyncServiceTransportRMI" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
-        <property name="service">
-            <ref bean="avmSyncServiceTransport"/>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
-        </property>
-        <property name="serviceName">
-            <value>avmsync</value>
-        </property>
-        <property name="servicePort">
-			<value>${avmsync.rmi.service.port}</value>
-		</property>
-	    <property name="enabled">
-			<value>${avmsync.rmi.service.enabled}</value>
-		</property>
-		<property name="clientSocketFactory">
-			<ref bean="hostConfigurableSocketFactory" />
-		</property>
-    </bean>
-    
     <!-- The AuthenticationService exported as an RMI service. -->
 	<bean id="rmiAuthenticationService" class="org.alfresco.util.remote.server.AlfrescoRMIServiceExporter" parent="baseServiceExporter">
 		<property name="service">
diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index 2dc67d2e7f..e5fbba41a7 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -182,24 +182,6 @@
         </property>
     </bean>
     
-    <bean id="avmScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.jscript.AVM">
-        <property name="extensionName">
-            <value>avm</value>
-        </property>        
-        <property name="serviceRegistry">
-            <ref bean="ServiceRegistry"/>
-        </property>
-    </bean>
-    
-    <bean id="crossCopyScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.jscript.CrossRepositoryCopy">
-        <property name="extensionName">
-            <value>crossRepoCopy</value>
-        </property>        
-        <property name="serviceRegistry">
-            <ref bean="ServiceRegistry"/>
-        </property>
-    </bean>
-    
     <bean id="workflowScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.workflow.jscript.WorkflowManager">
         <property name="extensionName">
             <value>workflow</value>
diff --git a/config/alfresco/subsystems/Search/common-search-context.xml b/config/alfresco/subsystems/Search/common-search-context.xml
index 9522180cbf..348fbfe72b 100644
--- a/config/alfresco/subsystems/Search/common-search-context.xml
+++ b/config/alfresco/subsystems/Search/common-search-context.xml
@@ -43,41 +43,6 @@
         <!-- Query collections should be loaded on demand using this component - once loaded thay are available for use -->
     </bean>
     
-    <!-- Sparta: remove WCM/AVM
-    <bean id="search.avmSnapShotTriggeredIndexingMethodInterceptor" class="org.alfresco.repo.search.AVMSnapShotTriggeredIndexingMethodInterceptorImpl">
-        <property name="avmService">
-            <ref bean="avmService" />
-        </property>
-        <property name="indexerAndSearcher">
-            <ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-        </property>
-        <property name="enableIndexing">
-            <value>true</value>
-        </property>
-        <property name="defaultMode">
-            <value>SYNCHRONOUS</value>
-        </property>
-        <property name="searchApplicationContextFactory">
-             <ref bean="Search" />
-        </property>
-        <property name="indexingDefinitions">
-            <list>
-                <value>SYNCHRONOUS:TYPE:STAGING</value>
-                <value>UNINDEXED:TYPE:STAGING_PREVIEW</value>
-                <value>UNINDEXED:TYPE:AUTHOR</value>
-                <value>UNINDEXED:TYPE:AUTHOR_PREVIEW</value>
-                <value>UNINDEXED:TYPE:WORKFLOW</value>
-                <value>UNINDEXED:TYPE:WORKFLOW_PREVIEW</value>
-                <value>UNINDEXED:TYPE:AUTHOR_WORKFLOW</value>
-                <value>UNINDEXED:TYPE:AUTHOR_WORKFLOW_PREVIEW</value>
-                <value>ASYNCHRONOUS:NAME:avmAsynchronousTest</value>
-                <value>SYNCHRONOUS:NAME:.*</value>
-            </list>
-        </property>
-    </bean>
-    -->
-    
-    
     <bean id="search.fts.alfresco.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
 	    <property name="factories">
 			<list>
diff --git a/config/alfresco/subsystems/Search/lucene/bootstrap-context.xml b/config/alfresco/subsystems/Search/lucene/bootstrap-context.xml
index 1351a6ac64..bb9ff54a7a 100644
--- a/config/alfresco/subsystems/Search/lucene/bootstrap-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/bootstrap-context.xml
@@ -11,14 +11,6 @@
        </property>
     </bean>
     
-    <!-- Sparta: remove WCM/AVM
-    <bean id="search.avmIndexRecoveryBootstrap" class="org.alfresco.repo.node.index.IndexRecoveryBootstrapBean" >
-       <property name="indexRecoveryComponent">
-          <ref bean="search.avmIndexRecoveryComponent"/>
-       </property>
-    </bean>
-    -->
-    
     <bean id="search.indexConfigurationCheckerBootstrap" class="org.alfresco.repo.admin.IndexConfigurationCheckerBootstrapBean">
        <property name="strict">
            <value>${system.bootstrap.config_check.strict}</value>
diff --git a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
index e9163ae0c7..81564db88b 100644
--- a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
@@ -78,24 +78,6 @@
       </property>
    </bean>
 	
-	<!-- Sparta: remove WCM/AVM
-   <bean
-         id="search.avmIndexRecoveryComponent"
-         class="org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent"
-         parent="search.indexRecoveryComponentBase">
-      <property name="recoveryMode">
-          <value>${index.recovery.mode}</value>
-      </property>
-	   <property name="avmService">
-          <ref bean="avmService" />
-      </property>
-	   <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
-		   <ref bean="search.avmSnapShotTriggeredIndexingMethodInterceptor" />
-      </property>
-   </bean>
-   -->
-	
-
    <!-- Index tracking -->
    <!--
       This is the default index tracker component.  It is used during bootstrap when incremental recovery
@@ -153,52 +135,6 @@
         </property>
     </bean>
 
-    <!--===========================-->
-    <!-- AVM (WCM) index tracking  -->
-    <!--===========================-->
-    
-    <!-- Sparta: remove WCM/AVM
-    <bean
-          id="search.avmIndexTrackerComponent"
-          class="org.alfresco.repo.node.index.AVMRemoteSnapshotTracker"
-          parent="search.indexRecoveryComponentBase">
-	   <property name="avmService">
-          <ref bean="avmService" />
-      </property>
-	   <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
-		   <ref bean="search.avmSnapShotTriggeredIndexingMethodInterceptor" />
-      </property>
-    </bean>
-
-    <bean id="search.baseAvmIndexJobDetail" abstract="true" class="org.springframework.scheduling.quartz.JobDetailBean">
-        <property name="jobClass">
-            <value>org.alfresco.repo.node.index.NoOpIndexRecoveryJob</value>
-        </property>
-        <property name="jobDataAsMap">
-            <map>
-                <entry key="indexRecoveryComponent">
-                    <ref bean="search.avmIndexTrackerComponent" />
-                </entry>
-            </map>
-        </property>
-    </bean>
-    
-    <bean id="search.avmIndexJobDetail" parent="search.baseAvmIndexJobDetail"/>
-    
-    <bean id="search.avmIndexTrackerTrigger" class="org.alfresco.util.CronTriggerBean">
-        <property name="jobDetail" ref="search.avmIndexJobDetail"/>
-        <property name="scheduler">
-            <ref bean="searchSchedulerFactory" />
-        </property>
-        <property name="cronExpression">
-            <value>${index.tracking.avm.cronExpression}</value>
-        </property>
-        <property name="startDelayMinutes">
-            <value>${system.cronJob.startDelayMinutes}</value>
-        </property>
-    </bean>
-    -->
-    
    <!-- Failed FTS reindexer -->
    <!--
       Bean that triggers full text indexing for content that was previously flagged with:
diff --git a/config/alfresco/subsystems/Search/lucene/index-recovery.properties b/config/alfresco/subsystems/Search/lucene/index-recovery.properties
index 3ce098e56e..e95bd83a93 100644
--- a/config/alfresco/subsystems/Search/lucene/index-recovery.properties
+++ b/config/alfresco/subsystems/Search/lucene/index-recovery.properties
@@ -7,5 +7,4 @@ index.tracking.reindexLagMs=1000
 index.tracking.maxRecordSetSize=1000
 index.tracking.disableInTransactionIndexing=false
 index.tracking.adm.cronExpression=0/5 * * * * ?
-index.tracking.avm.cronExpression=0/5 * * * * ?
 index.reindexMissingContent.cronExpression=* * * * * ? 2099
\ No newline at end of file
diff --git a/config/alfresco/subsystems/Search/lucene/lucene-search-context.xml b/config/alfresco/subsystems/Search/lucene/lucene-search-context.xml
index baf2471931..0be0005e70 100644
--- a/config/alfresco/subsystems/Search/lucene/lucene-search-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/lucene-search-context.xml
@@ -52,11 +52,6 @@
                 <entry key="workspace">
                     <ref bean="search.admLuceneIndexerAndSearcherFactory"></ref>
                 </entry>
-                <!-- Sparta: remove WCM/AVM
-                <entry key="avm">
-                    <ref bean="search.avmLuceneIndexerAndSearcherFactory"></ref>
-                </entry>
-                -->
             </map>
         </property>
         <property name="redirectedStoreBindings">
@@ -86,9 +81,6 @@
                 <entry key="versionStore">
                     <ref bean="search.luceneCategoryService"></ref>
                 </entry>
-                <entry key="avm">
-                    <ref bean="search.luceneCategoryService"></ref>
-                </entry>
             </map>
         </property>
     </bean>
@@ -113,9 +105,6 @@
 			<list>
 			    <ref bean="search.admLuceneIndexerAndSearcherFactory" />	
 				<ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />	
-				<!-- Sparta: remove WCM/AVM
-				<ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-				-->	
 			</list>
         </property>
     </bean>
@@ -125,9 +114,6 @@
 			<list>
 			    <ref bean="search.admLuceneIndexerAndSearcherFactory" />	
 				<ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />	
-				<!-- Sparta: remove WCM/AVM
-				<ref bean="search.avmLuceneIndexerAndSearcherFactory" />	
-				-->
 			</list>
         </property>
     </bean>
@@ -140,9 +126,6 @@
 			<list>
 			    <ref bean="search.admLuceneIndexerAndSearcherFactory" />	
 				<ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />	
-				<!-- Sparta: remove WCM/AVM
-				<ref bean="search.avmLuceneIndexerAndSearcherFactory" />	
-				-->
 			</list>
         </property>
     </bean>
@@ -348,79 +331,6 @@
         </property>
     </bean>
 
-    <!-- Indexer and searchers for lucene -->
-    <!-- Sparta: remove WCM/AVM
-    <bean id="search.avmLuceneIndexerAndSearcherFactory"
-        parent="search.abstractLuceneIndexerAndSearcherFactory"
-        class="org.alfresco.repo.search.impl.lucene.AVMLuceneIndexerAndSearcherFactory">
-        <property name="nodeService">
-            <ref bean="mlAwareNodeService" />
-        </property>
-        <property name="tenantService">
-            <ref bean="tenantService"/>
-        </property>
-        <property name="dictionaryService">
-            <ref bean="dictionaryService" />
-        </property>
-        <property name="nameSpaceService">
-            <ref bean="namespaceService" />
-        </property>
-        <property name="contentService">
-            <ref bean="contentService" />
-        </property>
-        <property name="transactionService">
-            <ref bean="transactionService" />
-        </property>
-        <property name="contentStore">
-            <ref bean="fileContentStore"/>
-        </property>
-        <property name="avmService">
-            <ref bean="avmService" />
-        </property>
-        <property name="avmSyncService">
-            <ref bean="avmSyncService" />
-        </property>
-        <property name="queryRegister">
-            <ref bean="search.queryRegisterComponent" />
-        </property>
-        <property name="threadPoolExecutor">
-            <ref bean="search.indexThreadPoolExecutor"></ref>
-        </property>
-        <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
-            <ref bean="search.avmSnapShotTriggeredIndexingMethodInterceptor" />
-        </property>
-        <property name="transformerDebug">
-            <ref bean="transformerDebug"></ref>
-        </property>
-    </bean>
-    -->
-    
-    <!-- Sparta: remove WCM/AVM
-	<bean id="search.avm.luceneQueryEngineImpl" class="org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryEngine" >
-        <property name="dictionaryService">
-            <ref bean="dictionaryService" />
-        </property>
-        <property name="indexAndSearcher">
-            <ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-        </property>
-        <property name="nodeService">
-            <ref bean="nodeService" />
-        </property>
-        <property name="tenantService">
-            <ref bean="tenantService" />
-        </property>
-        <property name="namespaceService">
-            <ref bean="namespaceService" />
-        </property>
-        <property name="useInMemorySort">
-            <value>${lucene.indexer.useInMemorySort}</value>
-        </property>
-        <property name="maxRawResultSetSizeForInMemorySort">
-            <value>${lucene.indexer.maxRawResultSetSizeForInMemorySort}</value>
-        </property>
-    </bean>
-    -->
-    
     <!-- Indexer and searchers for lucene -->
     <bean id="search.luceneCategoryService" class="org.alfresco.repo.search.impl.lucene.LuceneCategoryServiceImpl">
         <property name="nodeService">
@@ -490,10 +400,5 @@
        <property name="searchService">
            <ref bean="search.searchService"/>
        </property>
-       <!-- Sparta: remove WCM/AVM
-       <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
-           <ref bean="search.avmSnapShotTriggeredIndexingMethodInterceptor"/>
-       </property>
-       -->
     </bean>
 </beans>
diff --git a/config/alfresco/subsystems/Search/lucene/opencmis-context.xml b/config/alfresco/subsystems/Search/lucene/opencmis-context.xml
index 577fbbab91..89e4019d97 100644
--- a/config/alfresco/subsystems/Search/lucene/opencmis-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/opencmis-context.xml
@@ -26,9 +26,6 @@
             <list>
                 <ref bean="search.admLuceneIndexerAndSearcherFactory" />
                 <ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />
-                <!-- Sparta: remove WCM/AVM
-                <ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-                -->
             </list>
         </property>
     </bean>
@@ -41,9 +38,6 @@
             <list>
                 <ref bean="search.admLuceneIndexerAndSearcherFactory" />
                 <ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />
-                <!-- Sparta: remove WCM/AVM
-                <ref bean="search.avmLuceneIndexerAndSearcherFactory" />
-                -->
             </list>
         </property>
     </bean>
diff --git a/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml b/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
index 8dae849321..21b698767d 100644
--- a/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
+++ b/config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
@@ -59,7 +59,6 @@
     
     <alias name="search.indexerAndSearcherFactory" alias="search.admLuceneIndexerAndSearcherFactory"/>
     <alias name="search.indexerAndSearcherFactory" alias="search.admLuceneUnIndexedIndexerAndSearcherFactory"/>
-    <alias name="search.indexerAndSearcherFactory" alias="search.avmLuceneIndexerAndSearcherFactory"/>
     
     <bean id="search.categoryService" class="org.alfresco.repo.service.StoreRedirectorProxyFactory">
         <property name="proxyInterface">
@@ -76,9 +75,6 @@
                 <entry key="versionStore">
                     <ref bean="search.luceneCategoryService"></ref>
                 </entry>
-                <entry key="avm">
-                    <ref bean="search.luceneCategoryService"></ref>
-                </entry>
             </map>
         </property>
     </bean>
@@ -109,8 +105,6 @@
          class="org.alfresco.repo.search.impl.noindex.NoIndexIndexRecovery" >
     </bean>
    
-   <alias name="search.indexRecoveryComponent" alias="search.avmIndexRecoveryComponent"/>
-	
 	<bean id="search.indexConfigurationChecker" class="org.alfresco.repo.admin.DummyIndexConfigurationCheckerImpl">
     </bean>
     
diff --git a/config/alfresco/subsystems/Search/solr/solr-search-context.xml b/config/alfresco/subsystems/Search/solr/solr-search-context.xml
index e81ba4bf3a..ff06d1cbe3 100644
--- a/config/alfresco/subsystems/Search/solr/solr-search-context.xml
+++ b/config/alfresco/subsystems/Search/solr/solr-search-context.xml
@@ -243,7 +243,6 @@
     
     <alias name="search.indexerAndSearcherFactory" alias="search.admLuceneIndexerAndSearcherFactory"/>
     <alias name="search.indexerAndSearcherFactory" alias="search.admLuceneUnIndexedIndexerAndSearcherFactory"/>
-    <alias name="search.indexerAndSearcherFactory" alias="search.avmLuceneIndexerAndSearcherFactory"/>
     
     <bean id="search.categoryService" class="org.alfresco.repo.service.StoreRedirectorProxyFactory">
         <property name="proxyInterface">
@@ -260,9 +259,6 @@
                 <entry key="versionStore">
                     <ref bean="search.luceneCategoryService"></ref>
                 </entry>
-                <entry key="avm">
-                    <ref bean="search.luceneCategoryService"></ref>
-                </entry>
             </map>
         </property>
     </bean>
@@ -293,8 +289,6 @@
          class="org.alfresco.repo.search.impl.solr.SolrIndexRecovery" >
    </bean>
    
-   <alias name="search.indexRecoveryComponent" alias="search.avmIndexRecoveryComponent"/>
-	
 	<bean id="search.indexConfigurationChecker" class="org.alfresco.repo.admin.DummyIndexConfigurationCheckerImpl">
     </bean>
     
diff --git a/config/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml b/config/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml
index 4faf5faa63..2a5a019a4a 100644
--- a/config/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml
+++ b/config/alfresco/subsystems/email/OutboundSMTP/mail-template-services-context.xml
@@ -45,15 +45,6 @@
         </property>
     </bean>
     
-    <bean id="mailAvmExtension" parent="mailBaseTemplateImplementation" class="org.alfresco.repo.template.AVM">
-        <property name="extensionName">
-            <value>avm</value>
-        </property>
-        <property name="serviceRegistry">
-            <ref bean="ServiceRegistry"/>
-        </property>
-    </bean>
-    
     <bean id="mailSessionTemplateExtension" parent="mailBaseTemplateImplementation" class="org.alfresco.repo.template.Session">
         <property name="extensionName">
             <value>session</value>
diff --git a/config/alfresco/subsystems/fileServers/default/file-servers-context.xml b/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
index 6c75d51bbd..dc1438f96f 100644
--- a/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
@@ -541,24 +541,6 @@
                   <property name="defaultAccessLevel"> <value>Write</value> </property> </bean> </property>
                -->
             </bean>
-            
-            
-            <!-- AVM virtualization view of all stores/versions for WCM -->
-            <!-- virtual view stores filter can be any of the following: normal, site, staging, author, preview -->
-            
-            <!-- AVM context deprecated - uncomment to add back
-            <bean class="org.alfresco.filesys.avm.AVMContext">
-               <property name="deviceName">
-                  <value>${filesystem.avm.name}</value>
-               </property>
-               <property name="virtualView">
-                  <value>${filesystem.avm.enabled}</value>
-               </property>
-               <property name="stores">
-                  <value>${filesystem.avm.stores}</value>
-               </property>
-            </bean>
-            -->
          </list>
       </property>
    </bean>
diff --git a/config/alfresco/subsystems/fileServers/default/file-servers.properties b/config/alfresco/subsystems/fileServers/default/file-servers.properties
index ae89c2731d..f2846573d3 100644
--- a/config/alfresco/subsystems/fileServers/default/file-servers.properties
+++ b/config/alfresco/subsystems/fileServers/default/file-servers.properties
@@ -2,14 +2,6 @@
 filesystem.name=Alfresco
 filesystem.acl.global.defaultAccessLevel=
 
-# AVM filesystem context
-filesystem.avm.name=AVM
-# Are the virtual views enabled  
-filesystem.avm.enabled=true
-# virtual view stores filter can be any of the following: normal, site, staging, author, preview
-filesystem.avm.stores=site,staging,author
-        
-
 ### Root directory to open onto ###
 filesystem.storeName=${spaces.store}
 filesystem.rootPath=${protocols.rootPath}
diff --git a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
index 1931085a5c..0e6e443dec 100644
--- a/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/network-protocol-context.xml
@@ -40,11 +40,6 @@
       <property name="diskInterface">
          <ref bean="contentDiskDriver"/>
       </property>
-      <!-- Sparta: remove WCM/AVM
-      <property name="avmDiskInterface">
-         <ref bean="avmDiskDriver"/>
-      </property>
-      -->
    </bean>
    
    <!-- IO Handler -->
@@ -439,22 +434,4 @@
       </property>
    </bean>
    
-   <!-- WCM/AVM Filesystem Interface -->
-   <!-- Sparta: remove WCM/AVM
-   <bean id="avmDiskDriver" class="org.alfresco.filesys.avm.AVMDiskDriver">
-      <property name="avmService"><ref bean="AVMLockingAwareService"/></property>
-      <property name="transactionService"><ref bean="transactionService"/></property>
-      <property name="authenticationComponent"><ref bean="authenticationComponent"/></property>
-      <property name="authenticationService"><ref bean="authenticationService"/></property>
-      <property name="mimetypeService"><ref bean="mimetypeService"/></property>
-      <property name="serviceRegistry"><ref bean="ServiceRegistry"/></property>
-      <property name="nodeService"><ref bean="NodeService"/></property>
-      
-      <property name="createStoreListener"><ref bean="createStoreTxnListener"/></property>
-      <property name="purgeStoreListener"><ref bean="purgeStoreTxnListener"/></property>
-      <property name="createVersionListener"><ref bean="createVersionTxnListener"/></property>
-      <property name="purgeVersionListener"><ref bean="purgeVersionTxnListener"/></property>
-   </bean>
-   -->
-   
 </beans>
diff --git a/config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.properties b/config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.properties
deleted file mode 100644
index 3191d895eb..0000000000
--- a/config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# WCM Deployment - Receiver Properties
-
-wcm-deployment-receiver.rmi.service.port=${deployment.rmi.service.port}
-wcm-deployment-receiver.poll.delay=5000
\ No newline at end of file
diff --git a/config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.xml b/config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.xml
deleted file mode 100644
index 26bbf4a150..0000000000
--- a/config/alfresco/subsystems/wcm_deployment_receiver/default/deployment-receiver-context.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<beans>
-
-    <!-- Repository Embedded Deployment Receiver Configuration -->
-     
-    <!--  command queue for deployment service -->
-    <bean id="deploymentReceiverCommandQueue" class="org.alfresco.deployment.impl.server.DeploymentCommandQueueImpl" > 
-    </bean> 
-
-    <!--  Housekeeper for the deployment queue  -->
-    <bean id="commandQueueHousekeeper" class="org.alfresco.deployment.impl.server.DeploymentCommandQueueHousekeeper"
-    	init-method="init">
-    	<property name="commandQueue"><ref bean="deploymentReceiverCommandQueue" /></property>
-    </bean>    
-    
-    <!--  Management for reader threads -->
-    <bean id="deploymentReaderManagement" class="org.alfresco.deployment.impl.server.ReaderManagementPool" > 
-    </bean> 
-
-    <!-- This is the deployment engine which is built into the repository  -->
-    <bean id="deploymentReceiverEngine" 
-    	class="org.alfresco.deployment.impl.server.DeploymentReceiverEngineImpl" 
-        init-method="init">
-        
-        <!-- How long to wait before polling housekeeping -->
-        <property name="pollDelay"><value>${wcm-deployment-receiver.poll.delay}</value></property>
-        
-        <property name="commandQueue"><ref bean="deploymentReceiverCommandQueue" /></property>
-        
-        <property name="readerManagement"><ref bean="deploymentReaderManagement" /></property>
-        
-        <!--  This is the repo based deployment engine which does not need a keep alive thread -->
-        <property name="daemonThread"><value>true</value></property>
-        
-        <!-- Define your content transformers here 
-        <property name="transformers"> 
-            <list>
-            </list>
-        </property>
-        -->
-        
-        <!-- Define your housekeepers here -->
-        <property name="housekeepers">
-        	<set>
-        	<ref bean="commandQueueHousekeeper"/>
-        	</set>
-        </property>
-    </bean>
-    
-    <!--  The remote interface for the deployment receiver engine -->
-    
-	<bean id="deploymentReceiverTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter" parent="baseServiceExporter">
-		<property name="service">
-			<ref bean="deploymentReceiverEngine"/>
-		</property>
-		<property name="serviceInterface">
-			<value>org.alfresco.deployment.DeploymentReceiverTransport</value>
-		</property>
-		<property name="serviceName">
-			<value>deployment</value>
-		</property>
-		<property name="servicePort">
-			<value>${wcm-deployment-receiver.rmi.service.port}</value>
-		</property>
-	</bean>
-	
-	<!--  Now import the deployment targets -->
-	<import resource="classpath*:alfresco/deployment/*-target.xml" />
-	<import resource="classpath*:alfresco/extension/deployment/*-target.xml" />
-    
-</beans>
diff --git a/config/alfresco/template-services-context.xml b/config/alfresco/template-services-context.xml
index 912ce2c23c..84c65ddab8 100644
--- a/config/alfresco/template-services-context.xml
+++ b/config/alfresco/template-services-context.xml
@@ -48,15 +48,6 @@
         </property>
     </bean>
     
-    <bean id="avmExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.AVM">
-        <property name="extensionName">
-            <value>avm</value>
-        </property>
-        <property name="serviceRegistry">
-            <ref bean="ServiceRegistry"/>
-        </property>
-    </bean>
-    
     <bean id="sessionTemplateExtension" parent="baseTemplateImplementation" class="org.alfresco.repo.template.Session">
         <property name="extensionName">
             <value>session</value>
diff --git a/config/alfresco/templates/following-email-templates.xml b/config/alfresco/templates/following-email-templates.xml
index 719d794c7c..c53262e5f8 100644
--- a/config/alfresco/templates/following-email-templates.xml
+++ b/config/alfresco/templates/following-email-templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
 
-  <cm:folder view:childName="app:following" xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0">  
+  <cm:folder view:childName="app:following" xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0">  
     <view:properties>
       <cm:name>${spaces.templates.email.following.name}</cm:name>
       <cm:title>${spaces.templates.email.following.name}</cm:title>
diff --git a/config/alfresco/templates/invite-email-templates.xml b/config/alfresco/templates/invite-email-templates.xml
index e7ab0611b7..858eac4e30 100644
--- a/config/alfresco/templates/invite-email-templates.xml
+++ b/config/alfresco/templates/invite-email-templates.xml
@@ -3,7 +3,7 @@
   <view:metadata>
     <view:exportOf>/app:company_home/app:dictionary/app:email_templates/cm:invite</view:exportOf>
   </view:metadata>
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -19,7 +19,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_fr.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_fr.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -35,7 +35,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_es.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_es.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -51,7 +51,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_de.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_de.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -67,7 +67,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_it.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_it.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -83,7 +83,7 @@
     </view:properties>
   </cm:content>
 
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_ja.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_ja.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -99,7 +99,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_nl.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:invite-email_nl.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
diff --git a/config/alfresco/templates/new-user-templates.xml b/config/alfresco/templates/new-user-templates.xml
index ce28206735..dd93518b1c 100644
--- a/config/alfresco/templates/new-user-templates.xml
+++ b/config/alfresco/templates/new-user-templates.xml
@@ -3,7 +3,7 @@
   <view:metadata>
     <view:exportOf>/app:company_home/app:dictionary/app:email_templates/cm:invite</view:exportOf>
   </view:metadata>
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -19,7 +19,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_fr.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_fr.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -35,7 +35,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_es.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_es.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -51,7 +51,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_de.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_de.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -67,7 +67,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_it.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_it.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -83,7 +83,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_ja.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_ja.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
@@ -99,7 +99,7 @@
     </view:properties>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_nl.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:new-user-email_nl.html.ftl">
     <view:aspects>
       <cm:auditable></cm:auditable>
       <sys:referenceable></sys:referenceable>
diff --git a/config/alfresco/templates/notify_email_templates.xml b/config/alfresco/templates/notify_email_templates.xml
index 886daf9454..1f2153f071 100644
--- a/config/alfresco/templates/notify_email_templates.xml
+++ b/config/alfresco/templates/notify_email_templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
@@ -15,7 +15,7 @@
     <view:associations></view:associations>
   </cm:content>
 
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_de.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_de.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
@@ -30,7 +30,7 @@
     <view:associations></view:associations>
   </cm:content>
 
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_es.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_es.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
@@ -45,7 +45,7 @@
     <view:associations></view:associations>
   </cm:content>
 
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_fr.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_fr.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
@@ -60,7 +60,7 @@
     <view:associations></view:associations>
   </cm:content>
 
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_it.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_it.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
@@ -75,7 +75,7 @@
     <view:associations></view:associations>
   </cm:content>
 
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_ja.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_ja.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
@@ -90,7 +90,7 @@
     <view:associations></view:associations>
   </cm:content>
   
-  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_nl.html.ftl">
+  <cm:content xmlns="" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rn="http://www.alfresco.org/model/rendition/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:lnk="http://www.alfresco.org/model/linksmodel/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cmiscustom="http://www.alfresco.org/model/cmis/custom" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:emailserver="http://www.alfresco.org/model/emailserver/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:ia="http://www.alfresco.org/model/calendar" xmlns:rule="http://www.alfresco.org/model/rule/1.0"  xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:dl="http://www.alfresco.org/model/datalist/1.0" xmlns:st="http://www.alfresco.org/model/site/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:custom="custom.model" xmlns:exif="http://www.alfresco.org/model/exif/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:blg="http://www.alfresco.org/model/blogintegration/1.0" xmlns:alf="http://www.alfresco.org" xmlns:cmis="http://www.alfresco.org/model/cmis/1.0/cs01" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:inwf="http://www.alfresco.org/model/workflow/invite/nominated/1.0" xmlns:imap="http://www.alfresco.org/model/imap/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:ver2="http://www.alfresco.org/model/versionstore/2.0" xmlns:stcp="http://www.alfresco.org/model/sitecustomproperty/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:imwf="http://www.alfresco.org/model/workflow/invite/moderated/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:trx="http://www.alfresco.org/model/transfer/1.0" view:childName="cm:notify_user_email_nl.html.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <app:inlineeditable></app:inlineeditable>
diff --git a/config/alfresco/templates/readme_template.xml b/config/alfresco/templates/readme_template.xml
index 629092a734..0aa97605e3 100644
--- a/config/alfresco/templates/readme_template.xml
+++ b/config/alfresco/templates/readme_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <cm:content xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:alf="http://www.alfresco.org" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:childName="cm:readme.ftl">
+  <cm:content xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:alf="http://www.alfresco.org" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:childName="cm:readme.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
       <cm:author></cm:author>
diff --git a/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java b/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
index 3dd26fbc24..2e85d2f4b5 100644
--- a/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
+++ b/source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
@@ -136,10 +136,6 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
   
   private ExtendedDiskInterface m_repoDiskInterface;
   
-  // AVM filesystem interface
-  
-  private ExtendedDiskInterface m_avmDiskInterface;
-  
   // Runtime platform type
   
   private Platform.Type m_platform = Platform.Type.Unchecked;
@@ -214,15 +210,6 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
       m_repoDiskInterface = diskInterface;
   }
 
-  /**
-   * Set the filesystem driver for the AVM based filesystem
-   * 
-   */
-  public void setAvmDiskInterface(ExtendedDiskInterface diskInterface)
-  {
-      m_avmDiskInterface = diskInterface;
-  }
-  
   /**
    * Set the authentication component
    * 
@@ -353,16 +340,6 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
       return m_repoDiskInterface;
   }
   
-  /**
-   * Return the disk interface to be used to create AVM filesystem shares
-   * 
-   * @return DiskInterface
-   */
-  public final ExtendedDiskInterface getAvmDiskInterface()
-  {
-      return m_avmDiskInterface;
-  }
-  
   /**
    * Initialize the configuration using the configuration service
    */
diff --git a/source/java/org/alfresco/filesys/AlfrescoConfigSection.java b/source/java/org/alfresco/filesys/AlfrescoConfigSection.java
index ca668075cb..58b4f1c613 100644
--- a/source/java/org/alfresco/filesys/AlfrescoConfigSection.java
+++ b/source/java/org/alfresco/filesys/AlfrescoConfigSection.java
@@ -45,10 +45,6 @@ public class AlfrescoConfigSection extends ConfigSection {
   
   private DiskInterface m_repoDiskInterface;
   
-  // AVM filesystem interface
-  
-  private DiskInterface m_avmDiskInterface;
-  
   // Main authentication service, public API
   
   private AuthenticationService m_authenticationService;
@@ -78,7 +74,6 @@ public class AlfrescoConfigSection extends ConfigSection {
     // Copy values from the server configuration bean
 
     m_repoDiskInterface = config.getRepoDiskInterface();
-    m_avmDiskInterface  = config.getAvmDiskInterface();
     
     m_authenticationService = config.getAuthenticationService();
     m_authenticationComponent = config.getAuthenticationComponent();
@@ -102,16 +97,6 @@ public class AlfrescoConfigSection extends ConfigSection {
       return m_repoDiskInterface;
   }
   
-  /**
-   * Return the disk interface to be used to create AVM filesystem shares
-   * 
-   * @return DiskInterface
-   */
-  public final DiskInterface getAvmDiskInterface()
-  {
-      return m_avmDiskInterface;
-  }
-  
   /**
    * Return the authentication service
    * 
diff --git a/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java b/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java
index 7269cea9ef..5eac76912f 100644
--- a/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java
+++ b/source/java/org/alfresco/filesys/NfsServerNodeMonitor.java
@@ -270,7 +270,7 @@ public class NfsServerNodeMonitor
     }
 
     /**
-     * Searches for {@link ShareDetails} to access NFS server cache for specific device name (e.g. 'Alfresco', 'AVM' etc)
+     * Searches for {@link ShareDetails} to access NFS server cache for specific device name (e.g. 'Alfresco', etc)
      * 
      * @param fileId - {@link Integer} value which contains <code>fileId</code> specific to device
      * @return {@link ShareDetails} instance which contains <code>fileId</code> key in the cache or <code>null</code> if such instance was not found
diff --git a/source/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java b/source/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java
index 12a5065c36..d1ab804eca 100644
--- a/source/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java
+++ b/source/java/org/alfresco/filesys/alfresco/AlfrescoDiskDriver.java
@@ -18,14 +18,6 @@
 
 package org.alfresco.filesys.alfresco;
 
-import java.io.IOException;
-import java.util.concurrent.Callable;
-
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.filesys.config.ServerConfigurationBean;
 import org.alfresco.filesys.repo.ContentContext;
 import org.alfresco.jlan.server.SrvSession;
 import org.alfresco.jlan.server.core.DeviceContext;
@@ -33,12 +25,10 @@ import org.alfresco.jlan.server.core.DeviceContextException;
 import org.alfresco.jlan.server.filesys.IOControlNotImplementedException;
 import org.alfresco.jlan.server.filesys.IOCtlInterface;
 import org.alfresco.jlan.server.filesys.NetworkFile;
-import org.alfresco.jlan.server.filesys.TransactionalFilesystemInterface;
 import org.alfresco.jlan.server.filesys.TreeConnection;
 import org.alfresco.jlan.smb.SMBException;
 import org.alfresco.jlan.smb.SMBStatus;
 import org.alfresco.jlan.util.DataBuffer;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.transaction.TransactionService;
 import org.apache.commons.logging.Log;
@@ -140,7 +130,6 @@ public abstract class AlfrescoDiskDriver implements IOCtlInterface, ExtendedDisk
             throw new SMBException(SMBStatus.NTErr, SMBStatus.NTInvalidParameter);
         
         // Check if the I/O control handler is enabled
-        // Not enabled for AVM
         
         if(tree.getContext() instanceof ContentContext)
         {
diff --git a/source/java/org/alfresco/repo/action/ActionServiceRemote.java b/source/java/org/alfresco/repo/action/ActionServiceRemote.java
deleted file mode 100644
index 89dec4eb16..0000000000
--- a/source/java/org/alfresco/repo/action/ActionServiceRemote.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.alfresco.repo.action;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.repo.remote.ClientTicketHolder;
-import org.alfresco.service.cmr.action.Action;
-import org.alfresco.service.cmr.action.ActionCondition;
-import org.alfresco.service.cmr.action.ActionConditionDefinition;
-import org.alfresco.service.cmr.action.ActionDefinition;
-import org.alfresco.service.cmr.action.ActionService;
-import org.alfresco.service.cmr.action.ActionServiceTransport;
-import org.alfresco.service.cmr.action.CompositeAction;
-import org.alfresco.service.cmr.action.CompositeActionCondition;
-import org.alfresco.service.cmr.action.ParameterConstraint;
-import org.alfresco.service.cmr.repository.NodeRef;
-
-/**
- * Client side implementation of ActionService for remote access.
- * @author britt
- */
-public class ActionServiceRemote implements ActionService
-{
-    private ClientTicketHolder fHolder;
-    
-    private ActionServiceTransport fTransport;
-    
-    public void setClientTicketHolder(ClientTicketHolder holder)
-    {
-        fHolder = holder;
-    }
-    
-    public void setActionServiceTransport(ActionServiceTransport transport)
-    {
-        fTransport = transport;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#createAction(java.lang.String)
-     */
-    public Action createAction(String name)
-    {
-        return fTransport.createAction(fHolder.getTicket(), name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#createAction(java.lang.String, java.util.Map)
-     */
-    public Action createAction(String name, Map<String, Serializable> params)
-    {
-        return fTransport.createAction(fHolder.getTicket(), name, params);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#createActionCondition(java.lang.String)
-     */
-    public ActionCondition createActionCondition(String name)
-    {
-        return fTransport.createActionCondition(fHolder.getTicket(), name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#createActionCondition(java.lang.String, java.util.Map)
-     */
-    public ActionCondition createActionCondition(String name,
-            Map<String, Serializable> params)
-    {
-        return fTransport.createActionCondition(fHolder.getTicket(), name, params);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#createCompositeAction()
-     */
-    public CompositeAction createCompositeAction()
-    {
-        return fTransport.createCompositeAction(fHolder.getTicket());
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#evaluateAction(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef)
-     */
-    public boolean evaluateAction(Action action, NodeRef actionedUponNodeRef)
-    {
-        return fTransport.evaluateAction(fHolder.getTicket(), action, actionedUponNodeRef);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#evaluateActionCondition(org.alfresco.service.cmr.action.ActionCondition, org.alfresco.service.cmr.repository.NodeRef)
-     */
-    public boolean evaluateActionCondition(ActionCondition condition,
-            NodeRef actionedUponNodeRef)
-    {
-        return fTransport.evaluateActionCondition(fHolder.getTicket(), condition, actionedUponNodeRef);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#executeAction(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef)
-     */
-    public void executeAction(Action action, NodeRef actionedUponNodeRef)
-    {
-        fTransport.executeAction(fHolder.getTicket(), action, actionedUponNodeRef);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#executeAction(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef, boolean)
-     */
-    public void executeAction(Action action, NodeRef actionedUponNodeRef,
-            boolean checkConditions)
-    {
-        fTransport.executeAction(fHolder.getTicket(), action, actionedUponNodeRef, checkConditions);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#executeAction(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef, boolean, boolean)
-     */
-    public void executeAction(Action action, NodeRef actionedUponNodeRef,
-            boolean checkConditions, boolean executeAsynchronously)
-    {
-        fTransport.executeAction(fHolder.getTicket(), action, actionedUponNodeRef, checkConditions);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getAction(org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
-     */
-    public Action getAction(NodeRef nodeRef, String actionId)
-    {
-        return fTransport.getAction(fHolder.getTicket(), nodeRef, actionId);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getActionConditionDefinition(java.lang.String)
-     */
-    public ActionConditionDefinition getActionConditionDefinition(String name)
-    {
-        return fTransport.getActionConditionDefinition(fHolder.getTicket(), name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getActionConditionDefinitions()
-     */
-    public List<ActionConditionDefinition> getActionConditionDefinitions()
-    {
-        return fTransport.getActionConditionDefinitions(fHolder.getTicket());
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getActionDefinition(java.lang.String)
-     */
-    public ActionDefinition getActionDefinition(String name)
-    {
-        return fTransport.getActionDefinition(fHolder.getTicket(), name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getActionDefinitions()
-     */
-    public List<ActionDefinition> getActionDefinitions()
-    {
-        return fTransport.getActionDefinitions(fHolder.getTicket());
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getActionDefinitions(org.alfresco.service.cmr.repository.NodeRef)
-     */
-    public List<ActionDefinition> getActionDefinitions(NodeRef nodeRef)
-    {
-        return fTransport.getActionDefinitions(fHolder.getTicket(), nodeRef);
-    }
-
-    /**
-     * @see org.alfresco.service.cmr.action.ActionService#getParameterConstraint(java.lang.String)
-     */
-    public ParameterConstraint getParameterConstraint(String name)
-    {
-        return fTransport.getParameterConstraint(fHolder.getTicket(), name);
-    }
-    
-    /**
-     * @see org.alfresco.service.cmr.action.ActionService#getParameterConstraints()
-     */
-    public List<ParameterConstraint> getParameterConstraints()
-    {
-        return fTransport.getParameterConstraints(fHolder.getTicket());
-    }
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#getActions(org.alfresco.service.cmr.repository.NodeRef)
-     */
-    public List<Action> getActions(NodeRef nodeRef)
-    {
-        return fTransport.getActions(fHolder.getTicket(), nodeRef);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#removeAction(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.action.Action)
-     */
-    public void removeAction(NodeRef nodeRef, Action action)
-    {
-        fTransport.removeAction(fHolder.getTicket(), nodeRef, action);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#removeAllActions(org.alfresco.service.cmr.repository.NodeRef)
-     */
-    public void removeAllActions(NodeRef nodeRef)
-    {
-        fTransport.removeAllActions(fHolder.getTicket(), nodeRef);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.action.ActionService#saveAction(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.action.Action)
-     */
-    public void saveAction(NodeRef nodeRef, Action action)
-    {
-        fTransport.saveAction(fHolder.getTicket(), nodeRef, action);
-    }
-
-    public CompositeActionCondition createCompositeActionCondition() 
-    {
-        return null;
-    }
-}
diff --git a/source/java/org/alfresco/repo/action/executer/CopyToWebProjectActionExecuter.java b/source/java/org/alfresco/repo/action/executer/CopyToWebProjectActionExecuter.java
deleted file mode 100644
index ba70f6bfee..0000000000
--- a/source/java/org/alfresco/repo/action/executer/CopyToWebProjectActionExecuter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.alfresco.repo.action.executer;
-
-import java.util.List;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.action.ParameterDefinitionImpl;
-import org.alfresco.service.cmr.action.Action;
-import org.alfresco.service.cmr.action.ParameterDefinition;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
-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;
-
-/**
- * Copy to Web Project action executor
- * <p>
- * Copies the actioned upon node to a specified folder in a specified Web
- * Project.
- * 
- * @author gavinc
- */
-public class CopyToWebProjectActionExecuter extends ActionExecuterAbstractBase
-{
-   public static final String ERR_OVERWRITE = "Unable to overwrite copy because more than one have been found.";
-
-   public static final String NAME = "copy-to-web-project";
-
-   public static final String PARAM_DESTINATION_FOLDER = "destination-folder";
-
-   public static final String PARAM_OVERWRITE_COPY = "overwrite-copy";
-   
-   private static final Log logger = LogFactory.getLog(CopyToWebProjectActionExecuter.class);
-
-   /**
-    * Cross repository copy service
-    */
-   private CrossRepositoryCopyService crCopyService;
-
-   /**
-    * The node service
-    */
-   private NodeService nodeService;
-
-   /**
-    * Sets the node service
-    * 
-    * @param nodeService the node service
-    */
-   public void setNodeService(NodeService nodeService)
-   {
-      this.nodeService = nodeService;
-   }
-
-   /**
-    * Sets the cross repository copy service
-    * 
-    * @param crCopyService the cross repository copy service
-    */
-   public void setCrossRepositoryCopyService(CrossRepositoryCopyService crCopyService)
-   {
-      this.crCopyService = crCopyService;
-   }
-
-   /**
-    * @see org.alfresco.repo.action.ParameterizedItemAbstractBase#addParameterDefinitions(java.util.List)
-    */
-   @Override
-   protected void addParameterDefinitions(List<ParameterDefinition> paramList)
-   {
-      paramList.add(new ParameterDefinitionImpl(PARAM_DESTINATION_FOLDER,
-               DataTypeDefinition.NODE_REF, true,
-               getParamDisplayLabel(PARAM_DESTINATION_FOLDER)));
-   }
-
-   /**
-    * @see org.alfresco.repo.action.executer.ActionExecuter#execute(org.alfresco.repo.ref.NodeRef,
-    *      org.alfresco.repo.ref.NodeRef)
-    */
-   public void executeImpl(Action ruleAction, NodeRef actionedUponNodeRef)
-   {
-      if (this.nodeService.exists(actionedUponNodeRef) == true)
-      {
-         // get the destination, note this will be a NodeRef representing an AVM path
-         NodeRef destinationParent = (NodeRef) ruleAction
-                  .getParameterValue(PARAM_DESTINATION_FOLDER);
-         
-         // get the name of the source
-         String name = (String)this.nodeService.getProperty(actionedUponNodeRef, ContentModel.PROP_NAME);
-         
-         if (logger.isDebugEnabled())
-         {
-            logger.debug("Copying " + actionedUponNodeRef.toString() + "(" + name + ") to " + 
-                     destinationParent.toString());
-         }
-         
-         // copy the node being actioned to the destination AVM path
-         this.crCopyService.copy(actionedUponNodeRef, destinationParent, name);
-      }
-      else
-      {
-         if (logger.isWarnEnabled())
-         {
-            logger.warn("Not copying " + actionedUponNodeRef.toString() + " as it no longer exists!");
-         }
-      }
-   }
-}
diff --git a/source/java/org/alfresco/repo/admin/IndexConfigurationCheckerImpl.java b/source/java/org/alfresco/repo/admin/IndexConfigurationCheckerImpl.java
index bf45a6cfbe..b944e6d889 100644
--- a/source/java/org/alfresco/repo/admin/IndexConfigurationCheckerImpl.java
+++ b/source/java/org/alfresco/repo/admin/IndexConfigurationCheckerImpl.java
@@ -49,7 +49,6 @@ public class IndexConfigurationCheckerImpl implements IndexConfigurationChecker
     private RecoveryMode indexRecoveryMode;
     private NodeService nodeService;
     private SearchService searchService;
-    //private AVMSnapShotTriggeredIndexingMethodInterceptor avmSnapShotTriggeredIndexingMethodInterceptor;
     
     /**
      * Set the index recovert mode
diff --git a/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java b/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
index edd0eebb53..08ac3197ff 100644
--- a/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
+++ b/source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java
@@ -49,15 +49,15 @@ import org.springframework.core.io.support.ResourcePatternResolver;
  * Where {module.id} is whatever value is set within the AMP's module.properties file. For details, see: <a
  * href='http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module'>Developing an Alfresco Module</a>
  * <p>
- * For example, if {module.id} is "org.alfresco.module.avmCompare", then within your source code you'll have:
+ * For example, if {module.id} is "org.alfresco.module.someModule", then within your source code you'll have:
  * 
  * <pre>
- * config / alfresco / module / org.alfresco.module.avmCompare / log4j.properties
+ * config / alfresco / module / org.alfresco.module.someModule / log4j.properties
  * </pre>
  * 
  * This would be deployed to:
  * <pre>
- * WEB - INF / classes / alfresco / module / org.alfresco.module.avmCompare / log4j.properties
+ * WEB - INF / classes / alfresco / module / org.alfresco.module.someModule / log4j.properties
  * </pre>
  */
 public class Log4JHierarchyInit implements ApplicationContextAware
@@ -85,29 +85,22 @@ public class Log4JHierarchyInit implements ApplicationContextAware
         }
     }
     
-    
-
-    /* (non-Javadoc)
-     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-     */
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
     {
         this.resolver = applicationContext;
     }
 
-    @SuppressWarnings("unchecked")
     public void init()
     {
         importLogSettings();
     }
 
-    @SuppressWarnings("unchecked")
     private void importLogSettings()
     {
         try
         {
             // Get the PropertyConfigurator
-            Class clazz = Class.forName("org.apache.log4j.PropertyConfigurator");
+            Class<?> clazz = Class.forName("org.apache.log4j.PropertyConfigurator");
             Method method = clazz.getMethod("configure", URL.class);
             // Import using this method
             for (String url : extraLog4jUrls)
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java
index 1ed0ac13bd..2024347e2c 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java
@@ -105,10 +105,6 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
         defaultZones.add(AuthorityService.ZONE_APP_DEFAULT);
         defaultZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
 
-        Set<String> wcmZones = new HashSet<String>(2, 1.0f);
-        wcmZones.add(AuthorityService.ZONE_APP_WCM);
-        wcmZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
-
         Set<String> shareZones = new HashSet<String>(2, 1.0f);
         shareZones.add(AuthorityService.ZONE_APP_SHARE);
         shareZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java
index 7afb36729e..29b61a5ea8 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/ContentUrlConverterPatch.java
@@ -66,7 +66,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
  * to the newer <b>alf_content_url</b> storage.
  * <p/>
  * The {@link ServiceRegistry} is used to record progress.  The component picks up ranges of node IDs
- * (DM and AVM) and records the progress.  Since new nodes will not need converting, the converter
+ * (DM) and records the progress.  Since new nodes will not need converting, the converter
  * will stop once it hits the largest node ID that it found upon first initiation.  Once completed,
  * the content store reader will start to pick up orphaned content and schedule it for deletion.
  * <p/>
@@ -85,12 +85,6 @@ public class ContentUrlConverterPatch extends AbstractPatch
             NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "adm", "range-start-id");
     private static final RegistryKey KEY_ADM_DONE = new RegistryKey(
             NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "adm", "done");
-    private static final RegistryKey KEY_AVM_MAX_ID = new RegistryKey(
-            NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "avm", "max-id");
-    private static final RegistryKey KEY_AVM_RANGE_START_ID = new RegistryKey(
-            NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "avm", "range-start-id");
-    private static final RegistryKey KEY_AVM_DONE = new RegistryKey(
-            NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "avm", "done");
     private static final RegistryKey KEY_STORE_DONE = new RegistryKey(
             NamespaceService.SYSTEM_MODEL_1_0_URI, "ContentUrlConverter", "store", "done");
 
@@ -313,16 +307,10 @@ public class ContentUrlConverterPatch extends AbstractPatch
             logger.info(I18NUtil.getMessage("patch.convertContentUrls.adm.start"));
             boolean admCompleted = applyADMLooping(running);
             
-            /* Sparta: remove WCM/AVM
-            logger.info(I18NUtil.getMessage("patch.convertContentUrls.avm.start"));
-            boolean avmCompleted = applyAVMLooping(running);
-            */
-            boolean avmCompleted = true;
-            
             logger.info(I18NUtil.getMessage("patch.convertContentUrls.store.start", contentStore));
             boolean urlLiftingCompleted = applyUrlLifting(running);
             
-            completed = admCompleted && avmCompleted && urlLiftingCompleted;
+            completed = admCompleted && urlLiftingCompleted;
         }
         catch (RuntimeException e)
         {
@@ -469,106 +457,6 @@ public class ContentUrlConverterPatch extends AbstractPatch
         return false;
     }
     
-    /*
-    private boolean applyAVMLooping(final AtomicBoolean running)
-    {
-        RetryingTransactionCallback<Boolean> callback = new RetryingTransactionCallback<Boolean>()
-        {
-            public Boolean execute() throws Throwable
-            {
-                return applyAVM();
-            }
-        };
-        boolean done = false;
-        while (running.get())
-        {
-            done = transactionHelper.doInTransaction(callback, false, true);
-            if (done)
-            {
-                break;
-            }
-        }
-        return done;
-    }
-    */
-    
-    /**
-     * Do the AVM conversion work
-     */
-    /*
-    private boolean applyAVM() throws Exception
-    {
-        Long maxId = (Long) registryService.getProperty(KEY_AVM_MAX_ID);
-
-        // Must we run at all?
-        Boolean done = (Boolean) registryService.getProperty(KEY_AVM_DONE);
-        if (done != null && done.booleanValue())
-        {
-            logger.info(I18NUtil.getMessage("patch.convertContentUrls.avm.done", maxId));
-            return true;
-        }
-
-        if (maxId == null)
-        {
-            maxId = patchDAO.getMaxAvmNodeID();
-            registryService.addProperty(KEY_AVM_MAX_ID, maxId);
-        }
-        Long startId = (Long) registryService.getProperty(KEY_AVM_RANGE_START_ID);
-        if (startId == null)
-        {
-            startId = 1L;
-            registryService.addProperty(KEY_AVM_RANGE_START_ID, startId);
-        }
-        Long endId = startId + (batchSize * (long) threadCount * 10L);
-        
-        final List<Long> nodeIds = patchDAO.getAvmNodesWithOldContentProperties(startId, endId);
-        BatchProcessWorkerAdaptor<Long> batchProcessorWorker = new BatchProcessWorkerAdaptor<Long>()
-        {
-            public void process(Long nodeId) throws Throwable
-            {
-                // Convert it
-                PlainFileNode node = (PlainFileNode) AVMDAOs.Instance().fAVMNodeDAO.getByID(nodeId);
-                ContentData contentData = node.getContentData();
-                node.setContentData(contentData);
-                AVMDAOs.Instance().fAVMNodeDAO.update(node);
-            }
-        };
-        BatchProcessor<Long> batchProcessor = new BatchProcessor<Long>(
-                "ContentUrlConverter.AVM (" + maxId + ")",
-                transactionHelper,
-                nodeIds, threadCount, batchSize,
-                applicationEventPublisher, null, 1);
-        batchProcessor.process(batchProcessorWorker, true);
-        if (batchProcessor.getTotalErrors() > 0)
-        {
-            // Something went wrong.  We don't advance the start range so that the patch re-execution will
-            // start at the start of the range that failed.
-            throw AlfrescoRuntimeException.create("patch.convertContentUrls.error", batchProcessor.getLastError());
-        }
-
-        // Advance
-        startId = endId;
-        // Have we 
-        if (startId > maxId)
-        {
-            startId = maxId + 1;
-            // We're past the max ID that we're interested in
-            done = Boolean.TRUE;
-            registryService.addProperty(KEY_AVM_DONE, done);
-            logger.info(I18NUtil.getMessage("patch.convertContentUrls.avm.done", maxId));
-            return true;
-        }
-        // Progress
-        super.reportProgress(maxId, startId);
-        
-        // Move the start ID on
-        registryService.addProperty(KEY_AVM_RANGE_START_ID, startId);
-        
-        // More to do
-        return false;
-    }
-    */
-    
     private boolean applyUrlLifting(final AtomicBoolean running) throws Exception
     {
         RetryingTransactionCallback<Boolean> callback = new RetryingTransactionCallback<Boolean>()
@@ -591,9 +479,8 @@ public class ContentUrlConverterPatch extends AbstractPatch
         }
         
         Boolean admDone = (Boolean) registryService.getProperty(KEY_ADM_DONE);
-        Boolean avmDone = (Boolean) registryService.getProperty(KEY_AVM_DONE);
         
-        if ((admDone == null || !admDone.booleanValue()) || (avmDone == null || !avmDone.booleanValue()))
+        if ((admDone == null || !admDone.booleanValue()))
         {
             logger.info(I18NUtil.getMessage("patch.convertContentUrls.store.pending"));
             return false;
diff --git a/source/java/org/alfresco/repo/dictionary/TestModel.java b/source/java/org/alfresco/repo/dictionary/TestModel.java
index 946e27017f..7188031472 100644
--- a/source/java/org/alfresco/repo/dictionary/TestModel.java
+++ b/source/java/org/alfresco/repo/dictionary/TestModel.java
@@ -64,10 +64,8 @@ public class TestModel
         bootstrapModels.add("alfresco/model/systemModel.xml");
         bootstrapModels.add("org/alfresco/repo/security/authentication/userModel.xml");
         bootstrapModels.add("alfresco/model/contentModel.xml");
-        bootstrapModels.add("alfresco/model/wcmModel.xml");
         bootstrapModels.add("alfresco/model/applicationModel.xml");
         bootstrapModels.add("alfresco/model/bpmModel.xml");
-        bootstrapModels.add("alfresco/model/wcmAppModel.xml");
 
         // include models specified on command line
         for (String arg: args)
diff --git a/source/java/org/alfresco/repo/domain/PropertyValue.java b/source/java/org/alfresco/repo/domain/PropertyValue.java
deleted file mode 100644
index 3b7d4a8f27..0000000000
--- a/source/java/org/alfresco/repo/domain/PropertyValue.java
+++ /dev/null
@@ -1,1124 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.repo.domain;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.domain.schema.SchemaBootstrap;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-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.Period;
-import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.EqualsHelper;
-import org.alfresco.util.VersionNumber;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Immutable property value storage class.
- * <p>
- * <b>As of 2.2.1, this class is only used by the AVM persistence layers.</b>
- * 
- * @author Derek Hulley
- */
-public class PropertyValue implements Cloneable, Serializable
-{
-    private static final long serialVersionUID = -497902497351493075L;
-
-    /** used to take care of empty strings being converted to nulls by the database */
-    private static final String STRING_EMPTY = "";
-    
-    private static Log logger = LogFactory.getLog(PropertyValue.class);
-    private static Log loggerOracle = LogFactory.getLog(PropertyValue.class.getName() + ".oracle");
-
-    /** potential value types */
-    private static enum ValueType
-    {
-        NULL
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(0);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return null;
-            }
-        },
-        BOOLEAN
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(1);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Boolean.class, value);
-            }
-        },
-        INTEGER
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(2);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.LONG;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Integer.class, value);
-            }
-        },
-        LONG
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(3);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Long.class, value);
-            }
-        },
-        FLOAT
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(4);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Float.class, value);
-            }
-        },
-        DOUBLE
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(5);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Double.class, value);
-            }
-        },
-        STRING
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(6);
-            }
-
-            /**
-             * Strings longer than the maximum of {@link PropertyValue#DEFAULT_MAX_STRING_LENGTH}
-             * characters will be serialized.
-             */
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                if (value instanceof String)
-                {
-                    String valueStr = (String) value;
-                    // Check how long the String can be
-                    if (valueStr.length() > SchemaBootstrap.getMaxStringLength())
-                    {
-                        return ValueType.SERIALIZABLE;
-                    }
-                }
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(String.class, value);
-            }
-        },
-        DATE
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(7);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Date.class, value);
-            }
-        },
-        /**
-         * @deprecated          column FK to alf_global_attributes has been removed (3.4)
-         */
-        DB_ATTRIBUTE
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(8);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return null;
-            }
-        },
-        SERIALIZABLE
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(9);
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return value;
-            }
-        },
-        MLTEXT
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(10);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                // NOTE: since 2.2.1, PropertyValue is only used by AVM (which does not natively support MLText, other than single/default string)
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                // NOTE: since 2.2.1, PropertyValue is only used by AVM (which does not natively support MLText, other than single/default string)
-                MLText mlText = DefaultTypeConverter.INSTANCE.convert(MLText.class, value);
-                if (mlText.size() > 1)
-                {
-                    throw new UnsupportedOperationException("PropertyValue MLText is not supported for AVM");
-                }
-                return DefaultTypeConverter.INSTANCE.convert(String.class, mlText);
-            }
-        },
-        CONTENT
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(11);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(ContentData.class, value);
-            }
-        },
-        NODEREF
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(12);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(NodeRef.class, value);
-            }
-        },
-        CHILD_ASSOC_REF
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(13);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(ChildAssociationRef.class, value);
-            }
-        },
-        ASSOC_REF
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(14);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(AssociationRef.class, value);
-            }
-        },
-        QNAME
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(15);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(QName.class, value);
-            }
-        },
-        PATH
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(16);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.SERIALIZABLE;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Path.class, value);
-            }
-        },
-        LOCALE
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(17);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Locale.class, value);
-            }
-        },
-        VERSION_NUMBER
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(18);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(VersionNumber.class, value);
-            }
-        },
-        PERIOD
-        {
-            @Override
-            public Integer getOrdinalNumber()
-            {
-                return Integer.valueOf(20);
-            }
-
-            @Override
-            protected ValueType getPersistedType(Serializable value)
-            {
-                return ValueType.STRING;
-            }
-
-            @Override
-            Serializable convert(Serializable value)
-            {
-                return DefaultTypeConverter.INSTANCE.convert(Period.class, value);
-            }
-        };
-        
-        /**
-         * @return      Returns the manually-maintained ordinal number for the value
-         */
-        public abstract Integer getOrdinalNumber();
-        
-        /**
-         * Override if the type gets persisted in a different format.
-         * 
-         * @param value the actual value that is to be persisted.  May not be null.
-         */
-        protected ValueType getPersistedType(Serializable value)
-        {
-            return this;
-        }
-        
-        /**
-         * Converts a value to this type.  The implementation must be able to cope with any legitimate
-         * source value.
-         * 
-         * @see DefaultTypeConverter.INSTANCE#convert(Class, Object)
-         */
-        abstract Serializable convert(Serializable value);
-        
-        protected ArrayList<Serializable> convert(Collection<?> collection)
-        {
-            ArrayList<Serializable> arrayList = new ArrayList<Serializable>(collection.size());
-            for (Object object : collection)
-            {
-                Serializable newValue = null;
-                if (object != null)
-                {
-                    if (!(object instanceof Serializable))
-                    {
-                        throw new AlfrescoRuntimeException("Collection values must contain Serializable instances: \n" +
-                                "   value type: " + this + "\n" +
-                                "   collection: " + collection + "\n" +
-                                "   value: " + object);
-                    }
-                    Serializable value = (Serializable) object;
-                    newValue = convert(value);
-                }
-                arrayList.add(newValue);
-            }
-            // done
-            return arrayList;
-        }
-    }
-    
-    /**
-     * Determine the actual value type to aid in more concise persistence.
-     * 
-     * @param value the value that is to be persisted
-     * @return Returns the value type equivalent of the 
-     */
-    private static ValueType getActualType(Serializable value)
-    {
-        if (value == null)
-        {
-            return ValueType.NULL;
-        }
-        else if (value instanceof Boolean)
-        {
-            return ValueType.BOOLEAN;
-        }
-        else if ((value instanceof Integer) || (value instanceof Long))
-        {
-            return ValueType.LONG;
-        }
-        else if (value instanceof Float)
-        {
-            return ValueType.FLOAT;
-        }
-        else if (value instanceof Double)
-        {
-            return ValueType.DOUBLE;
-        }
-        else if (value instanceof String)
-        {
-            return ValueType.STRING;
-        }
-        else if (value instanceof Date)
-        {
-            return ValueType.DATE;
-        }
-        else if (value instanceof ContentData)
-        {
-            return ValueType.CONTENT;
-        }
-        else if (value instanceof NodeRef)
-        {
-            return ValueType.NODEREF;
-        }
-        else if (value instanceof ChildAssociationRef)
-        {
-            return ValueType.CHILD_ASSOC_REF;
-        }
-        else if (value instanceof AssociationRef)
-        {
-            return ValueType.ASSOC_REF;
-        }
-        else if (value instanceof QName)
-        {
-            return ValueType.QNAME;
-        }
-        else if (value instanceof Path)
-        {
-            return ValueType.PATH;
-        }
-        else if (value instanceof Locale)
-        {
-            return ValueType.LOCALE;
-        }
-        else if (value instanceof VersionNumber)
-        {
-            return ValueType.VERSION_NUMBER;
-        }
-        else if (value instanceof MLText)
-        {
-            return ValueType.MLTEXT;
-        }
-        else if (value instanceof Period)
-        {
-            return ValueType.PERIOD;
-        }
-        else
-        {
-            // type is not recognised as belonging to any particular slot
-            return ValueType.SERIALIZABLE;
-        }
-    }
-    
-    /** a mapping from a property type <code>QName</code> to the corresponding value type */
-    private static Map<QName, ValueType> valueTypesByPropertyType;
-    /**
-     * a mapping of {@link ValueType} ordinal number to the enum.  This is manually maintained
-     * and <b>MUST NOT BE CHANGED FOR EXISTING VALUES</b>.
-     */
-    private static Map<Integer, ValueType> valueTypesByOrdinalNumber;
-    static
-    {
-        valueTypesByPropertyType = new HashMap<QName, ValueType>(37);
-        valueTypesByPropertyType.put(DataTypeDefinition.ANY, ValueType.SERIALIZABLE);
-        valueTypesByPropertyType.put(DataTypeDefinition.ENCRYPTED, ValueType.SERIALIZABLE);
-        valueTypesByPropertyType.put(DataTypeDefinition.BOOLEAN, ValueType.BOOLEAN);
-        valueTypesByPropertyType.put(DataTypeDefinition.INT, ValueType.INTEGER);
-        valueTypesByPropertyType.put(DataTypeDefinition.LONG, ValueType.LONG);
-        valueTypesByPropertyType.put(DataTypeDefinition.DOUBLE, ValueType.DOUBLE);
-        valueTypesByPropertyType.put(DataTypeDefinition.FLOAT, ValueType.FLOAT);
-        valueTypesByPropertyType.put(DataTypeDefinition.DATE, ValueType.DATE);
-        valueTypesByPropertyType.put(DataTypeDefinition.DATETIME, ValueType.DATE);
-        valueTypesByPropertyType.put(DataTypeDefinition.CATEGORY, ValueType.NODEREF);
-        valueTypesByPropertyType.put(DataTypeDefinition.CONTENT, ValueType.CONTENT);
-        valueTypesByPropertyType.put(DataTypeDefinition.TEXT, ValueType.STRING);
-        valueTypesByPropertyType.put(DataTypeDefinition.MLTEXT, ValueType.MLTEXT);
-        valueTypesByPropertyType.put(DataTypeDefinition.NODE_REF, ValueType.NODEREF);
-        valueTypesByPropertyType.put(DataTypeDefinition.CHILD_ASSOC_REF, ValueType.CHILD_ASSOC_REF);
-        valueTypesByPropertyType.put(DataTypeDefinition.ASSOC_REF, ValueType.ASSOC_REF);
-        valueTypesByPropertyType.put(DataTypeDefinition.PATH, ValueType.PATH);
-        valueTypesByPropertyType.put(DataTypeDefinition.QNAME, ValueType.QNAME);
-        valueTypesByPropertyType.put(DataTypeDefinition.LOCALE, ValueType.LOCALE);
-        valueTypesByPropertyType.put(DataTypeDefinition.PERIOD, ValueType.PERIOD);
-        
-        valueTypesByOrdinalNumber = new HashMap<Integer, ValueType>(37);
-        for (ValueType valueType : ValueType.values())
-        {
-            Integer ordinalNumber = valueType.getOrdinalNumber();
-            if (valueTypesByOrdinalNumber.containsKey(ordinalNumber))
-            {
-                throw new RuntimeException("ValueType has duplicate ordinal number: " + valueType);
-            }
-            else if (ordinalNumber.intValue() == -1)
-            {
-                throw new RuntimeException("ValueType doesn't have an ordinal number: " + valueType);
-            }
-            valueTypesByOrdinalNumber.put(ordinalNumber, valueType);
-        }
-    }
-
-    /** the type of the property, prior to serialization persistence */
-    private ValueType actualType;
-    /** true if the property values are contained in a collection */
-    private boolean isMultiValued;
-    /** the type of persistence used */
-    private ValueType persistedType;
-    
-    private Boolean booleanValue;
-    private Long longValue;
-    private Float floatValue;
-    private Double doubleValue;
-    private String stringValue;
-    private Serializable serializableValue;
-    
-    /**
-     * default constructor
-     */
-    public PropertyValue()
-    {
-    }
-    
-    /**
-     * Construct a new property value.
-     * 
-     * @param typeQName the dictionary-defined property type to store the property as.   
-     * May be null in which case the type will be determined from the value parameter.
-     * @param value the value to store.  This will be converted into a format compatible
-     *      with the type given
-     * 
-     * @throws java.lang.UnsupportedOperationException if the value cannot be converted to the
-     *      type given
-     */
-    public PropertyValue(QName typeQName, Serializable value)
-    {
-        this.actualType = PropertyValue.getActualType(value);
-        if (value == null)
-        {
-            setPersistedValue(ValueType.NULL, null);
-            setMultiValued(false);
-        }
-        else if (value instanceof Collection<?>)
-        {
-            if(typeQName != null)
-            {  
-                Collection<?> collection = (Collection<?>) value;
-                ValueType collectionValueType = makeValueType(typeQName);
-                // convert the collection values - we need to do this to ensure that the
-                // values provided conform to the given type
-            
-                ArrayList<Serializable> convertedCollection = collectionValueType.convert(collection);
-                // the persisted type is, nonetheless, a serializable
-                setPersistedValue(ValueType.SERIALIZABLE, convertedCollection);
-            }
-            else
-            {
-                setPersistedValue(ValueType.SERIALIZABLE, value);
-            }
-             
-
-            setMultiValued(true);
-        }
-        else
-        {
-            // Does the client consider the type to be important?
-            if (typeQName != null)
-            {
-                // Convert the value to the type required.  This ensures that any type conversion issues
-                // are caught early and prevent the scenario where the data in the DB cannot be given
-                // back out because it is unconvertable.
-                ValueType valueType = makeValueType(typeQName);
-                value = valueType.convert(value);
-            }
-            // get the persisted type
-            ValueType persistedValueType = this.actualType.getPersistedType(value);
-            // convert to the persistent type
-            value = persistedValueType.convert(value);
-            setPersistedValue(persistedValueType, value);
-            setMultiValued(false);
-        }
-    }
-    
-    /**
-     * Helper method to convert the type <code>QName</code> into a <code>ValueType</code>
-     * 
-     * @return Returns the <code>ValueType</code>  - never null
-     */
-    private static ValueType makeValueType(QName typeQName)
-    {
-        ValueType valueType = valueTypesByPropertyType.get(typeQName);
-        if (valueType == null)
-        {
-            throw new AlfrescoRuntimeException(
-                    "Property type not recognised: \n" +
-                    "   type: " + typeQName);
-        }
-        return valueType;
-    }
-    
-    /**
-     * Given an actual type qualified name, returns the <tt>int</tt> ordinal number
-     * that represents it in the database.
-     * 
-     * @param typeQName the type qualified name
-     * @return Returns the <tt>int</tt> representation of the type,
-     *      e.g. <b>CONTENT.getOrdinalNumber()</b> for type <b>d:content</b>.
-     */
-    public static int convertToTypeOrdinal(QName typeQName)
-    {
-        ValueType valueType = makeValueType(typeQName);
-        return valueType.getOrdinalNumber();
-    }
-    
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (obj instanceof PropertyValue)
-        {
-            PropertyValue that = (PropertyValue) obj;
-            return (this.actualType.equals(that.actualType) &&
-                    EqualsHelper.nullSafeEquals(this.booleanValue, that.booleanValue) &&
-                    EqualsHelper.nullSafeEquals(this.longValue, that.longValue) &&
-                    EqualsHelper.nullSafeEquals(this.floatValue, that.floatValue) &&
-                    EqualsHelper.nullSafeEquals(this.doubleValue, that.doubleValue) &&
-                    EqualsHelper.nullSafeEquals(this.stringValue, that.stringValue) &&
-                    EqualsHelper.nullSafeEquals(this.serializableValue, that.serializableValue)
-                    );
-            
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    @Override
-    public int hashCode()
-    {
-        int h = 0;
-        if (actualType != null)
-            h = actualType.hashCode();
-        Serializable persistedValue = getPersistedValue();
-        if (persistedValue != null)
-            h += 17 * persistedValue.hashCode();
-        return h;
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException
-    {
-        return super.clone();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(128);
-        sb.append("PropertyValue")
-          .append("[actual-type=").append(actualType)
-          .append(", multi-valued=").append(isMultiValued)
-          .append(", value-type=").append(persistedType)
-          .append(", value=").append(getPersistedValue())
-          .append("]");
-        return sb.toString();
-    }
-
-    public Integer getActualType()
-    {
-        return actualType == null ? null : actualType.getOrdinalNumber();
-    }
-
-    /**
-     * @return          Returns the actual type's String representation
-     */
-    public String getActualTypeString()
-    {
-        return actualType == null ? null : actualType.toString();
-    }
-
-    public void setActualType(Integer actualType)
-    {
-        ValueType type = PropertyValue.valueTypesByOrdinalNumber.get(actualType);
-        if (type == null)
-        {
-            logger.error("Unknown property actual type ordinal number: " + actualType);
-        }
-        this.actualType = type;
-    }
-
-    public boolean isMultiValued()
-    {
-        return isMultiValued;
-    }
-
-    public void setMultiValued(boolean isMultiValued)
-    {
-        this.isMultiValued = isMultiValued;
-    }
-
-    public Integer getPersistedType()
-    {
-        return persistedType == null ? null : persistedType.getOrdinalNumber();
-    }
-    public void setPersistedType(Integer persistedType)
-    {
-        ValueType type = PropertyValue.valueTypesByOrdinalNumber.get(persistedType);
-        if (type == null)
-        {
-            logger.error("Unknown property persisted type ordinal number: " + persistedType);
-        }
-        this.persistedType = type;
-    }
-    
-    /**
-     * Stores the value in the correct slot based on the type of persistence requested.
-     * No conversion is done.
-     * 
-     * @param persistedType the value type
-     * @param value the value - it may only be null if the persisted type is {@link ValueType#NULL}
-     */
-    public void setPersistedValue(ValueType persistedType, Serializable value)
-    {
-        switch (persistedType)
-        {
-            case NULL:
-                if (value != null)
-                {
-                    throw new AlfrescoRuntimeException("Value must be null for persisted type: " + persistedType);
-                }
-                break;
-            case BOOLEAN:
-                this.booleanValue = (Boolean) value;
-                break;
-            case LONG:
-                this.longValue = (Long) value;
-                break;
-            case FLOAT:
-                this.floatValue = (Float) value;
-                break;
-            case DOUBLE:
-                this.doubleValue = (Double) value;
-                break;
-            case STRING:
-                this.stringValue = (String) value;
-                break;
-            case DB_ATTRIBUTE:
-                throw new IllegalArgumentException("DB_ATTRIBUTE is no longer supported.");
-            case SERIALIZABLE:
-                this.serializableValue = cloneSerializable(value);
-                break;
-            default:
-                throw new AlfrescoRuntimeException("Unrecognised value type: " + persistedType);
-        }
-        // we store the type that we persisted as
-        this.persistedType = persistedType;
-    }
-    
-    /**
-     * Clones a serializable object to disconnect the original instance from the persisted instance.
-     * 
-     * @param original          the original object
-     * @return                  the new cloned object
-     */
-    private Serializable cloneSerializable(Serializable original)
-    {
-       ObjectOutputStream objectOut = null;
-       ByteArrayOutputStream byteOut = null;
-       ObjectInputStream objectIn = null;
-        try
-        {
-           // Write the object out to a byte array
-           byteOut = new ByteArrayOutputStream();
-           objectOut = new ObjectOutputStream(byteOut);
-           objectOut.writeObject(original);
-           objectOut.flush();
-
-           objectIn = new ObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray()));
-           Object target = objectIn.readObject();
-           // Done
-           return (Serializable) target;
-        }
-        catch (Throwable e)
-        {
-            throw new AlfrescoRuntimeException("Failed to clone serializable object: " + original, e);
-        }
-        finally
-        {
-           if (objectOut != null)
-           {
-              try { objectOut.close(); } catch (Throwable e) {}
-           }
-           if (byteOut != null)
-           {
-              try { byteOut.close(); } catch (Throwable e) {}
-           }
-           if (objectIn != null)
-           {
-              try { objectIn.close(); } catch (Throwable e) {}
-           }
-        }
-    }
-
-    /**
-     * @return Returns the persisted value, keying off the persisted value type
-     */
-    private Serializable getPersistedValue()
-    {
-        switch (persistedType)
-        {
-            case NULL:
-                return null;
-            case BOOLEAN:
-                return this.booleanValue;
-            case LONG:
-                return this.longValue;
-            case FLOAT:
-                return this.floatValue;
-            case DOUBLE:
-                return this.doubleValue;
-            case STRING:
-                // Oracle stores empty strings as 'null'...
-                if (this.stringValue == null)
-                {
-                    // We know that we stored a non-null string, but now it is null.
-                    // It can only mean one thing - Oracle
-                    if (loggerOracle.isDebugEnabled())
-                    {
-                        logger.debug("string_value is 'null'.  Forcing to empty String");
-                    }
-                    return PropertyValue.STRING_EMPTY;
-                }
-                else
-                {
-                    return this.stringValue;
-                }
-            case DB_ATTRIBUTE:
-                return null;
-            case SERIALIZABLE:
-                return this.serializableValue;
-            default:
-                throw new AlfrescoRuntimeException("Unrecognised value type: " + persistedType);
-        }
-    }
-
-    /**
-     * Fetches the value as a desired type.  Collections (i.e. multi-valued properties)
-     * will be converted as a whole to ensure that all the values returned within the
-     * collection match the given type.
-     * 
-     * @param typeQName the type required for the return value
-     * @return Returns the value of this property as the desired type, or a <code>Collection</code>
-     *      of values of the required type
-     * 
-     * @throws AlfrescoRuntimeException
-     *      if the type given is not recognized
-     * @throws org.alfresco.service.cmr.repository.datatype.TypeConversionException
-     *      if the conversion to the required type fails
-     * 
-     * @see DataTypeDefinition#ANY The static qualified names for the types
-     */
-    public Serializable getValue(QName typeQName)
-    {
-        // first check for null
-        ValueType requiredType = makeValueType(typeQName);
-        if (requiredType == ValueType.SERIALIZABLE)
-        {
-            // the required type must be the actual type
-            requiredType = this.actualType;
-        }
-        
-        // we need to convert
-        Serializable ret = null;
-        if (persistedType == ValueType.NULL)
-        {
-            ret = null;
-        }
-        else if (this.isMultiValued)
-        {
-            // collections are always stored
-            Collection<?> collection = (Collection<?>) this.serializableValue;
-            // convert the collection values - we need to do this to ensure that the
-            // values provided conform to the given type
-            ArrayList<Serializable> convertedCollection = requiredType.convert(collection);
-            ret = convertedCollection;
-        }
-        else
-        {
-            Serializable persistedValue = getPersistedValue();
-            // convert the type
-            ret = requiredType.convert(persistedValue);
-        }
-        // done
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Fetched value: \n" +
-                    "   property value: " + this + "\n" +
-                    "   requested type: " + requiredType + "\n" +
-                    "   result: " + ret);
-        }
-        return ret;
-    }
-    
-    /**
-     * Gets the value or values as a guaranteed collection.
-     * 
-     * @see #getValue(QName)
-     */
-    @SuppressWarnings("unchecked")
-    public Collection<Serializable> getCollection(QName typeQName)
-    {
-        Serializable value = getValue(typeQName);
-        if (value instanceof Collection<?>)
-        {
-            return (Collection<Serializable>) value;
-        }
-        else
-        {
-            return Collections.singletonList(value);
-        }
-    }
-    
-    public boolean getBooleanValue()
-    {
-        if (booleanValue == null)
-            return false;
-        else
-            return booleanValue.booleanValue();
-    }
-    public void setBooleanValue(boolean value)
-    {
-        this.booleanValue = Boolean.valueOf(value);
-    }
-    
-    public long getLongValue()
-    {
-        if (longValue == null)
-            return 0;
-        else
-            return longValue.longValue();
-    }
-    public void setLongValue(long value)
-    {
-        this.longValue = Long.valueOf(value);
-    }
-    
-    public float getFloatValue()
-    {
-        if (floatValue == null)
-            return 0.0F;
-        else
-            return floatValue.floatValue();
-    }
-    public void setFloatValue(float value)
-    {
-        this.floatValue = Float.valueOf(value);
-    }
-    
-    public double getDoubleValue()
-    {
-        if (doubleValue == null)
-            return 0.0;
-        else
-            return doubleValue.doubleValue();
-    }
-    public void setDoubleValue(double value)
-    {
-        this.doubleValue = Double.valueOf(value);
-    }
-    
-    public String getStringValue()
-    {
-        return stringValue;
-    }
-    public void setStringValue(String value)
-    {
-        this.stringValue = value;
-    }
-    
-    public Serializable getSerializableValue()
-    {
-        return serializableValue;
-    }
-    public void setSerializableValue(Serializable value)
-    {
-        this.serializableValue = value;
-    }
-}
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index 1bbed247a6..ffe3585a50 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -2024,7 +2024,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         // Remove ACLs
         if (deleteAcl && aclId != null)
         {
-            aclDAO.deleteAclForNode(aclId, false);
+            aclDAO.deleteAclForNode(aclId);
         }
         
         // The node has been cleaned up.  Now we recreate the node for index tracking purposes.
diff --git a/source/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
index 31d40cb7d4..0f6f638775 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AbstractAclCrudDAOImpl.java
@@ -20,7 +20,6 @@ package org.alfresco.repo.domain.permissions;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -54,9 +53,9 @@ import org.springframework.extensions.surf.util.ParameterCheck;
  *     <b>alf_access_control_entry</b>
  *     <b>alf_permission</b>
  *     <b>alf_authority</b>
- *     
- * Also, following are currently unused:
- * 
+ *     <b/>
+ * Also, following are currently unused:<b/>
+ *     <b/>
  *     <b>alf_ace_context</b>
  *     <b>alf_authority_alias</b>
  *     
@@ -262,13 +261,6 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
         return getADMNodeEntityIdsByAcl(aclEntityId, maxResults);
     }
     
-    public List<Long> getAVMNodesByAcl(long aclEntityId, int maxResults)
-    {
-        // Sparta: remove WCM/AVM
-        //return getAVMNodeEntityIdsByAcl(aclEntityId, maxResults);
-        return Collections.emptyList();
-    }
-    
     public void updateAcl(AclUpdateEntity entity)
     {
         ParameterCheck.mandatory("entity", entity);
@@ -368,7 +360,6 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
     protected abstract int deleteAclEntity(long id);
     
     protected abstract List<Long> getADMNodeEntityIdsByAcl(long aclEntityId, int maxResults);
-    protected abstract List<Long> getAVMNodeEntityIdsByAcl(long aclEntityId, int maxResults);
     
     //
     // ACL Member
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java b/source/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java
index 5c75484e79..27c7f98207 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclCrudDAO.java
@@ -63,7 +63,6 @@ public interface AclCrudDAO
     public void updateAcl(AclUpdateEntity entity);
     public void deleteAcl(long aclEntityId);
     public List<Long> getADMNodesByAcl(long aclEntityId, int maxResults);
-    public List<Long> getAVMNodesByAcl(long aclEntityId, int maxResults);
     //
     // Access Control Entry (ACE)
     //
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclDAO.java b/source/java/org/alfresco/repo/domain/permissions/AclDAO.java
index ce8b5453ad..aa17f5f701 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclDAO.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclDAO.java
@@ -151,15 +151,13 @@ public interface AclDAO
     
     public Acl getAclCopy(Long toCopy, Long toInheritFrom, ACLCopyMode mode);
     
-    public List<Long> getAVMNodesByAcl(long aclEntityId, int maxResults);
-    
     public List<Long> getADMNodesByAcl(long aclEntityId, int maxResults);
     
     public Acl createLayeredAcl(Long indirectedAcl);
     
     public void renameAuthority(String before, String after);
     
-    public void deleteAclForNode(long aclId, boolean isAVMNode);
+    public void deleteAclForNode(long aclId);
 
     /**
      * @param inheritedAclId
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
index 55959d458f..d71357fa39 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
@@ -767,7 +767,6 @@ public class AclDAOImpl implements AclDAO
                     
                     // Retrieve dependent nodes
                     List<Long> nodeIds = aclCrudDAO.getADMNodesByAcl(aclId, -1);
-                    nodeIds.addAll(aclCrudDAO.getAVMNodesByAcl(aclId, -1));
                     
                     if (nodeIds.size() > 0)
                     {
@@ -853,7 +852,7 @@ public class AclDAOImpl implements AclDAO
      * {@inheritDoc}
      */
     @Override
-    public void deleteAclForNode(long aclId, boolean isAVMNode)
+    public void deleteAclForNode(long aclId)
     {
         Acl dbAcl = getAcl(aclId);
         if (dbAcl.getAclType() == ACLType.DEFINING)
@@ -868,19 +867,12 @@ public class AclDAOImpl implements AclDAO
             Long defining = dbAcl.getInheritsFrom();
             if (aclCrudDAO.getAcl(defining) == null)
             {
-                if (! isAVMNode)
+                // ADM
+                if (getADMNodesByAcl(aclId, 1).size() == 0)
                 {
-                    // ADM
-                    if (getADMNodesByAcl(aclId, 1).size() == 0)
-                    {
-                        // delete acl members & acl
-                        aclCrudDAO.deleteAclMembersByAcl(aclId);
-                        aclCrudDAO.deleteAcl(aclId);
-                    }
-                }
-                else
-                {
-                    // TODO: AVM
+                    // delete acl members & acl
+                    aclCrudDAO.deleteAclMembersByAcl(aclId);
+                    aclCrudDAO.deleteAcl(aclId);
                 }
             }
         }
@@ -1544,15 +1536,6 @@ public class AclDAOImpl implements AclDAO
         return aclCrudDAO.getAcl(id);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<Long> getAVMNodesByAcl(long aclEntityId, int maxResults)
-    {
-        return aclCrudDAO.getAVMNodesByAcl(aclEntityId, maxResults);
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/source/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java
index 8a76e6915b..98b1198980 100644
--- a/source/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/ibatis/AclCrudDAOImpl.java
@@ -52,7 +52,6 @@ public class AclCrudDAOImpl extends AbstractAclCrudDAOImpl
     private static final String SELECT_ACLS_THAT_INHERIT_FROM_ACL = "alfresco.permissions.select_AclsThatInheritFromAcl";
     private static final String SELECT_LATEST_ACL_BY_GUID = "alfresco.permissions.select_LatestAclByGuid";
     private static final String SELECT_ADM_NODES_BY_ACL = "alfresco.permissions.select_ADMNodesByAclId";
-    private static final String SELECT_AVM_NODES_BY_ACL = "alfresco.permissions.select_AVMNodesByAclId";
     private static final String UPDATE_ACL = "alfresco.permissions.update_Acl";
     private static final String DELETE_ACL = "alfresco.permissions.delete_Acl";
     
@@ -161,21 +160,6 @@ public class AclCrudDAOImpl extends AbstractAclCrudDAOImpl
         return (List<Long>)template.selectList(SELECT_ADM_NODES_BY_ACL, params, new RowBounds(0 , maxResults));
     }
     
-    @SuppressWarnings("unchecked")
-    @Override
-    protected List<Long> getAVMNodeEntityIdsByAcl(long aclEntityId, int maxResults)
-    {
-        if (maxResults < 0)
-        {
-            maxResults = RowBounds.NO_ROW_LIMIT;
-        }
-        
-        Map<String, Object> params = new HashMap<String, Object>(1);
-        params.put("id", aclEntityId);
-        
-        return (List<Long>)template.selectList(SELECT_AVM_NODES_BY_ACL, params, new RowBounds(0 , maxResults));
-    }
-    
     @Override
     protected int updateAclEntity(AclEntity updatedAclEntity)
     {
diff --git a/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java b/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
index 24fb6bb2ac..6f78dbd95e 100644
--- a/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
@@ -130,9 +130,7 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
     private SimpleCache<CachePucKey, PropertyUniqueContextEntity> propertyUniqueContextCache; // cluster-aware
     
     /**
-     * Set the cache to use for <b>avm_version_roots</b> lookups (optional).
-     * 
-     * @param vrEntityCache
+     * Set the cache to use for unique property lookups
      */
     public void setPropertyUniqueContextCache(SimpleCache<CachePucKey, PropertyUniqueContextEntity> propertyUniqueContextCache)
     {
@@ -1464,7 +1462,6 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
         }
         else
         {
-            // reasonable to clear for now (eg. only used by AVMLockingService.removeLocks*)
             // note: in future, if we need to support mass removal based on specific key grouping then we need to use more intelligent cache (removal)
             propertyUniqueContextCache.clear();
         }
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 8905f36450..a29e10e4c7 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -69,7 +69,6 @@ import org.alfresco.repo.admin.patch.AppliedPatch;
 import org.alfresco.repo.admin.patch.Patch;
 import org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch;
 import org.alfresco.repo.content.filestore.FileContentWriter;
-import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect;
 import org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect;
 import org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect;
@@ -1833,7 +1832,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
     {
         int totalProblems = 0;
         
-        // Discover available reference files (e.g. for prefixes alf_, avm_ etc.)
+        // Discover available reference files (e.g. for prefixes alf_, etc.)
         // and process each in turn.
         for (String schemaReferenceUrl : schemaReferenceUrls)
         {
diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index b10e7ecf81..d278f1edae 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -193,11 +193,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
      * 
      *    Resolve to node via its display path.
      *  
-     * 3) AVM Path - {store_id}/{path}
-     * 
-     *    Resolve to AVM node via its display path
-     * 
-     * @param  referenceType    one of "node", "path", or "avmpath"
+     * @param  referenceType    one of "node", "path"
      * @param  reference        array of reference segments (as described above for each reference type)
      * @return ScriptNode       the script node
      */
diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index 854c170e21..2524a4e43c 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -70,7 +70,6 @@ import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.InvalidStoreRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeRef.Status;
-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.repository.datatype.DefaultTypeConverter;
@@ -106,7 +105,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
     private NodeDAO nodeDAO;
     private PermissionService permissionService;
     private StoreArchiveMap storeArchiveMap;
-    private NodeService avmNodeService;
     private NodeIndexer nodeIndexer;
     private BehaviourFilter policyBehaviourFilter;
     private boolean enableTimestampPropagation;
@@ -136,11 +134,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         this.storeArchiveMap = storeArchiveMap;
     }
 
-    public void setAvmNodeService(NodeService avmNodeService)
-    {
-        this.avmNodeService = avmNodeService;
-    }
-
     /**
      * @param nodeIndexer       the indexer that will be notified of node additions,
      *                          modifications and deletions
@@ -234,9 +227,6 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
             }
             storeRefs.add(storeRef);
         }
-        // Now get the AVMStores.
-        List<StoreRef> avmStores = avmNodeService.getStores();
-        storeRefs.addAll(avmStores);
         // Return them all.
         return storeRefs;
     }
diff --git a/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java b/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java
index 53ad3beabb..9afa4f1abf 100644
--- a/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java
+++ b/source/java/org/alfresco/repo/node/index/AbstractReindexComponent.java
@@ -395,13 +395,6 @@ public abstract class AbstractReindexComponent implements IndexRecovery
             storeRefs = new HashSet<StoreRef>(nodeService.getStores());
             Iterator<StoreRef> storeRefsIterator = storeRefs.iterator();
             while (storeRefsIterator.hasNext())
-            {
-                // Remove AVM stores
-                StoreRef storeRef = storeRefsIterator.next();
-            }
-            
-            storeRefsIterator = storeRefs.iterator();
-            while (storeRefsIterator.hasNext())
             {
                 // Remove stores to ignore
                 StoreRef storeRef = storeRefsIterator.next();
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
index 4a3bde4de4..c91ee1ec65 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
@@ -2964,228 +2964,6 @@ public class IndexInfo implements IndexMonitor
         end = System.nanoTime();
         System.out.println("@{http://www.alfresco.org/model/content/1.0}name:be = " + hits.length() + " in " + ((end - start) / 1e9));
         searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new WildcardQuery(new Term("@{http://www.travelmuse.com/wcm}DestinationPhoto", "*"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}DestinationPhoto:* = " + hits.length() + " in " + ((end -
-        // start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new WildcardQuery(new Term("@{http://www.travelmuse.com/wcm}DestinationPhoto", "*"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}DestinationPhoto:* = " + hits.length() + " in " + ((end -
-        // start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}ThemeName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}ThemeName:bambino = " + hits.length() + " in " + ((end -
-        // start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}ThemeName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}ThemeName:bambino = " + hits.length() + " in " + ((end -
-        // start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}ActivityName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}ActivityName:bambino = " + hits.length() + " in " + ((end
-        // - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}ActivityName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}ActivityName:bambino = " + hits.length() + " in " + ((end
-        // - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}EditorialItemTitle", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}EditorialItemTitle:bambino = " + hits.length() + " in " +
-        // ((end - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}EditorialItemTitle", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}EditorialItemTitle:bambino = " + hits.length() + " in " +
-        // ((end - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}PoiName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}PoiName:bambino = " + hits.length() + " in " + ((end -
-        // start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}PoiName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}PoiName:bambino = " + hits.length() + " in " + ((end -
-        // start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}PropertyName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}PropertyName:bambino = " + hits.length() + " in " + ((end
-        // - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.travelmuse.com/wcm}PropertyName", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.travelmuse.com/wcm}PropertyName:bambino = " + hits.length() + " in " + ((end
-        // - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.alfresco.org/model/content/1.0}content", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.alfresco.org/model/content/1.0}content:bambino = " + hits.length() + " in "
-        // + ((end - start) / 1e9));
-        // searcher.close();
-        //
-        // searcher = new IndexSearcher(reader);
-        // query = new TermQuery(new Term("@{http://www.alfresco.org/model/content/1.0}content", "bambino"));
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("@{http://www.alfresco.org/model/content/1.0}content:bambino = " + hits.length() + " in "
-        // + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/editorial//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/editorial//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/editorial//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/editorial//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/tag//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/tag//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/tag//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/tag//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/poi//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/poi//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/poi//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/poi//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/property//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/property//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/property//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/property//* = " + hits.length() + " in " + ((end - start) / 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/web-reviews//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/web-reviews//* = " + hits.length() + " in " + ((end - start) /
-        // 1e9));
-        // searcher.close();
-        //        
-        // searcher = new IndexSearcher(reader);
-        // query = getPathQuery("/www/avm_webapps/ROOT/web-reviews//*");
-        // start = System.nanoTime();
-        // hits = searcher.search(query);
-        // end = System.nanoTime();
-        // System.out.println("/www/avm_webapps/ROOT/web-reviews//* = " + hits.length() + " in " + ((end - start) /
-        // 1e9));
-        // searcher.close();
-
-        // TermEnum terms = reader.terms(new Term("@{http://www.alfresco.org/model/user/1.0}members", ""));
-        // while (terms.next() && terms.term().field().equals("@{http://www.alfresco.org/model/user/1.0}members"))
-        // {
-        // System.out.println("F = " + terms.term().field() + " V = " + terms.term().text() + " F = " +
-        // terms.docFreq());
-        // if (terms.term().text().equals("xirmsi"))
-        // {
-        // System.out.println("Matched");
-        // }
-        // }
-        // terms.close();
-
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index c4465788fd..481658e9ea 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -120,7 +120,7 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean;
 import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
- * Site Service Implementation. Also bootstraps the site AVM and DM stores.
+ * Site Service Implementation. Also bootstraps the site DM stores.
  * 
  * @author Roy Wetherall
  */
@@ -173,7 +173,6 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
     private FileFolderService fileFolderService;
     private SearchService searchService;
     private NamespaceService namespaceService;
-    private PreferenceService preferenceService;
     private PermissionService permissionService;
     private ActivityService activityService;
     private PersonService personService;
@@ -205,9 +204,10 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
         this.sitesXPath = sitesXPath;
     }
     
+    @Deprecated
     public void setPreferenceService(PreferenceService preferenceService)
     {
-        this.preferenceService = preferenceService;
+        // Never used
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/template/Workflow.java b/source/java/org/alfresco/repo/template/Workflow.java
index df07b92f19..b4f09ee498 100644
--- a/source/java/org/alfresco/repo/template/Workflow.java
+++ b/source/java/org/alfresco/repo/template/Workflow.java
@@ -27,13 +27,11 @@ import java.util.Map;
 
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.forms.processor.workflow.ExtendedFieldBuilder;
 import org.alfresco.repo.workflow.WorkflowModel;
 import org.alfresco.service.ServiceRegistry;
 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.TemplateImageResolver;
 import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.cmr.workflow.WorkflowTask;
@@ -43,7 +41,6 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNameMap;
-import org.alfresco.util.Pair;
 
 /**
  * Workflow and task support in FreeMarker templates.
@@ -52,9 +49,6 @@ import org.alfresco.util.Pair;
  */
 public class Workflow extends BaseTemplateProcessorExtension
 {
-    private static final String WCM_WF_MODEL_1_0_URI = "http://www.alfresco.org/model/wcmworkflow/1.0";
-    private static final QName PROP_FROM_PATH = QName.createQName(WCM_WF_MODEL_1_0_URI, "fromPath");
-    
     private ServiceRegistry services;
 
     /**
diff --git a/source/java/org/alfresco/service/cmr/security/AuthorityService.java b/source/java/org/alfresco/service/cmr/security/AuthorityService.java
index 93fec78389..8c5711c65a 100644
--- a/source/java/org/alfresco/service/cmr/security/AuthorityService.java
+++ b/source/java/org/alfresco/service/cmr/security/AuthorityService.java
@@ -49,11 +49,6 @@ public interface AuthorityService
      */
     public static String ZONE_APP_DEFAULT = "APP.DEFAULT";
     
-    /**
-     * The WCM application zone.
-     */
-    public static String ZONE_APP_WCM = "APP.WCM";
-    
     /**
      * The SHARE application zone.
      */
diff --git a/source/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java b/source/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
index a0393bff75..d2896118f9 100644
--- a/source/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
+++ b/source/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
@@ -107,13 +107,6 @@ public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor,
             //
             //     $TOMCAT_HOME/webapps/alfresco/WEB-INF/classes/alfresco/alfresco-jmxrmi.password
             // or: $TOMCAT_HOME/shared/classes/alfresco/alfresco-jmxrmi.password
-            //
-            // However, if WCM isn't installed there won't be a JMX password file.
-            // Therefore, while it's important to choke on bad paths, a missing
-            // password file must be acceptable -- it just means that WCM virtualization
-            // will be disabled later when org.alfresco.mbeans.VirtServerRegistry
-            // refuses to bring up the serverConnector bean.
-
             path = this.resolver.getResource("classpath:alfresco/alfresco-jmxrmi.password").getFile().getCanonicalFile();
         }
         catch (Exception e ) 
diff --git a/source/java/org/alfresco/util/schemacomp/MultiFileDumper.java b/source/java/org/alfresco/util/schemacomp/MultiFileDumper.java
index c04de0afbe..86e3dbed05 100644
--- a/source/java/org/alfresco/util/schemacomp/MultiFileDumper.java
+++ b/source/java/org/alfresco/util/schemacomp/MultiFileDumper.java
@@ -28,7 +28,7 @@ import org.alfresco.util.TempFileProvider;
 import org.springframework.context.ApplicationContext;
 
 /**
- * Given a set of database object prefixes (e.g. "alf_", "avm_", "jbpm_") and
+ * Given a set of database object prefixes (e.g. "alf_", "jbpm_") and
  * a file name template (e.g. "AlfrescoSchema-MySQL-{0}-") will produce a set of files,
  * one per database object prefix of the form:
  * <pre>
@@ -46,7 +46,7 @@ public class MultiFileDumper
     private final String fileNameTemplate;
     private final DbToXMLFactory dbToXMLFactory;
     private final static String fileNameSuffix = ".xml";
-    public final static String[] DEFAULT_PREFIXES = new String[] { "alf_", "avm_", "jbpm_", "act_" };
+    public final static String[] DEFAULT_PREFIXES = new String[] { "alf_", "jbpm_", "act_" };
     private String defaultSchemaName;
     
     
diff --git a/source/test-java/org/alfresco/filesys/FTPServerTest.java b/source/test-java/org/alfresco/filesys/FTPServerTest.java
index 75373e4bf5..62b4c02a04 100644
--- a/source/test-java/org/alfresco/filesys/FTPServerTest.java
+++ b/source/test-java/org/alfresco/filesys/FTPServerTest.java
@@ -248,28 +248,19 @@ public class FTPServerTest extends TestCase
             reply = ftp.getReplyCode();
             assertTrue(FTPReply.isPositiveCompletion(reply));
 
-            // expect /Alfresco directory
-            //        /AVM directory - avm removed
             assertTrue(files.length == 1);
             
-            boolean foundAVM=false;
             boolean foundAlfresco=false;
             for(FTPFile file : files)
             {
                 logger.debug("file name=" + file.getName());
                 assertTrue(file.isDirectory());
                 
-                if(file.getName().equalsIgnoreCase("AVM"))
-                {
-                    foundAVM=true;
-                }
                 if(file.getName().equalsIgnoreCase("Alfresco"))
                 {
                     foundAlfresco=true;
                 }
             }
-            // AVM mount point removed
-            //assertTrue(foundAVM);
             assertTrue(foundAlfresco);
             
             // Change to Alfresco Dir that we know exists
@@ -568,8 +559,6 @@ public class FTPServerTest extends TestCase
         
         final String TEST_DIR="/Alfresco/User Homes/" + USER_ONE;
      
-        final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();
-            
         FTPClient ftpOne = connectClient();
         FTPClient ftpTwo = connectClient();
         try
@@ -666,8 +655,6 @@ public class FTPServerTest extends TestCase
         
         final String TEST_DIR="/Alfresco/User Homes/" + USER_THREE;
      
-        final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();
-            
         FTPClient ftpOne = connectClient();
         try
         {
diff --git a/source/test-java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java b/source/test-java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
index 2c21e18859..eb693f1f9d 100644
--- a/source/test-java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
@@ -137,7 +137,6 @@ public class RepoDictionaryDAOTest extends TestCase
         bootstrapModels.add("alfresco/model/dictionaryModel.xml");
         bootstrapModels.add("alfresco/model/systemModel.xml");
         bootstrapModels.add("alfresco/model/contentModel.xml");
-        bootstrapModels.add("alfresco/model/wcmModel.xml");
         bootstrapModels.add("alfresco/model/applicationModel.xml");
         
         bootstrapModels.add("org/alfresco/repo/security/authentication/userModel.xml");
@@ -423,7 +422,6 @@ public class RepoDictionaryDAOTest extends TestCase
         models.add("alfresco/model/dictionaryModel.xml");
         models.add("alfresco/model/systemModel.xml");
         models.add("alfresco/model/contentModel.xml");
-        models.add("alfresco/model/wcmModel.xml");
         models.add("alfresco/model/applicationModel.xml");
         models.add("org/alfresco/repo/security/authentication/userModel.xml");
         models.add("org/alfresco/repo/action/actionModel.xml");
diff --git a/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java b/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java
deleted file mode 100644
index 483a157783..0000000000
--- a/source/test-java/org/alfresco/repo/domain/PropertyValueTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.repo.domain;
-
-import java.util.Locale;
-
-import junit.framework.TestCase;
-
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.repository.MLText;
-import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.test_category.OwnJVMTestsCategory;
-import org.alfresco.util.ApplicationContextHelper;
-import org.junit.experimental.categories.Category;
-import org.springframework.context.ApplicationContext;
-
-/**
- * @see PropertyValue
- * 
- * @author Derek Hulley
- */
-@Category(OwnJVMTestsCategory.class)
-public class PropertyValueTest extends TestCase
-{
-    private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
-    
-    public void testMLText()
-    {
-        ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
-        TransactionService txnService = serviceRegistry.getTransactionService();
-        
-        RetryingTransactionCallback<Object> doTestCallback = new RetryingTransactionCallback<Object>()
-        {
-            public Object execute() throws Throwable
-            {
-                // single language
-                MLText mlText = new MLText(Locale.FRENCH, "bonjour");
-                PropertyValue propertyValue = new PropertyValue(DataTypeDefinition.MLTEXT, mlText);
-                assertEquals("MLText not persisted as a string", "bonjour", propertyValue.getStringValue());
-                
-                try
-                {
-                    // multiple languages
-                    mlText = new MLText(Locale.GERMAN, "hallo");
-                    mlText.addValue(Locale.ITALIAN, "ciao");
-                    propertyValue = new PropertyValue(DataTypeDefinition.MLTEXT, mlText);
-                    
-                    fail();
-                }
-                catch (UnsupportedOperationException uoe)
-                {
-                    // expected
-                    // NOTE: since 2.2.1, PropertyValue is only used by AVM (which does not natively support MLText, other than single/default string)
-                }
-                
-                // single language - empty string
-                mlText = new MLText(Locale.FRENCH, "");
-                propertyValue = new PropertyValue(DataTypeDefinition.MLTEXT, mlText);
-                assertEquals("MLText not persisted as an empty string", "", propertyValue.getStringValue());
-                
-                // single language - null string
-                mlText = new MLText(Locale.GERMAN, null);
-                propertyValue = new PropertyValue(DataTypeDefinition.MLTEXT, mlText);
-                assertNull("MLText not persisted as a null string", propertyValue.getStringValue());
-                
-                return null;
-            }
-        };
-        txnService.getRetryingTransactionHelper().doInTransaction(doTestCallback, false);
-    }
-}
diff --git a/source/test-java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java b/source/test-java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
index 69bd888aec..db213bcd38 100644
--- a/source/test-java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
+++ b/source/test-java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
@@ -320,7 +320,6 @@ public class ScriptAuthorityServiceTest extends TestCase
        Set<String> zones = new HashSet<String>();
        zones.add(AuthorityService.ZONE_APP_SHARE);
        pubAuthorityService.addAuthorityToZones(GROUP_A_FULL, zones);
-       zones.add(AuthorityService.ZONE_APP_WCM);
        pubAuthorityService.addAuthorityToZones(GROUP_B_FULL, zones);
        
        groups = service.searchGroupsInZone(
@@ -331,14 +330,6 @@ public class ScriptAuthorityServiceTest extends TestCase
        assertEquals(GROUP_A, groups[0].getShortName());
        assertEquals(GROUP_B, groups[1].getShortName());
        
-       groups = service.searchGroupsInZone(
-             GROUP_A.substring(0, GROUP_A.length()-1), AuthorityService.ZONE_APP_WCM,  
-             new ScriptPagingDetails(10,0), "default");
-       
-       assertEquals(1, groups.length);
-       assertEquals(GROUP_B, groups[0].getShortName());
-
-       
        // And root groups in zones 
        groups = service.searchRootGroupsInZone(
              GROUP_A.substring(0, GROUP_A.length()-1)+"*", AuthorityService.ZONE_APP_SHARE,  
@@ -346,15 +337,6 @@ public class ScriptAuthorityServiceTest extends TestCase
        
        assertEquals(1, groups.length);
        assertEquals(GROUP_A, groups[0].getShortName());
-       
-       groups = service.searchRootGroupsInZone(
-             GROUP_A.substring(0, GROUP_A.length()-1)+"*", AuthorityService.ZONE_APP_WCM,  
-             new ScriptPagingDetails(10,0), "default");
-       
-       // B apparently counts as a root group in the WCM zone as it's
-       //  parent group A isn't in that zone too
-       assertEquals(1, groups.length);
-       assertEquals(GROUP_B, groups[0].getShortName());
     }
     
     public void testGroupUsers()
diff --git a/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java b/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java
index ecab840c60..ce8104481c 100644
--- a/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java
+++ b/source/test-java/org/alfresco/repo/security/permissions/impl/model/PermissionModelTest.java
@@ -87,8 +87,7 @@ public class PermissionModelTest extends AbstractPermissionTest
         Set<PermissionReference> grantees = permissionModelDAO.getGranteePermissions(SimplePermissionReference.getPermissionReference(QName.createQName("cm", "cmobject",
                 namespacePrefixResolver), "Coordinator"));
 
-        // NB This has gone from 59 to 63, I believe, because of the for new WCM roles.
-        // 63-97 from AVM permission fix up
+        // TODO: readjust due to permission removal
         assertEquals(103, grantees.size());
     }
 
@@ -104,13 +103,13 @@ public class PermissionModelTest extends AbstractPermissionTest
     {
         Set<PermissionReference> granters = permissionModelDAO.getGrantingPermissions(SimplePermissionReference.getPermissionReference(QName.createQName("sys", "base",
                 namespacePrefixResolver), "ReadProperties"));
-        // NB This has gone from 10 to 14 because of the new WCM roles, I believe.
+        // TODO: readjust due to permission removal
         // 14-18 -> 4 site base roles added
         assertEquals(18, granters.size());
 
         granters = permissionModelDAO.getGrantingPermissions(SimplePermissionReference.getPermissionReference(QName.createQName("sys", "base", namespacePrefixResolver),
                 "_ReadProperties"));
-        // NB 11 to 15 as above.
+        // TODO: readjust due to permission removal
         // 5-19 site based roles added
         assertEquals(19, granters.size());
     }
diff --git a/source/test-resources/alfresco/extension/model/testContentModel.xml b/source/test-resources/alfresco/extension/model/testContentModel.xml
index f475b35a84..35cb5bf6a8 100644
--- a/source/test-resources/alfresco/extension/model/testContentModel.xml
+++ b/source/test-resources/alfresco/extension/model/testContentModel.xml
@@ -1205,9 +1205,7 @@
          </properties>
       </aspect>
       
-      <!-- An aspect to make a node reference another node. Needed to
-           support cross repository references. There is a sys:reference type but
-           that is awkard for AVM Nodes which are less flexible as to type. -->
+      <!-- An aspect to make a node reference another node. -->
       <aspect name="cm:referencesnode">
          <title>References Node</title>
          <properties>
diff --git a/source/test-resources/jbpm-test/jbpm.cfg.xml b/source/test-resources/jbpm-test/jbpm.cfg.xml
index ef9e57ff75..723ddf49c5 100644
--- a/source/test-resources/jbpm-test/jbpm.cfg.xml
+++ b/source/test-resources/jbpm-test/jbpm.cfg.xml
@@ -58,7 +58,6 @@
          <int value="1" />
       </field>
 
-      <!-- overridden for WCM unit tests to 5 secs (was 1.5 mins) -->
       <field name="idleInterval">
          <int value="5000" />
       </field>
diff --git a/source/test-resources/test/alfresco/jbpm.cfg.xml b/source/test-resources/test/alfresco/jbpm.cfg.xml
index ef9e57ff75..723ddf49c5 100644
--- a/source/test-resources/test/alfresco/jbpm.cfg.xml
+++ b/source/test-resources/test/alfresco/jbpm.cfg.xml
@@ -58,7 +58,6 @@
          <int value="1" />
       </field>
 
-      <!-- overridden for WCM unit tests to 5 secs (was 1.5 mins) -->
       <field name="idleInterval">
          <int value="5000" />
       </field>
diff --git a/source/test-resources/test/alfresco/model/testWcmModel.xml b/source/test-resources/test/alfresco/model/testWcmModel.xml
deleted file mode 100644
index 61f5238c96..0000000000
--- a/source/test-resources/test/alfresco/model/testWcmModel.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<model name="twcm:testwcmmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-   <imports>
-      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
-   </imports>
-
-   <namespaces>
-      <namespace uri="http://www.alfresco.org/model/testwcmmodel/1.0" prefix="twcm"/>
-   </namespaces>
-
-   <aspects>
-       <aspect name="twcm:authored">
-           <properties>
-               <property name="twcm:dateAuthored">
-                   <type>d:date</type>
-                   <multiple>true</multiple>
-               </property>
-           </properties>
-       </aspect>
-   </aspects>
-
-</model>
diff --git a/source/test-resources/test/alfresco/wcm-template-node-test-context.xml b/source/test-resources/test/alfresco/wcm-template-node-test-context.xml
deleted file mode 100644
index bc9a5e62c1..0000000000
--- a/source/test-resources/test/alfresco/wcm-template-node-test-context.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-   <!-- Overriding test properties to point to custom properties -->
-   <bean id="test-properties"
-      class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-      <property name="ignoreUnresolvablePlaceholders" value="true" />
-      <property name="location" value="classpath:alfresco/repository.properties" />
-      <property name="searchSystemEnvironment">
-          <value>false</value>
-      </property>
-   </bean>
-
-   <bean id="extension.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
-      <property name="models">
-         <list>
-            <value>test/alfresco/model/testWcmModel.xml</value>
-         </list>
-      </property>
-   </bean>
-
-</beans>
diff --git a/source/test-resources/wcm/jbpm.cfg.xml b/source/test-resources/wcm/jbpm.cfg.xml
deleted file mode 100644
index 1246c97c17..0000000000
--- a/source/test-resources/wcm/jbpm.cfg.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<jbpm-configuration>
-
-   <jbpm-context>
-      <service name="persistence"
-         factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
-      <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
-      <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
-      <service name="scheduler"
-         factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
-      <service name="logging"
-         factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
-      <service name="authentication"
-         factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
-   </jbpm-context>
-
-   <!--
-      configuration resource files pointing to default configuration
-      files in jbpm-{version}.jar
-   -->
-   <string name="resource.business.calendar"
-      value="org/jbpm/calendar/jbpm.business.calendar.properties" />
-   <string name="resource.default.modules"
-      value="org/jbpm/graph/def/jbpm.default.modules.properties" />
-   <string name='resource.converter'
-      value='org/alfresco/repo/workflow/jbpm/jbpm.converter.properties' />
-   <string name="resource.action.types"
-      value="org/alfresco/repo/workflow/jbpm/jbpm.action.types.xml" />
-   <string name="resource.node.types"
-      value="org/alfresco/repo/workflow/jbpm/jbpm.node.types.xml" />
-   <string name="resource.parsers"
-      value="org/alfresco/repo/workflow/jbpm/jbpm.parsers.xml" />
-   <string name="resource.varmapping"
-      value="org/alfresco/repo/workflow/jbpm/jbpm.varmapping.xml" />
-   <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
-
-   <int name="jbpm.byte.block.size" value="1024" singleton="true" />
-   <string name="jbpm.mail.smtp.host" value="localhost" />
-   <bean name="jbpm.task.instance.factory"
-      class="org.alfresco.repo.workflow.jbpm.WorkflowTaskInstanceFactory"
-      singleton="true">
-      <field name="jbpmEngineName">
-         <string value="jbpm_engine" />
-      </field>
-   </bean>
-   <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver"
-      singleton="true" />
-   <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver"
-      singleton="true" />
-
-   <bean name="jbpm.job.executor" class="org.alfresco.repo.workflow.jbpm.AlfrescoJobExecutor">
-      <field name="jbpmConfiguration">
-         <ref bean="jbpmConfiguration" />
-      </field>
-      <field name="name">
-         <string value="AlfrescoJbpmJobExector" />
-      </field>
-      <field name="nbrOfThreads">
-         <int value="1" />
-      </field>
-
-      <!-- overridden for WCM unit tests to 1 secs (was 1.5 mins) -->
-      <field name="idleInterval">
-         <int value="1000" />
-      </field>
-
-      <field name="maxIdleInterval">
-         <int value="3600000" />
-      </field> <!-- 1 hour -->
-      <field name="historyMaxSize">
-         <int value="20" />
-      </field>
-      <field name="maxLockTime">
-         <int value="600000" />
-      </field> <!-- 10 minutes -->
-      <field name="lockMonitorInterval">
-         <int value="60000" />
-      </field> <!-- 1 minute -->
-      <field name="lockBufferTime">
-         <int value="5000" />
-      </field> <!-- 5 seconds -->
-   </bean>
-
-</jbpm-configuration>
diff --git a/source/test-resources/wcm/small-61-items.zip b/source/test-resources/wcm/small-61-items.zip
deleted file mode 100644
index 7a7225b498bebf59ef73d45794dd2692f26eb615..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10044
zcmd^@T}&KR6vv0<YZ2I81S*vpi;ZcuX4skK!?s%4wnodAuoep#KNf{TL0YjOVvJg(
z=%ybLF($qsG?J(f($E;C)dy{iN*av%(yBB*RFlR^$_vrPkb3Xlnb~t@X3gE5+ZW4*
zj|a{#=lsvP=g$1Yq4bO!B>Hvo(GNDp{?LA8N<OKrbHBfQS96}!^tP+^-JFctrL-a`
zOhSqzH~E-DJbH+{ts&CT_sss?H1=B(r^hb5v&nPX@7vaKG&fWs-*LW2+ShXbY|f07
z*);Lj4`n|WoG98EzWvn~Mwc27z0$d=UOKlp6FHE#`pct%&7<d59Gt59uI!+1OZ27I
zslNIC(k;<j)N$|dR9|oDc=pErR`v0Vwbh?aM<&*cUEFcgsUPR&ww@{3d}MuT;UQ(X
z`PikV<9B`aYfsPbSN^&0$;zv_WiOW;zVO_tMNh^V&+-0Cf4sI7s#zQ#et%#0vGwQY
zPr2RG#r5G(w!2G;?ma<d$taOx)ic4qHwl(Qs*gnKf?Mkwnq#8T!s)jzntd1*%?L9D
zH^<rwzS0saM-pn^+EU!w(ehNwV%?6$MQ>v?e84qQlD^hgnl|n74gDR=d+>|Fv`w_a
zZ1?<|Z_KPC74Ib9wBIcC&rKC;BcjBreT0n2d!SmDu{lH=5vAOcrXKr$9uae|nR52M
zHY;cDHIdNTYh6Sqy=IMz4o#wUU^K41vwOE+?&xgS&-O^p)$Me|FSuf(^H$bbHJyx2
znl?HdIK?r}%QlZvPP0?|a(j2bqx3LOkq7p63*@Ped8iwz*m48%o<4`=qVy^pSDO#J
zTPb(-I_d>VuFA1?2v_YGhbHfC!L8VkM0#xHe{H|=Rb%CUY+3o{5KSP}y7Kkd>uKdP
z<?L6!Svm8{ClXp$zAoZ5Tls2isru!<?luwUj^PxsxMVge8|+#8!44RMebO@6<`8YL
z1J=RTW3Q*dX3E(QwplszU=s<ggRP5r%?3N54fa5<v&-Gbt|x|5<X*?uX8{8Gg%ic+
zs0zpt%P8O}1OqFa-=!E>=^Tg~T_r$7?eRgI#cEmXYzufE!6k1HU9u{;DXQ?(rwTuP
zs_@gN3OIeJ(Q1W&Mq^^703tfjYL)2OsTPnTI?w{zf_S2LqVS%GSc#~~!doI>C87kA
z*@$Vb;&k>jYj$EYr95K4#J*}4g7mlMEV>OVHyonjabFRdoE{K9IT+BxfoJD7Y+c4-
zX;>}McpA$=g;+v{)48jeA?O3+e<5Hh%fUSmVU(mlbec<oF6K&9(xioh9zgA@Gdprv
z<Tb9C$kftvOS%~fGos;%MQ+r?Eh1A-k6)pOiT7rROcY}I*eOKwNvzO_g=3>oJhiyX
z2mL?TyvadthNcj(5Sh}{LWELL^D!~!3CPjBLq3id4Z%l<qnU=OfR+(Ra|=@e)nx*O
z6z!#!4}_&2gCNZx<l|t8{)8O;_TdBJgzm`#m1&M3A15F6>@egoE07O^)A<QvG!HNp
z&bn++mS+C(aj?$MLymr>@PTk)-$0ON_nA3~oW1z2UI?ym#|oov729UiW`akQdR2+H
z*>*kLvd!Wg`zr&MvmAUN2X8Z$kKHz-`6S+ELl%zBHjAgmv&~#2f3jbZJ7!jzhw~8R
zXtr1?oC(NDusWFJW;X`kW0x6++BvNA)Q5qcr{Re^e_L)$7G#RCa^f78hWTLucYZaQ
zMtG00eC#?;^GV$K$1EJ1&c{>Z>DVs>Nji`0BfgIL&@Q_(A8?GfLOxOfBE5)6#w%+o
zs5yjkl+~>sSfBBd%9j<E>RE(J?jpjZ(}<+M0Hu;sp%<2?yFq*;+`cwMGTwRkQ1~MG
z1fewlhYy5x%JRYLlDm>{bxnw5yx;I8g{%7zqI9c=4}^2Nf<TTAOsD_|6*qTM$!ZLt
z937a;2$kG{!BW-S2<tO^oK)%?MJU58;6vf@{0*UW=Z24j>#Hn;^%?#E9}17>>kyTk
z<`{Gqf}HHAwMC#fM}iMPQj#kQw{8}a9O->?F{m!N6@^pkf*{)sl}TP0B<WuAd77N8
J&&dBv(!VLDtF-_C

diff --git a/source/test-resources/wcm/wcm-jbpm-context.xml b/source/test-resources/wcm/wcm-jbpm-context.xml
deleted file mode 100644
index 2dc68c962c..0000000000
--- a/source/test-resources/wcm/wcm-jbpm-context.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-   <bean id="jbpm_configuration" class="org.alfresco.repo.workflow.jbpm.AlfrescoJbpmConfigurationFactoryBean">
-      <property name="sessionFactory" ref="sessionFactory"/>
-      <property name="configuration" value="classpath:wcm/jbpm.cfg.xml"/>
-   </bean>
-       
-</beans>
diff --git a/source/test-resources/wcm/wcm-test-preview-context.xml b/source/test-resources/wcm/wcm-test-preview-context.xml
deleted file mode 100644
index 7ca496e4eb..0000000000
--- a/source/test-resources/wcm/wcm-test-preview-context.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-    <bean id="previewURIServiceRegistry" class="org.alfresco.wcm.preview.PreviewURIServiceRegistryImpl">
-        <property name="defaultProviderName">
-           <value>Virtualisation Server Preview</value>
-       </property>
-       <property name="previewURIServiceProvidersByName">
-           <map>
-               <entry key="Virtualisation Server Preview">
-                   <ref bean="virtServerPreviewURIService"/>
-               </entry>
-               <entry key="NOOP Preview">
-                   <ref bean="nullPreviewURIService"/>
-               </entry>
-           </map>
-       </property>
-    </bean>
-    
-</beans>