inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
18023: RM: groundwork for custom metadata delete
    18071: MT - fix ETHREEOH-3730 (reject invitation shows "Invitation not found" instead of Yes / No options)
    18078: MT - fix ETHREEOH-3892 (it is not possible to create or manage any Tenants once the DOD5015 RM AMP is installed)
    18903: RM Caveats - fix ALF-1894 (improvement for ESC - remove hardcoded "rmc" model/namespace)
    19046: Improve dictionary debug logging (ALF-587)
    19096: Merging PATCHES/V3.2.r to V3.2
        19075: Merging DEV/BELARUS/V3.2-2010_02_24 to PATCHES/V3.2.r
            18881: ALF-587: MT Upgrades to 3.2r fail unable to find Alfresco content types
        19085: ALF-587 - test/build fix (follow on for r18881->r19075)
    19145: Dynamic Models - follow-on for ALF-587 (& ALFCOM-2977) + additional unit tests
    19176: Remove Java 6'ism
    19198: Build/test fix (follow-on to r19145 - do not validate model delete of version nodes)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-12 17:06:36 +00:00
parent e96af8d097
commit 8f0ad2d96f
17 changed files with 1703 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/dictionary/M2ModelDiff.java
View File

@@ -41,6 +41,7 @@ public class M2ModelDiff
public static final String TYPE_DEFAULT_ASPECT = "DEFAULT_ASPECT";
public static final String TYPE_PROPERTY = "PROPERTY";
public static final String TYPE_ASSOCIATION = "ASSOCIATION";
public static final String TYPE_CONSTRAINT = "TYPE_CONSTRAINT";
private QName elementName;
private String elementType;
@@ -53,11 +54,13 @@ public class M2ModelDiff
ParameterCheck.mandatoryString("elementType", elementType);
ParameterCheck.mandatoryString("diffType", diffType);
if ((!elementType.equals(TYPE_TYPE)) &&
(!elementType.equals(TYPE_ASPECT)) &&
(!elementType.equals(TYPE_DEFAULT_ASPECT)) &&
if ((!elementType.equals(TYPE_TYPE)) &&
(!elementType.equals(TYPE_ASPECT)) &&
(!elementType.equals(TYPE_DEFAULT_ASPECT)) &&
(!elementType.equals(TYPE_PROPERTY)) &&
(!elementType.equals(TYPE_ASSOCIATION)))
(!elementType.equals(TYPE_ASSOCIATION)) &&
(!elementType.equals(TYPE_CONSTRAINT))
)
{
throw new AlfrescoRuntimeException("Unknown element type = " + elementType);
}