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 V4.1-BUG-FIX to HEAD

Browse Source 
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
   43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
   44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
         - NPE when there is no exception message
   44046: MERGE DEV to V4.1-BUG-FIX
     ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
   44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
   44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node.  If it exists it doesn't add it again.
   44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
   44319: Latest installer translations from Gloria
   44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
      44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
         << Regression introduced into 4.0.2 on 12/4/12 r35201 >>
         44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
            44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
            - Fix for regression from ALF-11956, connected with setting titles for file picker controls
      44316: Merged DEV to V4.1
         44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
         44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Handle Mac 2011 Word backup in scope of RenameShuffle
      44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix incremental cache state to cope with duplicate leaf/aux doc entries.
      44283: Encoding fix by David Webster
      44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix initial cache state to cope with duplicate leaf/aux doc entries.
      44252: Russian fix from Gloria
      44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - still difficult to reproduce
      44149: Merged HEAD to V4.1
         44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
         44039: Version in parent-pom was not changed properly when deploying to Maven repo
      44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
      44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
      44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
      - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
      - and then blowing up as it continually fetched into the same in-memory HashSet!
   44404: Merged DEV to V4.1-BUG-FIX
      44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
      1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
      2. Added a simple implementation for SOLR to use
      3. Made M2Label look up model labels via a supplied MessageLookup argument
      4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
      5. Accounted for interface changes throughout. 
   44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
         - Not just Ghostscript but any thumbnail failure
   44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
   44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
         - got the wrong branch
         44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
               - Not just Ghostscript but any thumbnail failure
   44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
      44435: Merged DEV to V4.0.2 (4.0.2.22)
         44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
         - Initialize rootRefs in the property definition to prevent NPE.
   44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
     MNT-211 (Still needs implementing on 4.1)
   44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
   44511: ALF-16791: Added missing class.
   44519: ALF-16791: Fixed broken unit tests
   44541: Fix for     ALF-17151   SOLR - add support to disable permission checks
   44542: MNT-211  Re-implement on 4.1
   44548: ALF-16791: Fixed broken SOLR
   44559: ALF-17075: "Exporting and importing null MLText values does not work."
   44577: Final part for     ALF-16558 SOLR tracking does not do incremental updates but one single chunk 
   - fixed code so SolrSearchers are held for as little time as possible
   44590: ALF-14523 (Share - Metadata constraint on workflow creation)
   44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
   44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44600: ALF-16791: Another omission not covered by unit tests
   44603: ALF-14201: upgrade activiti to 5.7-20121211
   44605: Added missing vti.server.url.path.prefix property required by commit 43471
   Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
   44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
   44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
   44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
   44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
         44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
            Check if external authentication is active in BaseServlet
   44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
   Initial implementation by Dmitry Velichkevich.
   Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
   44632: addition of validation of NetworkFile isClosed property.
   44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
      44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
      44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
         also, sneak in the SVN path, so that tracability is complete
   44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
   44651: ALF-14348 (Unable to update external blog configuration details)
   44654: Merged DEV to V4.1-BUG-FIX
      44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
      Added a message bundles for FullControll access role.
   44655: Merged DEV to V4.1-BUG-FIX
      44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
      44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
   44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
   - Wrong node was being used for access checks
   - Fix by Andrey Chernov
   44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
         - Now we can cope with a runAs where the username is in the wrong case
      44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-12-13 14:16:40 +00:00
parent d48fa4be2c
commit a794361ac2
73 changed files with 1866 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/cmis/dictionary/CMISAbstractTypeDefinition.java
View File

