Merged BRANCHES/DEV/DAVEW/LDAP to HEAD

14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!)
   14586: Use US spelling of synchronization in filenames for consistency
   14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users.
   14583: Unit test for ChainingUserRegistrySynchronizer
   14571: Migration patch for existing authorities previously held in users store
      - Uses AuthorityService to recreate authorities in spaces store with new structure
   14555: Authority service changes for LDAP sync improvements
      - Moved sys:authorities container to spaces store
      - All authorities now stored directly under sys:authorities
      - Authorities can now be looked up directly by node service
      - Secondary child associations used to model group relationships
      - 'Root' groups for UI navigation determined dynamically by node service query
      - cm:member association used to relate both authority containers and persons to other authorities
      - New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones
      - Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync
   14524: Dev branch for finishing LDAP zones and upgrade impact

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

config/alfresco/model/bpmModel.xml

@@ -364,7 +364,7 @@
                     </source>
                     <target>
                         <!-- TODO: Refactor when group is pulled into content model -->
-                        <class>usr:authorityContainer</class>
+                        <class>cm:authorityContainer</class>
                         <mandatory>true</mandatory>
                         <many>false</many>
                     </target>
@@ -387,7 +387,7 @@
                     </source>
                     <target>
                         <!-- TODO: Refactor when group is pulled into content model -->
-                        <class>usr:authorityContainer</class>
+                        <class>cm:authorityContainer</class>
                         <mandatory>true</mandatory>
                         <many>true</many>
                     </target>

config/alfresco/model/contentModel.xml

@@ -2,8 +2,8 @@
 
    <description>Alfresco Content Domain Model</description>
    <author>Alfresco</author>
-   <published>2005-09-29</published>
-   <version>1.0</version>
+   <published>2009-06-04</published>
+   <version>1.1</version>
 
    <imports>
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
@@ -20,6 +20,7 @@
          <parameter name="requiresMatch"><value>false</value></parameter>
       </constraint>
       <constraint name="cm:userNameConstraint" type="org.alfresco.repo.dictionary.constraint.UserNameConstraint" />
+      <constraint name="cm:authorityNameConstraint" type="org.alfresco.repo.dictionary.constraint.AuthorityNameConstraint" />
       <constraint name="cm:storeSelectorConstraint" type="REGISTERED">
          <parameter name="registeredName"><value>defaultStoreSelector</value></parameter>
       </constraint>
@@ -148,9 +149,14 @@
          <parent>cm:folder</parent>
       </type>
       
+      <type name="cm:authority">
+        <title>Alfresco Authority Abstract Type</title>
+         <parent>sys:base</parent>
+      </type>
+
       <type name="cm:person">
          <title>Person</title>
-         <parent>sys:base</parent>
+         <parent>cm:authority</parent>
          <properties>
             <!-- The tokenisation set here is ignored - it is fixed for this type -->
             <!-- This is so you can not break person lookup -->
@@ -268,6 +274,59 @@
          </associations>
       </type>
 
+      <type name="cm:authorityContainer">
+         <title>Alfresco Authority Type</title>
+         <parent>cm:authority</parent>
+         <properties>
+            <!-- The tokenisation set here is ignored - it is fixed for this type -->
+            <!-- This is so you can not break group lookup -->
+            <property name="cm:authorityName">
+               <type>d:text</type>
+               <constraints>
+                  <constraint ref="cm:authorityNameConstraint" />
+               </constraints>
+            </property>
+            <property name="cm:authorityDisplayName">
+               <type>d:text</type>
+            </property>
+         </properties>
+         <associations>
+            <child-association name="cm:member">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </source>
+               <target>
+                  <class>cm:authority</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+               <duplicate>false</duplicate>
+            </child-association>
+         </associations>
+      </type>  
+
+      <type name="cm:zone">
+         <title>Alfresco Authentication Zone Type</title>
+         <parent>cm:cmobject</parent>
+         <properties>
+         </properties>
+         <associations>
+            <child-association name="cm:inZone">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </source>
+               <target>
+                  <class>cm:authority</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+               <duplicate>false</duplicate>
+            </child-association>
+         </associations>
+      </type>  
+
       <!-- Classification -->
          
       <type name="cm:category_root">