Merged V2.1 to HEAD

6486: Fix for AWC-1134 (Made minimum length for username and password configurable)
   6487: Added "copy.verbose" property to build script to list all files being copied in the 'deploy-tomcat-exploded' and 'deploy-webclient-changes' targets
   6488: Changed default CIFS server to remove underscore as it can cause problems with OpenOffice.
   6489: Fix for WCM-498 (Expired items that are deleted are not represented as such in the change request dialog or submit dialog)
   6490: Fix for WCM-446 and WCM-624. Multi-select and All operations in Modified Files list respect items in workflow and ignore them.
   6491: Fixes profoundly brain dead behavior in AVMLockingService.init().
   6492: Refactoring of LookupCache to be clustering compatible
   6493: Staging and locking changes
   6494: WCM Revert action moved to end of all action lists to avoid accidently clicking it (as it has no confirmation screen!)
   6496: Fixes for WCM-746 and WCM-747 - Edit File Properties and Edit Folder Properties working correctly again for AVM objects.
   6497: Enable virtualization server to be (re)started at any point prior or during the startup of the alfresco webapp (fixes WCM-750).
   6498: WCM-742 - moving locks from the preview sandbox to the main user sandbox.


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

config/alfresco/avm-services-context.xml

@@ -146,14 +146,8 @@
 	    <property name="avmStoreDAO">
 	        <ref bean="avmStoreDAO"/>
 	    </property>
-	    <property name="maxSize">
-	    	<value>50</value>
-	    </property>
-	</bean>
-	
-	<bean id="lookupCacheListener" class="org.alfresco.repo.avm.AVMLookupCacheListener">
-	    <property name="lookupCache">
-	        <ref bean="lookupCache"/>
+	    <property name="transactionalCache">
+	    	<ref bean="lookupTransactionalCache"/>
 	    </property>
 	</bean>
 	
@@ -290,6 +284,9 @@
         <property name="avmSyncService">
             <ref bean="AVMSyncService" />
         </property>
+        <property name="avmLockingAwareService">
+            <ref bean="AVMLockingAwareService" />
+        </property>
         <property name="nodeService">
             <ref bean="NodeService" />
         </property>

config/alfresco/cache-context.xml

@@ -244,7 +244,36 @@
          <value>10</value>
       </property>
    </bean>
-   
+   
+   <!-- Transactional caches setup for LookupCache -->
+   
+   <bean name="lookupSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+       <property name="cache">
+           <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+               <property name="cacheManager">
+                   <ref bean="internalEHCacheManager"/>
+               </property>
+               <property name="cacheName">
+                   <value>org.alfresco.repo.avm.lookupSharedCache</value>
+               </property>
+           </bean>
+       </property>
+   </bean>
+   
+   <bean name="lookupTransactionalCache" class="org.alfresco.repo.cache.TransactionalCache">
+       <property name="sharedCache">
+           <ref bean="lookupSharedCache"/>
+       </property>
+       <property name="cacheManager">
+           <ref bean="transactionalEHCacheManager"/>
+       </property>
+       <property name="name">
+           <value>org.alfresco.repo.avm.lookupTransactionalCache</value>
+       </property>
+       <property name="maxCacheSize">
+           <value>50</value>
+       </property>
+   </bean>
    <!-- ===================================== -->
    <!-- Messages Caches                       -->
    <!-- ===================================== -->

config/alfresco/file-servers.xml

@@ -2,7 +2,7 @@
 
    <config evaluator="string-compare" condition="CIFS Server">
 	  <serverEnable enabled="true"/>
-      <host name="${localname}_A"/>
+      <host name="${localname}A"/>
       <comment>Alfresco CIFS Server</comment>
 
       <!-- Set to the broadcast mask for the subnet -->

config/alfresco/public-services-context.xml

@@ -795,9 +795,6 @@
         <property name="avmRepository">
             <ref bean="avmRepository"/>
         </property>
-        <property name="transactionListener">
-            <ref bean="lookupCacheListener"/>
-        </property>
     </bean>
 
     <bean id="avmServiceReadTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">