From 97a1987c3341427c04e778a4ac2838c5d26be99b Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Wed, 10 May 2006 13:49:29 +0000
Subject: [PATCH] - Re-enabled regular expression validation in JavaScript -
 Changed regular expression definition for the name property in content model

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/contentModel.xml                       | 4 ++--
 .../alfresco/repo/dictionary/constraint/ConstraintsTest.java | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index 8ae007bec4..025bed35a3 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -16,8 +16,8 @@
 
    <constraints>
       <constraint name="cm:filename" type="REGEX">
-         <parameter name="expression"><value><![CDATA[[^\"\*\\\>\<\?\/\:\|\¬\£\%\&\+\;]+]]></value></parameter>
-         <parameter name="requiresMatch"><value>true</value></parameter>
+         <parameter name="expression"><value><![CDATA[.*[\"\*\\\>\<\?\/\:\|\xA3\xAC\%\&\+\;]+.*]]></value></parameter>
+         <parameter name="requiresMatch"><value>false</value></parameter>
       </constraint>
    </constraints>
    
diff --git a/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java b/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java
index 7905dd077c..ec60f9c9a8 100644
--- a/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java
+++ b/source/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java
@@ -229,12 +229,12 @@ public class ConstraintsTest extends TestCase
     public void testRegexConstraintFilename() throws Exception
     {
         // we assume UTF-8
-        String expression = "[^\\\"\\*\\\\\\>\\<\\?\\/\\:\\|\\¬\\£\\%\\&\\+\\;]+";
+        String expression = ".*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|\\xA3\\xAC\\%\\&\\+\\;]+.*";
         String invalidChars = "\"*\\><?/:|£%&+;";
         
         RegexConstraint constraint = new RegexConstraint();
         constraint.setExpression(expression);
-        constraint.setRequiresMatch(true);
+        constraint.setRequiresMatch(false);
         constraint.initialize();
         
         // check that all the invalid chars cause failures
@@ -249,6 +249,7 @@ public class ConstraintsTest extends TestCase
         evaluate(constraint, "Company Home", false);
     }
     
+    
     private enum DummyEnum
     {
         ABC,