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

config/alfresco/messages/dictionary-messages.properties

@@ -5,8 +5,8 @@ d_dictionary.model.err.type_not_found=Failed to create anonymous type as specifi
 d_dictionary.model.err.aspect_not_found=Failed to create anonymous type as specified aspect {0} not found
 
 d_dictionary.constraint.err.cyclic_ref=Constraint ''{0}'' is part of a cyclic reference of constraints
-d_dictionary.constraint.err.type_and_ref=Constraint ''{0}'' cannot have a ''type'' and be a ''reference'' attribute
-d_dictionary.constraint.err.type_or_ref=Constraint ''{0}'' cannot have a ''type'' and be a ''reference'' attribute
+d_dictionary.constraint.err.type_and_ref=Constraint ''{0}'' cannot have a 'type' and be a 'reference' attribute
+d_dictionary.constraint.err.type_or_ref=Constraint ''{0}'' cannot have a 'type' and be a 'reference' attribute
 d_dictionary.constraint.err.ref_not_found=Constraint reference ''{0}'' not found on constraint ''{1}''
 d_dictionary.constraint.err.anon_needs_property=Anonymous constraints can only be declared within the context of a property
 d_dictionary.constraint.err.invalid_type=Constraint type ''{0}'' on constraint ''{1}'' is not a well-known type or a valid Constraint implementation
@@ -26,16 +26,22 @@ d_dictionary.property.err.cannot_relax_mandatory_enforcement=Cannot relax mandat
 d_dictionary.constraint.regex.no_match=Value ''{0}'' does not match regular expression: {1}
 d_dictionary.constraint.regex.match=Value ''{0}'' matches regular expression: {1}
 
-d_dictionary.constraint.numeric_range.invalid_min_value=Invalid ''minValue'' property: {0}
-d_dictionary.constraint.numeric_range.invalid_max_value=Invalid ''maxValue'' property: {0}
+d_dictionary.constraint.numeric_range.invalid_min_value=Invalid 'minValue' property: {0}
+d_dictionary.constraint.numeric_range.invalid_max_value=Invalid 'maxValue' property: {0}
 d_dictionary.constraint.numeric_range.non_numeric=Property value could not be converted to a double: {0}
 d_dictionary.constraint.numeric_range.out_of_range=Numeric value ''{0}'' is not in range [{1}; {2}]
 
-d_dictionary.constraint.string_length.invalid_min_length=Invalid ''minLength'' property: {0}
-d_dictionary.constraint.string_length.invalid_max_length=Invalid ''maxLength'' property: {0}
+d_dictionary.constraint.string_length.invalid_min_length=Invalid 'minLength' property: {0}
+d_dictionary.constraint.string_length.invalid_max_length=Invalid 'maxLength' property: {0}
 d_dictionary.constraint.string_length.non_string=Property value could not be converted to a String: {0}
 d_dictionary.constraint.string_length.invalid_length=String length of ''{0}'' is not in range [{1}; {2}]
 
 d_dictionary.constraint.list_of_values.no_values=The list of allowed values is empty
 d_dictionary.constraint.list_of_values.non_string=Property value could not be converted to a String: {0}
 d_dictionary.constraint.list_of_values.invalid_value=The value is not an allowed value: {0}
+
+d_dictionary.constraint.user_name.invalid_user_name=The value ''{0}'' is not an allowed user name: it is an authority of type: {1}
+d_dictionary.constraint.user_name.non_string=Property value could not be converted to a String: {0}
+
+d_dictionary.constraint.authority_name.invalid_authority_name=The value ''{0}'' is not an allowed authority name: it is an authority of type: {1}
+d_dictionary.constraint.authority_name.non_string=Property value could not be converted to a String: {0}

config/alfresco/messages/patch-service.properties

@@ -137,7 +137,10 @@ patch.userAndPersonUserNamesAsIdentifiers.result=Reindexed user:user and cm:pers
 patch.contentFormFolderType.description=Update WCM Content Form folder type.
 patch.contentFormFolderType.result=Updated {0} WCM Content Form objects to 'wcm:formfolder' type.
 
-patch.webscripts.description=Adds Web Scripts to Data Dictionary.
-
 patch.groupNamesAsIdentifiers.description=Reindex usr:authorityContainer gids as identifiers
-patch.groupNamesAsIdentifiers.result=Reindex usr:authorityContainer gids as identifiers
+patch.groupNamesAsIdentifiers.result=Reindex usr:authorityContainer gids as identifiers
+
+patch.invalidUserPersonAndGroup.description=Fix up invalid uids for people and users; and invalid gids for groups
+patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}'' invalid person nodes and ''{2}'' invalid authority nodes.
+
+patch.webscripts.description=Adds Web Scripts to Data Dictionary.

config/alfresco/model/contentModel.xml

@@ -19,6 +19,7 @@
          <parameter name="expression"><value><![CDATA[(.*[\"\*\\\>\<\?\/\:\|\xA3\xAC\%\&\+\;]+.*)|(.*[\.]?.*[\.]+$)|(.*[ ]+$)]]></value></parameter>
          <parameter name="requiresMatch"><value>false</value></parameter>
       </constraint>
+	  <constraint name="cm:userNameConstraint" type="org.alfresco.repo.dictionary.constraint.UserNameConstraint" />
    </constraints>
    
    <types>
@@ -147,6 +148,9 @@
             <property name="cm:userName">
                <type>d:text</type>
                <mandatory>true</mandatory>
+			   <constraints>
+                  <constraint ref="cm:userNameConstraint" />
+               </constraints>
             </property>
             <property name="cm:homeFolder">
                <type>d:noderef</type>

config/alfresco/patch/patch-services-context.xml

@@ -684,6 +684,24 @@
             <ref bean="indexerAndSearcherFactory" />
         </property>
     </bean>
+	
+	<bean id="patch.invalidUserPersonAndGroup" class="org.alfresco.repo.admin.patch.impl.InvalidUserPersonAndGroupPatch" parent="basePatch" >
+        <property name="id"><value>patch.invalidUserPersonAndGroup</value></property>
+        <property name="description"><value>patch.invalidUserPersonAndGroup.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>39</value></property>
+        <property name="targetSchema"><value>40</value></property>
+        <!-- bootstrap view -->
+        <property name="userImporterBootstrap">
+            <ref bean="userBootstrap" />
+        </property>
+		<property name="spacesImporterBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+		<property name="dictionaryService">
+            <ref bean="dictionaryService" />
+        </property>
+    </bean>
 
     <bean id="patch.webscripts" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.webscripts</value></property>