Merged up to HEAD.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/extension/ldap-authentication-context.xml.sample

@@ -287,6 +287,10 @@
         <property name="memberAttribute">
             <value>member</value>
         </property>
+        
+        <property name="authorityDAO">
+            <ref bean="authorityDAO"/>
+        </property>
     </bean>
     
     <!-- Job definitions to import LDAP people and groups -->
@@ -397,6 +401,13 @@
         <property name="namespacePrefixResolver">
             <ref bean="namespaceService"/>
         </property>
+        
+        
+        <property name="caches">
+            <set>
+                <ref bean="permissionsAccessCache"/>
+            </set>
+        </property>
     </bean>
     
     <!-- The bean that imports xml descibing groups -->
@@ -437,6 +448,16 @@
         <property name="namespacePrefixResolver">
             <ref bean="namespaceService"/>
         </property>
+        
+        <!-- caches to clear on import of groups -->
+        <property name="caches">
+            <set>
+                <ref bean="userToAuthorityCache"/>
+                <ref bean="permissionsAccessCache"/>
+            </set>
+        </property>
+        
+        <!-- userToAuthorityCache -->
     </bean>
     
 </beans>