Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/dictionary/DictionaryService.java

@@ -149,6 +149,13 @@ public interface DictionaryService
     @NotAuditable
     Collection<QName> getAspects(QName model);
 
+    /**
+     * @param model the model to retrieve associations for
+     * @return the names of all associations defined within the specified model
+     */
+    @NotAuditable
+    public Collection<QName> getAssociations(QName model);
+    
     /**
      * @param name the name of the aspect to retrieve
      * @return the aspect definition (or null, if it doesn't exist)
@@ -231,7 +238,7 @@ public interface DictionaryService
     Collection<QName> getProperties(QName model, QName dataType);
     
     /**
-     * Get all poroperties for the specified model
+     * Get all properties for the specified model
      * 
      * @param model
      * @return
@@ -247,6 +254,14 @@ public interface DictionaryService
     @NotAuditable
     AssociationDefinition getAssociation(QName associationName);
     
+    /**
+     * Get all the association definitions
+    
+     * @return all the association qnames
+     */
+    @NotAuditable
+    Collection<QName> getAllAssociations();
+    
     // TODO: Behaviour definitions
     
 }