Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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: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: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: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>

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: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: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: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>

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: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: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: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>

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: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: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: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>

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: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: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: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: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: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: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>

config/alfresco/model/jcrModel.xml

@@ -1,151 +0,0 @@
-<model name="jcr:jcrmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-   <description>JCR Model Definitions</description>
-   <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" />
-   </imports>
-
-   <namespaces>
-      <namespace uri="http://www.jcp.org/jcr/1.0" prefix="jcr" />
-      <namespace uri="http://www.jcp.org/jcr/nt/1.0" prefix="nt" />
-      <namespace uri="http://www.jcp.org/jcr/mix/1.0" prefix="mix" />
-      <namespace uri="http://www.jcp.org/jcr/sv/1.0" prefix="sv" />
-      <namespace uri="http://www.w3.org/XML/1998/namespace" prefix="xml" />
-   </namespaces>
-
-   <types>
-
-      <type name="nt:base">
-         <parent>sys:base</parent>
-         <properties>
-            <property name="jcr:primaryType">
-               <type>d:qname</type>
-               <protected>true</protected>
-               <mandatory enforced="true">true</mandatory>
-            </property>
-            <property name="jcr:mixinTypes">
-               <type>d:qname</type>
-               <protected>true</protected>
-               <multiple>true</multiple>
-            </property>
-         </properties>
-      </type>
-
-      <type name="nt:hierarchyNode">
-         <parent>nt:base</parent>
-         <properties>
-            <property name="jcr:created">
-               <type>d:date</type>
-               <protected>true</protected>
-               <mandatory>false</mandatory>
-               <multiple>false</multiple>
-            </property>
-         </properties>
-      </type>
-
-      <type name="nt:file">
-         <parent>nt:hierarchyNode</parent>
-         <associations>
-            <child-association name="jcr:content">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </source>
-               <target>
-                  <class>nt:base</class>
-                  <mandatory enforced="true">true</mandatory>
-                  <many>false</many>
-               </target>
-               <child-name>jcr:content</child-name>
-               <duplicate>false</duplicate>
-            </child-association>
-         </associations>         
-      </type>         
-
-      <type name="nt:folder">
-         <parent>nt:hierarchyNode</parent>
-         <associations>
-            <child-association name="jcr:contains">
-               <source>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </source>
-               <target>
-                  <class>nt:hierarchyNode</class>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-               <duplicate>false</duplicate>
-            </child-association>
-         </associations>         
-      </type>         
-
-      <type name="nt:resource">
-         <parent>nt:base</parent>
-         <properties>
-            <property name="jcr:encoding">
-               <type>d:text</type>
-               <protected>false</protected>
-               <mandatory>false</mandatory>
-               <multiple>false</multiple>
-            </property>
-            <property name="jcr:mimeType">
-               <type>d:text</type>
-               <protected>false</protected>
-               <mandatory>true</mandatory>
-               <multiple>false</multiple>
-            </property>
-            <property name="jcr:data">
-               <type>d:content</type>
-               <protected>false</protected>
-               <mandatory>true</mandatory>
-               <multiple>false</multiple>
-               <index enabled="true">
-                  <atomic>true</atomic>
-                  <stored>false</stored>
-                  <tokenised>true</tokenised>
-               </index>
-            </property>
-            <property name="jcr:lastModified">
-               <type>d:date</type>
-               <protected>false</protected>
-               <mandatory>true</mandatory>
-               <multiple>false</multiple>
-            </property>
-         </properties>
-         <mandatory-aspects>
-            <aspect>mix:referenceable</aspect>
-         </mandatory-aspects>
-      </type>
-
-   </types>
-
-   <aspects>
-
-      <aspect name="mix:referenceable">
-         <properties>
-            <property name="jcr:uuid">
-               <type>d:text</type>
-               <protected>true</protected>
-               <mandatory>true</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-      <aspect name="mix:lockable">
-         <properties>
-            <property name="jcr:lockOwner">
-               <type>d:text</type>
-            </property>
-            <property name="jcr:lockIsDeep">
-               <type>d:boolean</type>
-            </property>
-         </properties>
-      </aspect>
-
-   </aspects>
-
-</model>

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: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">  
+  <cm:folder view:childName="app:following" xmlns="" 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: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: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: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>

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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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>

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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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>

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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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: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">
+  <cm:content xmlns="" 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: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: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: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>

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: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: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: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>

config/org/alfresco/repo/workflow/jbpm/jbpm.varmapping.xml

@@ -185,14 +185,6 @@
       <variable-instance class="org.jbpm.context.exe.variableinstance.Ejb3Instance" />
     </jbpm-type>
         
-    <!-- JSR 170 JCR Node -->
-    <jbpm-type>
-      <matcher>
-        <bean class="org.jbpm.context.exe.matcher.JcrNodeMatcher" />
-      </matcher>
-      <variable-instance class="org.jbpm.context.exe.variableinstance.JcrNodeInstance" />
-    </jbpm-type>
-        
   </list>
 
 </jbpm-types>

source/java/org/alfresco/repo/jscript/Search.java

@@ -511,7 +511,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
      * {
      *    query: string,          mandatory, in appropriate format and encoded for the given language
      *    store: string,          optional, defaults to 'workspace://SpacesStore'
-     *    language: string,       optional, one of: lucene, xpath, jcr-xpath, fts-alfresco - defaults to 'lucene'
+     *    language: string,       optional, one of: lucene, xpath, fts-alfresco - defaults to 'lucene'
      *    templates: [],          optional, Array of query language template objects (see below) - if supported by the language 
      *    sort: [],               optional, Array of sort column objects (see below) - if supported by the language
      *    page: object,           optional, paging information object (see below) - if supported by the language

source/java/org/alfresco/repo/search/DocumentNavigator.java

@@ -60,12 +60,6 @@ import org.jaxen.XPath;
  */
 public class DocumentNavigator extends DefaultNavigator implements NamedAccessNavigator
 {
-    private static QName JCR_ROOT = QName.createQName("http://www.jcp.org/jcr/1.0", "root");
-    
-    private static QName JCR_PRIMARY_TYPE = QName.createQName("http://www.jcp.org/jcr/1.0", "primaryType");
-    
-    private static QName JCR_MIXIN_TYPES = QName.createQName("http://www.jcp.org/jcr/1.0", "mixinTypes");
-    
     private static final long serialVersionUID = 3618984485740165427L;
 
     private DictionaryService dictionaryService;
@@ -108,29 +102,16 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
         }
     }
     
