Merged up to HEAD.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/dictionary/M2PropertyOverride.java

@@ -16,6 +16,8 @@
  */
 package org.alfresco.repo.dictionary;
 
+import java.util.List;
+
 
 /**
  * Property override definition
@@ -29,7 +31,7 @@ public class M2PropertyOverride
     private Boolean isMandatory;
     private boolean isMandatoryEnforced = false;
     private String defaultValue;
-    
+    private List<M2Constraint> constraints;
     
     /*package*/ M2PropertyOverride()
     {
@@ -74,5 +76,9 @@ public class M2PropertyOverride
     {
         this.defaultValue = defaultValue;
     }
-    
+
+    public List<M2Constraint> getConstraints()
+    {
+        return constraints;
+    }    
 }