mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Morning merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -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>
|
||||
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user