Merged V3.2 to HEAD

18157: ETHREEOH-3787: Support portal URL rewriting within surf webscripts
      - WebScriptServletResponse extended to use portlet helper to rewrite URLs when running in context of a portlet. (We can't use WebScriptPortletRequest / Response because we need the full servlet runtime for Surf.)
      - CMIS test webscripts corrected to be portlet enabled
   18272: Merged DEV/BELARUS/V3.2-2010_01_11 to V3.2
      18257: ETHREEOH-4002: User/Group sync does not handle LDAP communication failures
         - Merged with corrections
   18276: ETHREEOH-4002: Correction to previous checkin - modification dates are only persisted after successful processing of users and groups, so need to delete them on comms failure
   18326: ETHREEOH-3873: usr:authorityContainer type metadata must be left in place for upgraded repositories
      - Otherwise you get errors when re-indexing the migrated group nodes
   18340: ETHREEOH-4069: LDAP sync cannot resolve DNs containing a slash character
      - Due to JNDI interpreting the slash character as a separator
   18403: ETHREEOH-4008: LDAP sync should preserve case of group members
      - Was incorrectly extracting attributes from lower-cased DN


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

source/java/org/alfresco/repo/security/authentication/userModel.xml

@@ -2,8 +2,8 @@
 
    <description>Alfresco User Model</description>
    <author>Alfresco</author>
-   <published>2009-06-04</published>
-   <version>0.2</version>
+   <published>2010-01-27</published>
+   <version>0.3</version>
 
    <imports>
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
@@ -74,6 +74,41 @@
          </properties>
       </type>
    
+      <!--  Note this type is not used and was replaced by cm:authorityContainer -->
+      <!--  Retained here because old authority containers are left in place in upgraded repositories (after migration) -->       
+      <type name="usr:authorityContainer">
+         <title>Deprecated Alfresco Authority Type - NOT USED</title>
+         <parent>usr: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="usr:authorityName">
+               <type>d:text</type>
+            </property>
+            <property name="usr:members">
+               <type>d:text</type>
+               <multiple>true</multiple>   
+            </property>
+			<property name="usr:authorityDisplayName">
+               <type>d:text</type>
+            </property>
+         </properties>
+         <associations>
+            <child-association name="usr:member">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </source>
+               <target>
+                  <class>usr:authority</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+               <duplicate>false</duplicate>
+            </child-association>
+         </associations>
+      </type>  
+
    </types>