Merged V2.1 to HEAD

6515: Fix for AWC-1362 (system error page when clicking on space that doesn't exist in navigator)
   6516: Fix for AR-1688 - Vista
   6518: Fix for AWC-1479, AWC-1199 and AWC-426 (javascript insertion into forum posts security related fixes) limit to subset of safe tags for posting
   6519: Fix AR-1690 Web Scripts url.args is missing even though it's documented in WIKI
   6520: Fix for AWC-1271 (component generator config ignored for associations)
   6521: Fix AWC-1492 Some included javascript files in template/webscripts use the wrong app context path i.e. /alfresco when the app is called /alfzip
   6522: Build fix
   6523: - Fix rendering of tasks with no description in office portlets
   6524: Added thread pool for index merging (AR-1633, AR-1579)
   6525: One more fix for rendering of tasks with no description in office portlets
   6527: Renamed axis jar to reflect version number.
   6528: WebServices query cache refactoring


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 23:44:07 +00:00
parent d0e64d06b4
commit e02f50bd08
13 changed files with 460 additions and 391 deletions

View File

@@ -245,9 +245,13 @@
</property>
</bean>
<!-- Transactional caches setup for LookupCache -->
<!-- ===================================== -->
<!-- AVM Lookup Cache -->
<!-- ===================================== -->
<!-- The cross-transaction shared cache for AVM lookups -->
<bean name="lookupSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
<bean name="avmLookupSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
<property name="cache">
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
<property name="cacheManager">
@@ -260,9 +264,11 @@
</property>
</bean>
<bean name="lookupTransactionalCache" class="org.alfresco.repo.cache.TransactionalCache">
<!-- Transactional cache for AVM lookups -->
<bean name="avmLookupCache" class="org.alfresco.repo.cache.TransactionalCache">
<property name="sharedCache">
<ref bean="lookupSharedCache"/>
<ref bean="avmLookupSharedCache"/>
</property>
<property name="cacheManager">
<ref bean="transactionalEHCacheManager"/>
@@ -273,7 +279,44 @@
<property name="maxCacheSize">
<value>50</value>
</property>
</bean>
</bean>
<!-- ===================================== -->
<!-- WebServices Query Session Cache -->
<!-- ===================================== -->
<!-- The cross-transaction shared cache for WebService query sessions -->
<bean name="webServicesQuerySessionSharedCache" 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.webservices.querySessionSharedCache</value>
</property>
</bean>
</property>
</bean>
<!-- Transactional cache for WebService query sessions -->
<bean name="webServicesQuerySessionCache" class="org.alfresco.repo.cache.TransactionalCache">
<property name="sharedCache">
<ref bean="webServicesQuerySessionSharedCache"/>
</property>
<property name="cacheManager">
<ref bean="transactionalEHCacheManager"/>
</property>
<property name="name">
<value>org.alfresco.repo.webservices.querySessionTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>50</value>
</property>
</bean>
<!-- ===================================== -->
<!-- Messages Caches -->
<!-- ===================================== -->