Merged V2.0 to HEAD

5457: Merge error on copy web project action
   5459: AR-1278
   5461:
   5462: A few deployment fixes
   5469: Dictionary messages
   5470: L2 cache checks
   5478: WCM-374


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

source/java/org/alfresco/repo/security/authentication/userModel.xml

@@ -14,6 +14,10 @@
       <namespace uri="http://www.alfresco.org/model/user/1.0" prefix="usr"/>
    </namespaces>
 
+	<constraints>
+	  <constraint name="usr:userNameConstraint" type="org.alfresco.repo.dictionary.constraint.UserNameConstraint" />
+      <constraint name="usr:authorityNameConstraint" type="org.alfresco.repo.dictionary.constraint.AuthorityNameConstraint" />
+   </constraints>
    
    <types>
       
@@ -30,6 +34,9 @@
 			<!-- This is so you can not break person lookup -->
             <property name="usr:username">
                <type>d:text</type>
+			   <constraints>
+                  <constraint ref="usr:userNameConstraint" />
+               </constraints>
             </property>
             <property name="usr:password">
                <type>d:text</type>
@@ -66,6 +73,9 @@
 			<!-- This is so you can not break group lookup -->
             <property name="usr:authorityName">
                <type>d:text</type>
+			   <constraints>
+                  <constraint ref="usr:authorityNameConstraint" />
+               </constraints>
             </property>
             <property name="usr:members">
                <type>d:text</type>