Merged V2.2 to HEAD

8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
   8286: Merged V2.1 to V2.2
      8256: Fix broken WCM workflow.
      8257: Partial fix for AWC-1850
      8283: Merged V2.1-A to V2.1
         8264: Fine-grained debug logging for exceptions causing transaction retries.
   8288: Should fix workflow problems. Hard to test since almost nothing works right now.
   8291: Added Peter's fixes to improve deployment start scripts
   8294: Update deploy script from Peter
   8298: Fix for WCM-1058:
   8300: Commented out admin dashlet (active_tasks)
   8359: Fix AR-1735: Customer-requested POI upgrade
   8367: Fix for AWC-1639
   8368: Fix for WCM-1102
   8389: Revert changes between r8072 and r8251 from Schema2XForms.java
   8401: Fix for WCM-1105
   8407: Minor typo fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 17:23:01 +00:00
parent 163bb15d5e
commit 6edbb4c266
7 changed files with 42 additions and 7 deletions

View File

@@ -2804,6 +2804,10 @@ public class Schema2XForms implements Serializable
typeName);
}
final StringList lexicalPatterns = ((XSSimpleTypeDefinition)controlType).getLexicalPattern();
for (int i = 0; lexicalPatterns != null && i < lexicalPatterns.getLength(); i++)
{
constraints.add("chiba:match(., '" + lexicalPatterns.item(i) + "',null)");
}
}
final short constraintType =