-    public class JCRRootNodeChildAssociationRef extends ChildAssociationRef
-    {
-
-        /**
-         * Comment for <code>serialVersionUID</code>
-         */
-        private static final long serialVersionUID = -3890194577752476675L;
-
-        public JCRRootNodeChildAssociationRef(QName assocTypeQName, NodeRef parentRef, QName childQName, NodeRef childRef)
-        {
-            super(assocTypeQName, parentRef, childQName, childRef);
-        }
-        
-        public JCRRootNodeChildAssociationRef(QName assocTypeQName, NodeRef parentRef, QName childQName, NodeRef childRef, boolean isPrimary, int nthSibling)
-        {
-            super(assocTypeQName, parentRef, childQName, childRef, isPrimary, nthSibling);
-        }
-        
-    }
-
     private boolean followAllParentLinks;
     
-    private boolean useJCRRootNode;
+    /**
+     * @deprecated useJCRRootNode parameter is now obsolete.
+     */
+    public DocumentNavigator(DictionaryService dictionaryService, NodeService nodeService, SearchService searchService,
+            NamespacePrefixResolver nspr, boolean followAllParentLinks, boolean useJCRRootNode)
+    {
+        this(dictionaryService, nodeService, searchService, nspr, followAllParentLinks);
+    }
     
     /**
      * @param dictionaryService
@@ -149,7 +130,7 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
      *            parent-child association should be traversed
      */
     public DocumentNavigator(DictionaryService dictionaryService, NodeService nodeService, SearchService searchService,
-            NamespacePrefixResolver nspr, boolean followAllParentLinks, boolean useJCRRootNode)
+            NamespacePrefixResolver nspr, boolean followAllParentLinks)
     {
         super();
         this.dictionaryService = dictionaryService;
@@ -157,7 +138,6 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
         this.searchService = searchService;
         this.nspr = nspr;
         this.followAllParentLinks = followAllParentLinks;
-        this.useJCRRootNode = useJCRRootNode;
     }
 
     
@@ -379,14 +359,6 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
                 properties.add(property);
             }        
         }
-        if(useJCRRootNode)
-        {
-            properties.add(new Property(JCR_PRIMARY_TYPE, nodeService.getType(nodeRef), nodeRef));
-            for(QName mixin : nodeService.getAspects(nodeRef))
-            {
-                properties.add(new Property(JCR_MIXIN_TYPES, mixin, nodeRef));
-            }
-        }
         
         return properties.iterator();
     }
@@ -400,18 +372,7 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
         NodeRef childRef = assocRef.getChildRef();
         QName qName = QName.createQName(namespaceURI, localName);
         List<? extends ChildAssociationRef> list = null;
-        // Add compatability for JCR 170 by including the root node.
-        if(isDocument(contextNode) && useJCRRootNode)
-        {
-            list = new ArrayList<ChildAssociationRef>(1);
-            list = Collections.singletonList(
-                    new JCRRootNodeChildAssociationRef(
-                            ContentModel.ASSOC_CHILDREN, childRef, JCR_ROOT, childRef, true, 0));
-        }
-        else
-        {
         list = nodeService.getChildAssocs(childRef, RegexQNamePattern.MATCH_ALL, qName);
-        }
         // done
         return list.iterator();
     }
@@ -422,16 +383,7 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa
         ChildAssociationRef assocRef = (ChildAssociationRef) o;
         NodeRef childRef = assocRef.getChildRef();
         List<ChildAssociationRef> list;
-        // Add compatability for JCR 170 by including the root node.
-        if(isDocument(o) && useJCRRootNode)
-        {
-            list = new ArrayList<ChildAssociationRef>(1);
-            list.add(new JCRRootNodeChildAssociationRef(ContentModel.ASSOC_CHILDREN, childRef, JCR_ROOT, childRef, true, 0));
-        }
-        else
-        {
         list = nodeService.getChildAssocs(childRef);
-        }
         return list.iterator();
     }
 

source/java/org/alfresco/repo/search/NodeServiceXPath.java

