From 6418bb6d2373b149538a56f6706227c80bab4649 Mon Sep 17 00:00:00 2001
From: Britt Park <britt.park@alfresco.com>
Date: Wed, 10 May 2006 14:46:54 +0000
Subject: [PATCH] Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/contentModel.xml                       | 4 ++--
 config/alfresco/model/jcrModel.xml                           | 2 ++
 .../alfresco/repo/dictionary/constraint/ConstraintsTest.java | 5 +++--
 3 files changed, 7 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/config/alfresco/model/jcrModel.xml b/config/alfresco/model/jcrModel.xml
index 5b72c7df61..b8075aad9c 100644
--- a/config/alfresco/model/jcrModel.xml
+++ b/config/alfresco/model/jcrModel.xml
@@ -5,6 +5,7 @@
 
    <imports>
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d" />
+      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys" />
    </imports>
 
    <namespaces>
@@ -18,6 +19,7 @@
    <types>
 
       <type name="nt:base">
+         <parent>sys:base</parent>
          <properties>
             <property name="jcr:primaryType">
                <type>d:qname</type>
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,