@@ -124,7 +124,7 @@ public abstract class CMISAbstractTypeDefinition implements CMISTypeDefinition,
{
if (cmisMapping.getDataType(propDef.getDataType()) != null)
{
CMISPropertyDefinition cmisPropDef = createProperty(cmisMapping, propDef);
CMISPropertyDefinition cmisPropDef = createProperty(cmisMapping, dictionaryService, propDef);
properties.put(cmisPropDef.getPropertyId().getId(), cmisPropDef);
}
}
@@ -140,12 +140,12 @@ public abstract class CMISAbstractTypeDefinition implements CMISTypeDefinition,
* @param propDef
* @return
*/
private CMISPropertyDefinition createProperty(CMISMapping cmisMapping, PropertyDefinition propDef)
private CMISPropertyDefinition createProperty(CMISMapping cmisMapping, DictionaryService dictionaryService, PropertyDefinition propDef)
{
QName propertyQName = propDef.getName();
String propertyId = cmisMapping.getCmisPropertyId(propertyQName);
CMISPropertyId cmisPropertyId = new CMISPropertyId(propertyQName, propertyId);
return new CMISBasePropertyDefinition(cmisMapping, cmisPropertyId, propDef, this);
return new CMISBasePropertyDefinition(cmisMapping, cmisPropertyId, dictionaryService, propDef, this);
}
/**

7
source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java
View File

@@ -49,6 +49,7 @@ import org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser;
import org.alfresco.service.cmr.dictionary.Constraint;
import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.util.ISO9075;
@@ -106,14 +107,14 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
* @param propDef
* @param typeDef
*/
public CMISBasePropertyDefinition(CMISMapping cmisMapping, CMISPropertyId propertyId, PropertyDefinition propDef,
public CMISBasePropertyDefinition(CMISMapping cmisMapping, CMISPropertyId propertyId, DictionaryService dictionaryService, PropertyDefinition propDef,
CMISTypeDefinition typeDef)
{
this.propertyId = propertyId;
this.typeDef = typeDef;
queryName = ISO9075.encodeSQL(cmisMapping.buildPrefixEncodedString(propertyId.getQName()));
displayName = (propDef.getTitle() != null) ? propDef.getTitle() : propertyId.getId();
description = propDef.getDescription() != null ? propDef.getDescription() : displayName;
displayName = (propDef.getTitle(dictionaryService) != null) ? propDef.getTitle(dictionaryService) : propertyId.getId();
description = propDef.getDescription(dictionaryService) != null ? propDef.getDescription(dictionaryService) : displayName;
propertyType = cmisMapping.getDataType(propDef.getDataType());
cardinality = propDef.isMultiValued() ? CMISCardinalityEnum.MULTI_VALUED : CMISCardinalityEnum.SINGLE_VALUED;
for (ConstraintDefinition constraintDef : propDef.getConstraints())

7
source/java/org/alfresco/cmis/dictionary/CMISDocumentTypeDefinition.java
View File

@@ -24,6 +24,7 @@ import org.alfresco.cmis.CMISScope;
import org.alfresco.cmis.CMISTypeId;
import org.alfresco.cmis.mapping.CMISMapping;
import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ISO9075;
@@ -49,15 +50,15 @@ public class CMISDocumentTypeDefinition extends CMISAbstractTypeDefinition
* @param typeId
* @param cmisClassDef
*/
public CMISDocumentTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, ClassDefinition cmisClassDef)
public CMISDocumentTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, DictionaryService dictionaryService, ClassDefinition cmisClassDef)
{
isPublic = true;
// Object type properties
this.cmisClassDef = cmisClassDef;
objectTypeId = typeId;
displayName = (cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId.getId();
description = cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : displayName;
displayName = (cmisClassDef.getTitle(dictionaryService) != null) ? cmisClassDef.getTitle(dictionaryService) : typeId.getId();
description = cmisClassDef.getDescription(dictionaryService) != null ? cmisClassDef.getDescription(dictionaryService) : displayName;
QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName());
if (typeId == CMISDictionaryModel.DOCUMENT_TYPE_ID)

7
source/java/org/alfresco/cmis/dictionary/CMISFolderTypeDefinition.java
View File

@@ -24,6 +24,7 @@ import org.alfresco.cmis.CMISTypeId;
import org.alfresco.cmis.mapping.CMISMapping;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ISO9075;
@@ -45,15 +46,15 @@ public class CMISFolderTypeDefinition extends CMISAbstractTypeDefinition
* @param typeId
* @param cmisClassDef
*/
public CMISFolderTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, ClassDefinition cmisClassDef, boolean isSystem)
public CMISFolderTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, DictionaryService dictionaryService, ClassDefinition cmisClassDef, boolean isSystem)
{
isPublic = true;
// Object type properties
this.cmisClassDef = cmisClassDef;
objectTypeId = typeId;
displayName = (cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId.getId();
description = cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : displayName;
displayName = (cmisClassDef.getTitle(dictionaryService) != null) ? cmisClassDef.getTitle(dictionaryService) : typeId.getId();
description = cmisClassDef.getDescription(dictionaryService) != null ? cmisClassDef.getDescription(dictionaryService) : displayName;
QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName());
if (typeId == CMISDictionaryModel.FOLDER_TYPE_ID)

6
source/java/org/alfresco/cmis/dictionary/CMISObjectTypeDefinition.java
View File

@@ -47,7 +47,7 @@ public class CMISObjectTypeDefinition extends CMISAbstractTypeDefinition
* @param typeId
* @param cmisClassDef
*/
public CMISObjectTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, ClassDefinition cmisClassDef, boolean isPublic)
public CMISObjectTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, DictionaryService dictionaryService, ClassDefinition cmisClassDef, boolean isPublic)
{
this.isPublic = isPublic;
@@ -58,8 +58,8 @@ public class CMISObjectTypeDefinition extends CMISAbstractTypeDefinition
if (cmisClassDef != null)
{
this.cmisClassDef = cmisClassDef;
displayName = (cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId.getId();
description = cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : displayName;
displayName = (cmisClassDef.getTitle(dictionaryService) != null) ? cmisClassDef.getTitle(dictionaryService) : typeId.getId();
description = cmisClassDef.getDescription(dictionaryService) != null ? cmisClassDef.getDescription(dictionaryService) : displayName;
QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName());
if (parentQName != null)
{

6
source/java/org/alfresco/cmis/dictionary/CMISPolicyTypeDefinition.java
View File

@@ -50,14 +50,14 @@ public class CMISPolicyTypeDefinition extends CMISAbstractTypeDefinition
* @param typeId
* @param cmisClassDef
*/
public CMISPolicyTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, ClassDefinition cmisClassDef)
public CMISPolicyTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, DictionaryService dictionaryService, ClassDefinition cmisClassDef)
{
isPublic = true;
// Object Type definitions
this.cmisClassDef = cmisClassDef;
objectTypeId = typeId;
displayName = (cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId.getId();
displayName = (cmisClassDef.getTitle(dictionaryService) != null) ? cmisClassDef.getTitle(dictionaryService) : typeId.getId();
if (typeId == CMISDictionaryModel.POLICY_TYPE_ID)
{
objectTypeQueryName = typeId.getId();
@@ -72,7 +72,7 @@ public class CMISPolicyTypeDefinition extends CMISAbstractTypeDefinition
objectTypeQueryName = ISO9075.encodeSQL(cmisMapping.buildPrefixEncodedString(typeId.getQName()));
parentTypeId = CMISDictionaryModel.POLICY_TYPE_ID;
}
description = cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : displayName;
description = cmisClassDef.getDescription(dictionaryService) != null ? cmisClassDef.getDescription(dictionaryService) : displayName;
actionEvaluators = cmisMapping.getActionEvaluators(objectTypeId.getScope());

10
source/java/org/alfresco/cmis/dictionary/CMISRelationshipTypeDefinition.java
View File

@@ -65,7 +65,7 @@ public class CMISRelationshipTypeDefinition extends CMISAbstractTypeDefinition
* @param cmisClassDef
* @param assocDef
*/
public CMISRelationshipTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, ClassDefinition cmisClassDef, AssociationDefinition assocDef)
public CMISRelationshipTypeDefinition(CMISMapping cmisMapping, CMISTypeId typeId, DictionaryService dictionaryService, ClassDefinition cmisClassDef, AssociationDefinition assocDef)
{
isPublic = true;
this.cmisClassDef = cmisClassDef;
@@ -83,22 +83,22 @@ public class CMISRelationshipTypeDefinition extends CMISAbstractTypeDefinition
{
// TODO: Add CMIS Association mapping??
creatable = false;
displayName = (cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId.getId();
displayName = (cmisClassDef.getTitle(dictionaryService) != null) ? cmisClassDef.getTitle(dictionaryService) : typeId.getId();
objectTypeQueryName = typeId.getId();
QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName());
if (parentQName != null)
{
parentTypeId = cmisMapping.getCmisTypeId(CMISScope.OBJECT, parentQName);
}
description = cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : displayName;
description = cmisClassDef.getDescription(dictionaryService) != null ? cmisClassDef.getDescription(dictionaryService) : displayName;
}
else
{
creatable = true;
displayName = (assocDef.getTitle() != null) ? assocDef.getTitle() : typeId.getId();
displayName = (assocDef.getTitle(dictionaryService) != null) ? assocDef.getTitle(dictionaryService) : typeId.getId();
objectTypeQueryName = ISO9075.encodeSQL(cmisMapping.buildPrefixEncodedString(typeId.getQName()));
parentTypeId = CMISDictionaryModel.RELATIONSHIP_TYPE_ID;
description = assocDef.getDescription() != null ? assocDef.getDescription() : displayName;
description = assocDef.getDescription(dictionaryService) != null ? assocDef.getDescription(dictionaryService) : displayName;
CMISTypeId sourceTypeId = cmisMapping.getCmisTypeId(cmisMapping.getCmisType(assocDef.getSourceClass().getName()));
if (sourceTypeId != null)

12
source/java/org/alfresco/cmis/dictionary/CMISStrictDictionaryService.java
View File

@@ -76,20 +76,20 @@ public class CMISStrictDictionaryService extends CMISAbstractDictionaryService
CMISAbstractTypeDefinition objectTypeDef = null;
if (typeId.getScope() == CMISScope.DOCUMENT)
{
objectTypeDef = new CMISDocumentTypeDefinition(cmisMapping, typeId, classDef);
objectTypeDef = new CMISDocumentTypeDefinition(cmisMapping, typeId, dictionaryService, classDef);
}
else if (typeId.getScope() == CMISScope.FOLDER)
{
boolean isSystem = dictionaryService.isSubClass(classDef.getName(), ContentModel.TYPE_SYSTEM_FOLDER);
objectTypeDef = new CMISFolderTypeDefinition(cmisMapping, typeId, classDef, isSystem);
objectTypeDef = new CMISFolderTypeDefinition(cmisMapping, typeId, dictionaryService, classDef, isSystem);
}
else if (typeId.getScope() == CMISScope.POLICY)
{
objectTypeDef = new CMISPolicyTypeDefinition(cmisMapping, typeId, classDef);
objectTypeDef = new CMISPolicyTypeDefinition(cmisMapping, typeId, dictionaryService, classDef);
}
else if (typeId.getScope() == CMISScope.OBJECT)
{
objectTypeDef = new CMISObjectTypeDefinition(cmisMapping, typeId, classDef, false);
objectTypeDef = new CMISObjectTypeDefinition(cmisMapping, typeId, dictionaryService, classDef, false);
}
registry.registerTypeDefinition(objectTypeDef);
@@ -106,7 +106,7 @@ public class CMISStrictDictionaryService extends CMISAbstractDictionaryService
{
CMISTypeId typeId = cmisMapping.getCmisTypeId(CMISScope.RELATIONSHIP, CMISMapping.RELATIONSHIP_QNAME);
ClassDefinition classDef = dictionaryService.getClass(cmisMapping.getCmisType(typeId.getQName()));
CMISAbstractTypeDefinition objectTypeDef = new CMISRelationshipTypeDefinition(cmisMapping, typeId, classDef, null);
CMISAbstractTypeDefinition objectTypeDef = new CMISRelationshipTypeDefinition(cmisMapping, typeId, dictionaryService, classDef, null);
registry.registerTypeDefinition(objectTypeDef);
for (QName classQName : classQNames)
@@ -117,7 +117,7 @@ public class CMISStrictDictionaryService extends CMISAbstractDictionaryService
// create appropriate kind of type definition
typeId = cmisMapping.getCmisTypeId(CMISScope.RELATIONSHIP, classQName);
AssociationDefinition assocDef = dictionaryService.getAssociation(classQName);
objectTypeDef = new CMISRelationshipTypeDefinition(cmisMapping, typeId, null, assocDef);
objectTypeDef = new CMISRelationshipTypeDefinition(cmisMapping, typeId, dictionaryService, null, assocDef);
registry.registerTypeDefinition(objectTypeDef);
}