@@ -88,8 +88,6 @@ public class NodeServiceXPath extends BaseXPath
 {
     private static final long serialVersionUID = 3834032441789592882L;
 
-    private static String JCR_URI = "http://www.jcp.org/jcr/1.0";
-    
     private static Log logger = LogFactory.getLog(NodeServiceXPath.class);
 
     /**
@@ -469,67 +467,6 @@ public class NodeServiceXPath extends BaseXPath
         }
     }
 
-    static class JCRContains implements Function
-    {
-
-        public Object call(Context context, List args) throws FunctionCallException
-        {
-            if (args.size() == 2)
-            {
-                if (context.getNavigator().isAttribute(context.getNodeSet().get(0)))
-                {
-                    throw new FunctionCallException("jcr:contains() does not apply to an attribute context.");
-                }
-                return evaluate(context.getNodeSet(), args.get(0), args.get(1), context.getNavigator());
-            }
-
-            throw new FunctionCallException("contains() requires two argument.");
-        }
-
-        public Object evaluate(List nodes, Object identifier, Object pattern, Navigator nav)
-        {
-            if (nodes.size() != 1)
-            {
-                return false;
-            }
-
-            QName qname = null;
-            NodeRef nodeRef = null;
-
-            Object target = identifier;
-
-            if (identifier instanceof List)
-            {
-                List list = (List) identifier;
-                if (list.isEmpty())
-                {
-                    return false;
-                }
-                // do not recurse: only first list should unwrap
-                target = list.get(0);
-            }
-
-            if (nav.isElement(target))
-            {
-                qname = null; // should use all attributes and full text index
-                nodeRef = ((ChildAssociationRef) target).getChildRef();
-            }
-            else if (nav.isAttribute(target))
-            {
-                qname = QName.createQName(
-                        nav.getAttributeNamespaceUri(target),
-                        ISO9075.decode(nav.getAttributeName(target)));
-                nodeRef = ((DocumentNavigator.Property) target).parent;
-            }
-
-            String patternValue = StringFunction.evaluate(pattern, nav);
-            DocumentNavigator dNav = (DocumentNavigator) nav;
-
-            return dNav.contains(nodeRef, qname, patternValue, SearchParameters.AND);
-
-        }
-    }
-
     static class Score implements Function
     {
         private Double one = new Double(1);
@@ -694,14 +631,6 @@ public class NodeServiceXPath extends BaseXPath
             registerFunction("", "contains", new Contains());
 
             registerFunction("", "first", new FirstFunction());
-
-            // 170 functions
-
-            registerFunction(JCR_URI, "like", new Like());
-            registerFunction(JCR_URI, "score", new Score());
-            registerFunction(JCR_URI, "contains", new JCRContains());
-            registerFunction(JCR_URI, "deref", new Deref());
-
         }
     }
 

source/java/org/alfresco/repo/search/impl/JCR170Searcher.java

@@ -1,61 +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.search.impl;
-
-import org.alfresco.repo.search.AbstractSearcherComponent;
-import org.alfresco.service.cmr.repository.Path;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.QueryParameter;
-import org.alfresco.service.cmr.search.QueryParameterDefinition;
-import org.alfresco.service.cmr.search.ResultSet;
-import org.alfresco.service.cmr.search.SearchParameters;
-import org.alfresco.service.namespace.QName;
-
-/**
- * Simple searcher against another store using the JSR 170 API.
- * <p>
- * This class is not fully implemented and hence still abstract.
- */
-public abstract class JCR170Searcher extends AbstractSearcherComponent
-{
-    public ResultSet query(StoreRef store, String language, String query, Path[] queryOptions,
-            QueryParameter[] queryParameters)
-    {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException();
-    }
-
-    public ResultSet query(StoreRef store, String language, String query, Path[] attributePaths, QueryParameterDefinition[] queryParameterDefinitions)
-    {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException();
-    }
-
-    public ResultSet query(StoreRef store, QName queryId, QueryParameter[] queryParameters)
-    {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException();
-    }
-
-    public ResultSet query(SearchParameters searchParameters)
-    {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException();
-    }
-}

source/java/org/alfresco/repo/search/impl/NodeSearcher.java

@@ -75,53 +75,11 @@ public class NodeSearcher
         try
         {
             String xpath = xpathIn;
-            boolean useJCRXPath = language.equalsIgnoreCase(SearchService.LANGUAGE_JCR_XPATH);
 
             List<AttributeOrder> order = null;
 
-            // replace element
-            if (useJCRXPath)
-            {
-                order = new ArrayList<AttributeOrder>();
-                // We do not allow variable substitution with this pattern
-                xpath = xpath.replaceAll("element\\(\\s*(\\*|\\w*:\\w*)\\s*,\\s*(\\*|\\w*:\\w*)\\s*\\)",
-                        "$1[subtypeOf(\"$2\")]");
-                String split[] = xpath.split("order\\s*by\\s*", 2);
-                xpath = split[0];
-
-                if (split.length > 1 && split[1].length() > 0)
-                {
-                    String clauses[] = split[1].split("\\s,\\s");
-
-                    for (String clause : clauses)
-                    {
-                        if (clause.startsWith("@"))
-                        {
-                            String attribute = clause.replaceFirst("@(\\p{Alpha}[\\w:]*)(?:\\s+(.*))?", "$1");
-                            String sort = clause.replaceFirst("@(\\p{Alpha}[\\w:]*)(?:\\s+(.*))?", "$2");
-
-                            if (sort.length() == 0)
-                            {
-                                sort = "ascending";
-                            }
-
-                            QName attributeQName = QName.createQName(attribute, namespacePrefixResolver);
-                            order.add(new AttributeOrder(attributeQName, sort.equalsIgnoreCase("ascending")));
-                        }
-                        else if (clause.startsWith("jcr:score"))
-                        {
-                            // ignore jcr:score ordering
-                        }
-                        else
-                        {
-                            throw new IllegalArgumentException("Malformed order by expression " + split[1]);
-                        }
-                    }
-                }
-            }
-            
             DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searchService,
-                    namespacePrefixResolver, followAllParentLinks, useJCRXPath);
+                    namespacePrefixResolver, followAllParentLinks);
             NodeServiceXPath nsXPath = new NodeServiceXPath(xpath, documentNavigator, paramDefs);
             for (String prefix : namespacePrefixResolver.getPrefixes())
             {
@@ -236,10 +194,8 @@ public class NodeSearcher
     {
         try
         {
-            boolean useJCRXPath = language.equalsIgnoreCase(SearchService.LANGUAGE_JCR_XPATH);
-
             DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searchService,
-                    namespacePrefixResolver, followAllParentLinks, useJCRXPath);
+                    namespacePrefixResolver, followAllParentLinks);
             NodeServiceXPath nsXPath = new NodeServiceXPath(xpath, documentNavigator, paramDefs);
             for (String prefix : namespacePrefixResolver.getPrefixes())
             {

source/test-java/org/alfresco/repo/search/SearcherComponentTest.java

@@ -465,503 +465,6 @@ public class SearcherComponentTest extends TestCase
         assertTrue("Incorrect result: incorrect node retrieved", answer.contains(n3Ref));
     }
 
-    public void testJCRRoot() throws Exception
-    {
-
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        NodeServiceXPath xpath;
-        List list;
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        // create the document navigator
-        DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher,
-                namespacePrefixResolver, false, true);
-
-        xpath = new NodeServiceXPath("/jcr:root", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root/*", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(2, list.size());
-
-        xpath = new NodeServiceXPath("/*/*", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(2, list.size());
-    }
-
-    public void testBooleanFunctions() throws Exception
-    {
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        NodeServiceXPath xpath;
-        List list;
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        // create the document navigator
-        DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher,
-                namespacePrefixResolver, false, true);
-
-        xpath = new NodeServiceXPath("/jcr:root[true()]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root[false()]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root[not(true())]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root[not(false())]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-    }
-
-    public void testMutiValueProperties() throws Exception
-    {
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        NodeServiceXPath xpath;
-        List list;
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
-        // create the document navigator
-        DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher,
-                namespacePrefixResolver, false, true);
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp = 'first']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp = 'second']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp = 'third']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp != 'third']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp < 'e']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp > 'e']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp < 'first']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp <= 'first']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp > 'third']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp >= 'third']", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi < 1]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi <= 1]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi > 3]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(0, list.size());
-
-        xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi >= 3]", documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-    }
-
-    public void testElementNodeTest() throws Exception
-    {
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        NodeServiceXPath xpath;
-        List list;
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
-        // create the document navigator
-        DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher,
-                namespacePrefixResolver, false, true);
-
-        xpath = new NodeServiceXPath("//element(*, *)".replaceAll(
-                "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
-                documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(13, list.size());
-
-        xpath = new NodeServiceXPath("//element(jcr:root, *)".replaceAll(
-                "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
-                documentNavigator, null);
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-        QueryParameterDefImpl paramDef;
-
-        paramDef = new QueryParameterDefImpl(QName.createQName("test:type", namespacePrefixResolver), dictionaryService
-                .getDataType(DataTypeDefinition.QNAME), true, BaseNodeServiceTest.TYPE_QNAME_TEST_CONTENT
-                .toPrefixString(namespacePrefixResolver));
-        xpath = new NodeServiceXPath("//element(*, test:content)".replaceAll(
-                "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
-                documentNavigator, new QueryParameterDefinition[] { paramDef });
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(3, list.size());
-
-        paramDef = new QueryParameterDefImpl(QName.createQName("test:type", namespacePrefixResolver), dictionaryService
-                .getDataType(DataTypeDefinition.QNAME), true, BaseNodeServiceTest.TYPE_QNAME_TEST_CONTENT
-                .toPrefixString(namespacePrefixResolver));
-        xpath = new NodeServiceXPath("//element(test:n6_p_n8, test:content)".replaceAll(
-                "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"),
-                documentNavigator, new QueryParameterDefinition[] { paramDef });
-        list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef));
-        assertEquals(1, list.size());
-
-    }
-
-    public void testJCRLike() throws Exception
-    {
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
-        // create the document navigator
-        // DocumentNavigator documentNavigator = new DocumentNavigator(
-        // dictionaryService,
-        // nodeService,
-        // searcher,
-        // namespacePrefixResolver,
-        // false, true);
-
-        List<NodeRef> answer = searcher.selectNodes(rootNodeRef, "//*[jcr:like(@test:animal, 'm__k%')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-    }
-
-    public void testJCRScore() throws Exception
-    {
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
-        // create the document navigator
-        // DocumentNavigator documentNavigator = new DocumentNavigator(
-        // dictionaryService,
-        // nodeService,
-        // searcher,
-        // namespacePrefixResolver,
-        // false, true);
-
-        List<NodeRef> answer;
-
-        answer = searcher.selectNodes(rootNodeRef, "//.", null, namespacePrefixResolver, false);
-        assertEquals(9, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//.[jcr:score() = 1.0]", null, namespacePrefixResolver, false);
-        assertEquals(9, answer.size());
-    }
-
-    public void testJCRContains() throws Exception
-    {
-        BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef);
-        // commit the node graph
-        txn.commit();
-
-        txn = transactionService.getUserTransaction();
-        txn.begin();
-
-        DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null);
-        namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0");
-        namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE);
-        // create the document navigator
-        // DocumentNavigator documentNavigator = new DocumentNavigator(
-        // dictionaryService,
-        // nodeService,
-        // searcher,
-        // namespacePrefixResolver,
-        // false, true);
-
-        List<NodeRef> answer;
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(0, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun cake')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun')]", null, namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher
-                .selectNodes(rootNodeRef, "//*[jcr:contains(., 'cake')]", null, namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'biscuit')]", null, namespacePrefixResolver,
-                false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun cake')]", null, namespacePrefixResolver,
-                false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-        answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun  cake biscuit')]", null,
-                namespacePrefixResolver, false);
-        assertEquals(1, answer.size());
-
-    }
-
     public static void main(String[] args)
     {
         String escape = "\\\t\n\"";

source/test-resources/org/alfresco/jcr/test/docview.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testdata 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: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:jcrtest="http://www.alfresco.org/test/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="" jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="36110c2e-68bf-11da-98b9-375bcb5cbca6" jcrtest:booleanProp="true" jcrtest:doubleProp="3.141592653589793" sys:node-uuid="36110c2e-68bf-11da-98b9-375bcb5cbca6" jcrtest:dateProp="2005-09-16T19:20:05.034+01:00" jcrtest:longProp="90834953485278298" jcrtest:nameProp="jcrtest:test" sys:store-protocol="workspace" cm:name="36110c2e-68bf-11da-98b9-375bcb5cbca6" jcrtest:stringProp="2005-09-16T20:20:05.555+01:00" sys:store-identifier="test">
-  <firstChild jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="36137d2f-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" sys:node-uuid="36137d2f-68bf-11da-98b9-375bcb5cbca6" cm:name="36137d2f-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></firstChild>
-  <sameNameTests jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="36137d30-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" sys:node-uuid="36137d30-68bf-11da-98b9-375bcb5cbca6" cm:name="36137d30-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test">
-    <sameNameSibling jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3615c721-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" sys:node-uuid="3615c721-68bf-11da-98b9-375bcb5cbca6" cm:name="3615c721-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></sameNameSibling>
-    <sameNameSibling jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3615c722-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" sys:node-uuid="3615c722-68bf-11da-98b9-375bcb5cbca6" cm:name="3615c722-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></sameNameSibling>
-  </sameNameTests>
-  <multiValued jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="36183823-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" cm:name="36183823-68bf-11da-98b9-375bcb5cbca6" jcrtest:multiProp="value_x0020_one value_x0020_two value_x0020_three" sys:node-uuid="36183823-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></multiValued>
-  <contentValue jcr:primaryType="cm:content" jcr:mixinTypes="cm:auditable sys:referenceable mix:referenceable" jcr:uuid="36183824-68bf-11da-98b9-375bcb5cbca6" cm:modifier="System" cm:modified="2005-12-09T14:22:21.676Z" sys:node-uuid="36183824-68bf-11da-98b9-375bcb5cbca6" cm:creator="System" sys:store-protocol="workspace" cm:content="dHJ1ZQ==" cm:name="Test_x0020_Content" sys:store-identifier="test" cm:created="2005-12-09T14:22:21.660Z"></contentValue>
-  <query jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="361f6416-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" sys:node-uuid="361f6416-68bf-11da-98b9-375bcb5cbca6" cm:name="361f6416-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test">
-    <one jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3621ae07-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="a" cm:name="3621ae07-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="3621ae07-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></one>
-    <two jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3621ae08-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="c" cm:name="3621ae08-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="3621ae08-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></two>
-    <three jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3621ae09-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="e" cm:name="3621ae09-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="3621ae09-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></three>
-    <four jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="36241f0a-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="g" cm:name="36241f0a-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="36241f0a-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></four>
-    <node1 jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="36241f0b-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="b" cm:name="36241f0b-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="36241f0b-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></node1>
-    <node1 jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3626900c-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="d" cm:name="3626900c-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="3626900c-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></node1>
-    <node1 jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3628d9fd-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="f" cm:name="3628d9fd-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="3628d9fd-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></node1>
-    <node1 jcr:primaryType="jcrtest:testtype" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="3628d9fe-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:prop1="h" cm:name="3628d9fe-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="3628d9fe-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test"></node1>
-    <document jcr:primaryType="jcrtest:testdoc" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="362b4aff-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:title="Doc_x0020_1" cm:name="362b4aff-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="362b4aff-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test">
-      <para-1-1 jcr:primaryType="jcrtest:testpara" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="362d94f0-68bf-11da-98b9-375bcb5cbca6" jcrtest:subtitle="P_x0020_1_x0020_1" sys:store-protocol="workspace" cm:name="362d94f0-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="362d94f0-68bf-11da-98b9-375bcb5cbca6" jcrtest:content="A_x0020_bit_x0020_of_x0020_wiffle" sys:store-identifier="test"></para-1-1>
-      <para-1-2 jcr:primaryType="jcrtest:testpara" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="362d94f1-68bf-11da-98b9-375bcb5cbca6" jcrtest:subtitle="P_x0020_1_x0020_2" sys:store-protocol="workspace" cm:name="362d94f1-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="362d94f1-68bf-11da-98b9-375bcb5cbca6" jcrtest:content="More_x0020_whitterings" sys:store-identifier="test"></para-1-2>
-      <para-1-3 jcr:primaryType="jcrtest:testpara" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="362d94f2-68bf-11da-98b9-375bcb5cbca6" jcrtest:subtitle="P_x0020_1_x0020_3" sys:store-protocol="workspace" cm:name="362d94f2-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="362d94f2-68bf-11da-98b9-375bcb5cbca6" jcrtest:content="Carrot,_x0020_spud,_x0020_turnip_x0020_and_x0020_leek." sys:store-identifier="test"></para-1-3>
-    </document>
-    <document-2 jcr:primaryType="jcrtest:testdoc" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="363005f3-68bf-11da-98b9-375bcb5cbca6" sys:store-protocol="workspace" jcrtest:title="Doc_x0020_2" cm:name="363005f3-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="363005f3-68bf-11da-98b9-375bcb5cbca6" sys:store-identifier="test">
-      <para-2-1 jcr:primaryType="jcrtest:testpara" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="363005f4-68bf-11da-98b9-375bcb5cbca6" jcrtest:subtitle="P_x0020_2_x0020_1" sys:store-protocol="workspace" cm:name="363005f4-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="363005f4-68bf-11da-98b9-375bcb5cbca6" jcrtest:content="tiger,_x0020_lion" sys:store-identifier="test"></para-2-1>
-      <para-2-2 jcr:primaryType="jcrtest:testpara" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="363276f5-68bf-11da-98b9-375bcb5cbca6" jcrtest:subtitle="P_x0020_2_x0020_2" sys:store-protocol="workspace" cm:name="363276f5-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="363276f5-68bf-11da-98b9-375bcb5cbca6" jcrtest:content="biscuit,_x0020_bun,_x0020_cake" sys:store-identifier="test"></para-2-2>
-      <para-2-3 jcr:primaryType="jcrtest:testpara" jcr:mixinTypes="sys:referenceable mix:referenceable" jcr:uuid="363276f6-68bf-11da-98b9-375bcb5cbca6" jcrtest:subtitle="P_x0020_2_x0020_3" sys:store-protocol="workspace" cm:name="363276f6-68bf-11da-98b9-375bcb5cbca6" sys:node-uuid="363276f6-68bf-11da-98b9-375bcb5cbca6" jcrtest:content="penguin,_x0020_hawk,_x0020_dove" sys:store-identifier="test"></para-2-3>
-    </document-2>
-  </query>
-</testdata>

source/test-resources/org/alfresco/jcr/test/myModel.xml

@@ -1,71 +0,0 @@
-<model name="my:mytestmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-   
-   <description>My test model</description>
-   <version>1.0</version>
-   
-   <imports>
-      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
-      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
-   </imports>
-   
-   <namespaces>
-      <namespace uri="http://www.alfresco.org/model/my/1.0" prefix="my"/>
-   </namespaces>
-   
-   <types>
-        
-	    <type name="my:a">
-			<title>A</title>
-			<parent>cm:folder</parent>
-			<associations>
-				<child-association name="my:b">
-				<target>
-					<class>my:b</class>
-					<mandatory>false</mandatory>
-					<many>false</many>
-				</target>
-				</child-association>
-			</associations>
-			<mandatory-aspects>
-				<aspect>my:baseAspect</aspect>
-			</mandatory-aspects>
-		</type>
-        
-		<type name="my:b">
-			<title>B</title>
-			<parent>cm:folder</parent>
-			<mandatory-aspects>
-				<aspect>my:baseAspect</aspect>
-			</mandatory-aspects>
-		</type>
-		
-	    <type name="my:c">
-	 	    <title>C</title>
-		    <parent>cm:folder</parent>
-			<associations>
-		    	<child-association name="my:c">
-   			    	<source>
-   						<mandatory>false</mandatory>
-   						<many>true</many>
-   					</source>
-   					<target>
-   						<class>sys:base</class>
-   						<mandatory>false</mandatory>
-   						<many>true</many>
-   					</target>
-   					<duplicate>false</duplicate>
-   				</child-association>
-			</associations>
-		</type>
-		
-   </types>
-   
-   <aspects>
-      
-      <aspect name="my:baseAspect">
-         <title>Base Aspect</title>
-      </aspect>
-      
-   </aspects>
-   
-</model>

source/test-resources/org/alfresco/jcr/test/sysview.xml

@@ -1,682 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node 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: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:jcrtest="http://www.alfresco.org/test/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="" sv:name="testdata">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>jcrtest:testtype</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>sys:referenceable</sv:value>
-    <sv:value>mix:referenceable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>36110c2e-68bf-11da-98b9-375bcb5cbca6</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcrtest:booleanProp" sv:type="Boolean">
-    <sv:value>true</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcrtest:doubleProp" sv:type="Double">
-    <sv:value>3.141592653589793</sv:value>
-  </sv:property>
-  <sv:property sv:name="sys:node-uuid" sv:type="String">
-    <sv:value>36110c2e-68bf-11da-98b9-375bcb5cbca6</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcrtest:dateProp" sv:type="Date">
-    <sv:value>2005-09-16T19:20:05.034+01:00</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcrtest:longProp" sv:type="Long">
-    <sv:value>90834953485278298</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcrtest:nameProp" sv:type="Name">
-    <sv:value>jcrtest:test</sv:value>
-  </sv:property>
-  <sv:property sv:name="sys:store-protocol" sv:type="String">
-    <sv:value>workspace</sv:value>
-  </sv:property>
-  <sv:property sv:name="cm:name" sv:type="String">
-    <sv:value>36110c2e-68bf-11da-98b9-375bcb5cbca6</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcrtest:stringProp" sv:type="String">
-    <sv:value>2005-09-16T20:20:05.555+01:00</sv:value>
-  </sv:property>
-  <sv:property sv:name="sys:store-identifier" sv:type="String">
-    <sv:value>test</sv:value>
-  </sv:property>
-  <sv:node sv:name="firstChild">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>jcrtest:testtype</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>sys:referenceable</sv:value>
-      <sv:value>mix:referenceable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>36137d2f-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-protocol" sv:type="String">
-      <sv:value>workspace</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:node-uuid" sv:type="String">
-      <sv:value>36137d2f-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:name" sv:type="String">
-      <sv:value>36137d2f-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-identifier" sv:type="String">
-      <sv:value>test</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="sameNameTests">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>jcrtest:testtype</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>sys:referenceable</sv:value>
-      <sv:value>mix:referenceable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>36137d30-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-protocol" sv:type="String">
-      <sv:value>workspace</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:node-uuid" sv:type="String">
-      <sv:value>36137d30-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:name" sv:type="String">
-      <sv:value>36137d30-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-identifier" sv:type="String">
-      <sv:value>test</sv:value>
-    </sv:property>
-    <sv:node sv:name="sameNameSibling">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3615c721-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3615c721-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3615c721-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="sameNameSibling">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3615c722-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3615c722-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3615c722-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-  </sv:node>
-  <sv:node sv:name="multiValued">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>jcrtest:testtype</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>sys:referenceable</sv:value>
-      <sv:value>mix:referenceable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>36183823-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-protocol" sv:type="String">
-      <sv:value>workspace</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:name" sv:type="String">
-      <sv:value>36183823-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcrtest:multiProp" sv:type="String">
-      <sv:value>value one</sv:value>
-      <sv:value>value two</sv:value>
-      <sv:value>value three</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:node-uuid" sv:type="String">
-      <sv:value>36183823-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-identifier" sv:type="String">
-      <sv:value>test</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="contentValue">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>cm:content</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>cm:auditable</sv:value>
-      <sv:value>sys:referenceable</sv:value>
-      <sv:value>mix:referenceable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>36183824-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:modifier" sv:type="String">
-      <sv:value>System</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:modified" sv:type="Date">
-      <sv:value>2005-12-09T14:22:21.676Z</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:node-uuid" sv:type="String">
-      <sv:value>36183824-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:creator" sv:type="String">
-      <sv:value>System</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-protocol" sv:type="String">
-      <sv:value>workspace</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:content" sv:type="Binary">
-      <sv:value>dHJ1ZQ==</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:name" sv:type="String">
-      <sv:value>Test Content</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-identifier" sv:type="String">
-      <sv:value>test</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:created" sv:type="Date">
-      <sv:value>2005-12-09T14:22:21.660Z</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="query">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>jcrtest:testtype</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-      <sv:value>sys:referenceable</sv:value>
-      <sv:value>mix:referenceable</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:uuid" sv:type="String">
-      <sv:value>361f6416-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-protocol" sv:type="String">
-      <sv:value>workspace</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:node-uuid" sv:type="String">
-      <sv:value>361f6416-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="cm:name" sv:type="String">
-      <sv:value>361f6416-68bf-11da-98b9-375bcb5cbca6</sv:value>
-    </sv:property>
-    <sv:property sv:name="sys:store-identifier" sv:type="String">
-      <sv:value>test</sv:value>
-    </sv:property>
-    <sv:node sv:name="one">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3621ae07-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>a</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3621ae07-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3621ae07-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="two">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3621ae08-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>c</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3621ae08-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3621ae08-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="three">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3621ae09-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>e</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3621ae09-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3621ae09-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="four">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>36241f0a-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>g</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>36241f0a-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>36241f0a-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="node1">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>36241f0b-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>b</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>36241f0b-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>36241f0b-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="node1">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3626900c-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>d</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3626900c-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3626900c-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="node1">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3628d9fd-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>f</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3628d9fd-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3628d9fd-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="node1">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testtype</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>3628d9fe-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:prop1" sv:type="String">
-        <sv:value>h</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>3628d9fe-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>3628d9fe-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="document">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testdoc</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>362b4aff-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:title" sv:type="String">
-        <sv:value>Doc 1</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>362b4aff-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>362b4aff-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-      <sv:node sv:name="para-1-1">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>jcrtest:testpara</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>sys:referenceable</sv:value>
-          <sv:value>mix:referenceable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>362d94f0-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:subtitle" sv:type="String">
-          <sv:value>P 1 1</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-protocol" sv:type="String">
-          <sv:value>workspace</sv:value>
-        </sv:property>
-        <sv:property sv:name="cm:name" sv:type="String">
-          <sv:value>362d94f0-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:node-uuid" sv:type="String">
-          <sv:value>362d94f0-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:content" sv:type="String">
-          <sv:value>A bit of wiffle</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-identifier" sv:type="String">
-          <sv:value>test</sv:value>
-        </sv:property>
-      </sv:node>
-      <sv:node sv:name="para-1-2">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>jcrtest:testpara</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>sys:referenceable</sv:value>
-          <sv:value>mix:referenceable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>362d94f1-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:subtitle" sv:type="String">
-          <sv:value>P 1 2</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-protocol" sv:type="String">
-          <sv:value>workspace</sv:value>
-        </sv:property>
-        <sv:property sv:name="cm:name" sv:type="String">
-          <sv:value>362d94f1-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:node-uuid" sv:type="String">
-          <sv:value>362d94f1-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:content" sv:type="String">
-          <sv:value>More whitterings</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-identifier" sv:type="String">
-          <sv:value>test</sv:value>
-        </sv:property>
-      </sv:node>
-      <sv:node sv:name="para-1-3">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>jcrtest:testpara</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>sys:referenceable</sv:value>
-          <sv:value>mix:referenceable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>362d94f2-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:subtitle" sv:type="String">
-          <sv:value>P 1 3</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-protocol" sv:type="String">
-          <sv:value>workspace</sv:value>
-        </sv:property>
-        <sv:property sv:name="cm:name" sv:type="String">
-          <sv:value>362d94f2-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:node-uuid" sv:type="String">
-          <sv:value>362d94f2-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:content" sv:type="String">
-          <sv:value>Carrot, spud, turnip and leek.</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-identifier" sv:type="String">
-          <sv:value>test</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
-    <sv:node sv:name="document-2">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>jcrtest:testdoc</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-        <sv:value>sys:referenceable</sv:value>
-        <sv:value>mix:referenceable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>363005f3-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-protocol" sv:type="String">
-        <sv:value>workspace</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcrtest:title" sv:type="String">
-        <sv:value>Doc 2</sv:value>
-      </sv:property>
-      <sv:property sv:name="cm:name" sv:type="String">
-        <sv:value>363005f3-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:node-uuid" sv:type="String">
-        <sv:value>363005f3-68bf-11da-98b9-375bcb5cbca6</sv:value>
-      </sv:property>
-      <sv:property sv:name="sys:store-identifier" sv:type="String">
-        <sv:value>test</sv:value>
-      </sv:property>
-      <sv:node sv:name="para-2-1">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>jcrtest:testpara</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>sys:referenceable</sv:value>
-          <sv:value>mix:referenceable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>363005f4-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:subtitle" sv:type="String">
-          <sv:value>P 2 1</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-protocol" sv:type="String">
-          <sv:value>workspace</sv:value>
-        </sv:property>
-        <sv:property sv:name="cm:name" sv:type="String">
-          <sv:value>363005f4-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:node-uuid" sv:type="String">
-          <sv:value>363005f4-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:content" sv:type="String">
-          <sv:value>tiger, lion</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-identifier" sv:type="String">
-          <sv:value>test</sv:value>
-        </sv:property>
-      </sv:node>
-      <sv:node sv:name="para-2-2">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>jcrtest:testpara</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>sys:referenceable</sv:value>
-          <sv:value>mix:referenceable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>363276f5-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:subtitle" sv:type="String">
-          <sv:value>P 2 2</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-protocol" sv:type="String">
-          <sv:value>workspace</sv:value>
-        </sv:property>
-        <sv:property sv:name="cm:name" sv:type="String">
-          <sv:value>363276f5-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:node-uuid" sv:type="String">
-          <sv:value>363276f5-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:content" sv:type="String">
-          <sv:value>biscuit, bun, cake</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-identifier" sv:type="String">
-          <sv:value>test</sv:value>
-        </sv:property>
-      </sv:node>
-      <sv:node sv:name="para-2-3">
-        <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>jcrtest:testpara</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-          <sv:value>sys:referenceable</sv:value>
-          <sv:value>mix:referenceable</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcr:uuid" sv:type="String">
-          <sv:value>363276f6-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:subtitle" sv:type="String">
-          <sv:value>P 2 3</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-protocol" sv:type="String">
-          <sv:value>workspace</sv:value>
-        </sv:property>
-        <sv:property sv:name="cm:name" sv:type="String">
-          <sv:value>363276f6-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:node-uuid" sv:type="String">
-          <sv:value>363276f6-68bf-11da-98b9-375bcb5cbca6</sv:value>
-        </sv:property>
-        <sv:property sv:name="jcrtest:content" sv:type="String">
-          <sv:value>penguin, hawk, dove</sv:value>
-        </sv:property>
-        <sv:property sv:name="sys:store-identifier" sv:type="String">
-          <sv:value>test</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
-  </sv:node>
-</sv:node>

source/test-resources/org/alfresco/jcr/test/test-context.xml

@@ -1,18 +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>
-
-    <import resource="classpath:alfresco/application-context.xml" />
-
-    <bean id="testDictionaryBootstrap" class="org.alfresco.repo.dictionary.DictionaryBootstrap" init-method="bootstrap" depends-on="JCR.DictionaryBootstrap">
-        <property name="dictionaryDAO"><ref bean="dictionaryDAO"/></property>
-        <property name="models">
-            <list>
-                <value>org/alfresco/jcr/test/testModel.xml</value>
-                <value>org/alfresco/jcr/test/myModel.xml</value>
-            </list>
-        </property>
-    </bean>
-    
-</beans>

source/test-resources/org/alfresco/jcr/test/testContent.txt

@@ -1 +0,0 @@
-true

source/test-resources/org/alfresco/jcr/test/testData.xml

@@ -1,111 +0,0 @@
-<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
-           xmlns:jcrtest="http://www.alfresco.org/test/jcr/1.0"
-           xmlns:cm="http://www.alfresco.org/model/content/1.0">
-
-    <jcrtest:testtype view:childName="testroot">
-    </jcrtest:testtype>
-
-	<jcrtest:testtype view:childName="testdata">
-	   <!-- Properties for XXXPropertyTests -->
-	   <jcrtest:booleanProp>true</jcrtest:booleanProp>
-	   <jcrtest:dateProp>2005-09-16T18:20:05.034Z</jcrtest:dateProp>
-	   <jcrtest:doubleProp>3.141592653589793</jcrtest:doubleProp>
-	   <jcrtest:longProp>90834953485278298</jcrtest:longProp>
-	   <jcrtest:nameProp>{http://www.alfresco.org/test/jcr/1.0}test</jcrtest:nameProp>
-	   <jcrtest:stringProp>2005-09-16T20:20:05.555+01:00</jcrtest:stringProp>
-
-       <jcrtest:children>
-          <jcrtest:testtype view:childName="firstChild"/>
-
-          <!-- Same name sibling tests -->
-          <jcrtest:testtype view:childName="sameNameTests">
-             <jcrtest:children>
-                <jcrtest:testtype view:childName="sameNameSibling"/>
-                <jcrtest:testtype view:childName="sameNameSibling"/>
-             </jcrtest:children>
-          </jcrtest:testtype>
-
-          <!-- Multi-valued Property -->
-          <jcrtest:testtype view:childName="multiValued">
-               <jcrtest:multiProp>
-                  <view:value>value one</view:value>
-                  <view:value>value two</view:value>
-                  <view:value>value three</view:value>
-               </jcrtest:multiProp>
-          </jcrtest:testtype>	   
-
-          <!-- Some Content -->
-          <cm:content view:childName="contentValue">
-			<cm:name>Test Content</cm:name>
-			<cm:content>contentUrl=org/alfresco/jcr/test/testContent.txt|mimetype=text/plain|size=|encoding=UTF-8</cm:content>
-          </cm:content>
-          
-          <!-- Query -->
-          
-          <jcrtest:testtype view:childName="query">
-             <jcrtest:children>
-                <jcrtest:testtype view:childName="one">
-                    <jcrtest:prop1>a</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="two">
-                    <jcrtest:prop1>c</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="three">
-                    <jcrtest:prop1>e</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="four">
-                    <jcrtest:prop1>g</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="node1">
-                    <jcrtest:prop1>b</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="node1">
-                    <jcrtest:prop1>d</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="node1">
-                    <jcrtest:prop1>f</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testtype view:childName="node1">
-                    <jcrtest:prop1>h</jcrtest:prop1>
-                </jcrtest:testtype>
-                <jcrtest:testdoc view:childName="document">
-                    <jcrtest:title>Doc 1</jcrtest:title>
-                    <jcrtest:children>
-                        <jcrtest:testpara view:childName="para-1-1">
-                            <jcrtest:subtitle>P 1 1</jcrtest:subtitle>
-                            <jcrtest:content>A bit of wiffle</jcrtest:content>
-                        </jcrtest:testpara>
-                        <jcrtest:testpara view:childName="para-1-2">
-                            <jcrtest:subtitle>P 1 2</jcrtest:subtitle>
-                            <jcrtest:content>More whitterings</jcrtest:content>
-                        </jcrtest:testpara>
-                        <jcrtest:testpara view:childName="para-1-3">
-                            <jcrtest:subtitle>P 1 3</jcrtest:subtitle>
-                            <jcrtest:content>Carrot, spud, turnip and leek.</jcrtest:content>
-                        </jcrtest:testpara>
-                    </jcrtest:children>
-                </jcrtest:testdoc>
-                <jcrtest:testdoc view:childName="document-2">
-                    <jcrtest:title>Doc 2</jcrtest:title>
-                    <jcrtest:children>
-                        <jcrtest:testpara view:childName="para-2-1">
-                            <jcrtest:subtitle>P 2 1</jcrtest:subtitle>
-                            <jcrtest:content>tiger, lion</jcrtest:content>
-                        </jcrtest:testpara>
-                        <jcrtest:testpara view:childName="para-2-2">
-                            <jcrtest:subtitle>P 2 2</jcrtest:subtitle>
-                            <jcrtest:content>biscuit, bun, cake</jcrtest:content>
-                        </jcrtest:testpara>
-                        <jcrtest:testpara view:childName="para-2-3">
-                            <jcrtest:subtitle>P 2 3</jcrtest:subtitle>
-                            <jcrtest:content>penguin, hawk, dove</jcrtest:content>
-                        </jcrtest:testpara>
-                    </jcrtest:children>
-                </jcrtest:testdoc>
-             </jcrtest:children>
-          </jcrtest:testtype>
-          
-       </jcrtest:children>
-	</jcrtest:testtype>
-
-</view:view>

source/test-resources/org/alfresco/jcr/test/testModel.xml

@@ -1,152 +0,0 @@
-<model name="jcrtest:jcrtestmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-   <description>JCR Test Model Definitions</description>
-   <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="" prefix=""/>
-   </imports>
-   
-   <namespaces>
-      <namespace uri="http://www.alfresco.org/test/jcr/1.0" prefix="jcrtest"/>
-   </namespaces>
-
-   <types>
-      <type name="jcrtest:basetesttype">
-         <title>Base Test Type</title>
-         <parent>sys:base</parent>
-         <associations>
-            <child-association name="jcrtest:children">
-               <target>
-                  <class>sys:base</class>
-               </target>
-            </child-association>
-         </associations>
-      </type>
-   
-      <type name="jcrtest:testtype">
-         <title>Test Type</title>
-         <parent>jcrtest:basetesttype</parent>
-         <properties>
-            <property name="jcrtest:booleanProp">
-               <type>d:boolean</type>
-            </property>
-            <property name="jcrtest:dateProp">
-               <type>d:date</type>
-            </property>
-            <property name="jcrtest:doubleProp">
-               <type>d:double</type>
-            </property>
-            <property name="jcrtest:longProp">
-               <type>d:long</type>
-            </property>
-            <property name="jcrtest:nameProp">
-               <type>d:qname</type>
-            </property>
-            <property name="jcrtest:stringProp">
-               <type>d:text</type>
-            </property>
-            <property name="jcrtest:multiProp">
-               <type>d:text</type>
-               <multiple>true</multiple>
-            </property>
-             <property name="jcrtest:prop1">
-               <type>d:text</type>
-            </property>
-         </properties>
-      </type>
-      
-      <type name="jcrtest:testdoc">
-         <title>Test Doc Type</title>
-         <parent>jcrtest:basetesttype</parent>
-         <properties>
-            <property name="jcrtest:title">
-               <type>d:text</type>
-            </property>
-         </properties>
-      </type>
-      
-      <type name="jcrtest:testpara">
-         <title>Test Doc Type</title>
-         <parent>sys:base</parent>
-         <properties>
-            <property name="jcrtest:subtitle">
-               <type>d:text</type>
-            </property>
-            <property name="jcrtest:content">
-               <type>d:text</type>
-            </property>
-         </properties>
-      </type>
-
-      <type name="jcrtest:testsetprop">
-         <title>Test Set Properties</title>
-         <parent>jcrtest:basetesttype</parent>
-         <properties>
-            <property name="jcrtest:setBoolean">
-               <type>d:boolean</type>
-            </property>
-            <property name="jcrtest:setMultiBoolean">
-               <type>d:boolean</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setDate">
-               <type>d:date</type>
-            </property>
-            <property name="jcrtest:setMultiDate">
-               <type>d:date</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setDouble">
-               <type>d:double</type>
-            </property>
-            <property name="jcrtest:setMultiDouble">
-               <type>d:double</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setLong">
-               <type>d:long</type>
-            </property>
-            <property name="jcrtest:setMultiLong">
-               <type>d:long</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setName">
-               <type>d:qname</type>
-            </property>
-            <property name="jcrtest:setMultiName">
-               <type>d:qname</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setString">
-               <type>d:text</type>
-            </property>
-            <property name="jcrtest:setMultiString">
-               <type>d:text</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setContent">
-               <type>d:content</type>
-            </property>
-            <property name="jcrtest:setNodeRef">
-               <type>d:noderef</type>
-            </property>
-            <property name="jcrtest:setMultiNodeRef">
-               <type>d:noderef</type>
-               <multiple>true</multiple>
-            </property>
-            <property name="jcrtest:setAny">
-               <type>d:any</type>
-            </property>
-            <property name="jcrtest:setMultipleAny">
-               <type>d:any</type>
-               <multiple>true</multiple>
-            </property>
-         </properties>
-      </type>
-      
-   </types>
-   
-</model>