AR-166: Property constraints included in integrity checks

AR-194: Regular expression constraint applied to cm:name property to flag illegal characters
Other minor fixes
 - Dictionary bootstrap bean depends on I18N bean being constructed
 - RegexConstraint check can be inverted
 - Some I18N message fixes


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

config/alfresco/core-services-context.xml

@@ -400,7 +400,7 @@
     	<property name="dictionaryDAO"><ref local="dictionaryDAO"/></property>
     </bean>
     
-    <bean id="dictionaryBootstrap" parent="dictionaryModelBootstrap">
+    <bean id="dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="resourceBundles">
         <property name="models">
             <list>
                 <value>alfresco/model/dictionaryModel.xml</value>

config/alfresco/messages/dictionary-messages.properties

@@ -4,19 +4,21 @@ d_dictionary.model.err.no_model=Model ''{0}'' does not exist
 d_dictionary.model.err.type_not_found=Failed to create anonymous type as specified type {0} not found
 d_dictionary.model.err.aspect_not_found=Failed to create anonymous type as specified aspect {0} not found
 
-d_dictionary.model.err.cyclic_ref=Constraint ''{0}'' is part of a cyclic reference of constraints
-d_dictionary.model.err.type_and_ref=Constraint ''{0}'' cannot have a ''type'' and be a ''reference'' attribute
-d_dictionary.model.err.type_or_ref=Constraint ''{0}'' cannot have a ''type'' and be a ''reference'' attribute
-d_dictionary.model.err.ref_not_found=Constraint reference ''{0}'' not found on constraint ''{1}''
-d_dictionary.model.err.anon_needs_property=Anonymous constraints can only be declared within the context of a property
-d_dictionary.model.err.invalid_type=Constraint type ''{0}'' on constraint ''{1}'' is not a well-known type or a valid Constraint implementation
-d_dictionary.model.err.construct_failure=Failed to construct an instance of type ''{0}'' for constraint ''{1}''
-d_dictionary.model.err.property_not_set=Property ''{0}'' has not been set on constraint ''{1}''
-d_dictionary.model.err.evaluate_exception=Exception during evaluation of constraint ''{0}'': {1}
+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.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
+d_dictionary.constraint.err.construct_failure=Failed to construct an instance of type ''{0}'' for constraint ''{1}''
+d_dictionary.constraint.err.property_mismatch=Property mismatch setting property ''{0}'' on constraint ''{1}''
+d_dictionary.constraint.err.property_not_set=Property ''{0}'' has not been set on constraint ''{1}''
+d_dictionary.constraint.err.evaluate_exception=Exception during evaluation of constraint ''{0}'': {1}
 
 d_dictionary.property.err.property_type_not_specified=Property type of property ''{0}'' must be specified
 d_dictionary.property.err.property_type_not_found=Property type ''{0}'' of property ''{1}'' is not found
 d_dictionary.property.err.single_valued_content=Content properties must be single-valued
 d_dictionary.property.err.duplicate_constraint_on_property=Found duplicate constraint definition ''{0}'' within property ''{1}''
 
-d_dictionary.constraint.regex.no_match=Value ''{0}'' does not match regular expression: {1}
+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}

config/alfresco/model/contentModel.xml

@@ -14,6 +14,12 @@
       <namespace uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
    </namespaces>
 
+   <constraints>
+      <constraint name="cm:filename" type="REGEX">
+         <parameter name="expression"><![CDATA[[^\"\*\\\>\<\?\/\:\|\¬\£\%\&\+\;]+]]></parameter>
+         <parameter name="requiresMatch">true</parameter>
+      </constraint>
+   </constraints>
    
    <types>
    
@@ -25,6 +31,9 @@
                <title>Name</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
+               <constraints>
+                  <constraint ref="cm:filename" />
+               </constraints>
             </property>
          </properties>
          <mandatory-aspects>