mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
- add new Message Service + hook into Workflow Service
- add Tenant Service hooks to Workflow Service - MT bootstrap ordering fix git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -205,6 +205,13 @@
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Bootstrap Single-Tenant Admin Context -->
|
||||
<import resource="classpath:alfresco/bootstrap/tenant-single-admin-context.xml"/>
|
||||
|
||||
<!-- Bootstrap Multi-Tenant Admin Context (if available) -->
|
||||
<!-- note: must be after schema bootstrap and before repo-admin and workflow -->
|
||||
<import resource="classpath*:alfresco/bootstrap/tenant-multi-admin-context.xml"/>
|
||||
|
||||
<bean id="workflowBootstrap" parent="workflowDeployer">
|
||||
<property name="workflowDefinitions">
|
||||
|
@@ -0,0 +1,8 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
|
||||
|
||||
<beans>
|
||||
|
||||
<bean id="tenantAdminService" class="org.alfresco.repo.tenant.SingleTDeployerServiceImpl" />
|
||||
|
||||
</beans>
|
@@ -245,4 +245,104 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- ===================================== -->
|
||||
<!-- Messages Caches -->
|
||||
<!-- ===================================== -->
|
||||
|
||||
<!-- The cross-transaction shared cache for In-Memory ResourceBundleBaseNames -->
|
||||
|
||||
<bean name="resourceBundleBaseNamesSharedCache" 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.cache.resourceBundleBaseNamesCache</value>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The transactional cache for In-Memory ResourceBundleBaseNames -->
|
||||
|
||||
<bean name="resourceBundleBaseNamesCache" class="org.alfresco.repo.cache.TransactionalCache">
|
||||
<property name="sharedCache">
|
||||
<ref bean="resourceBundleBaseNamesSharedCache" />
|
||||
</property>
|
||||
<property name="cacheManager" >
|
||||
<ref bean="transactionalEHCacheManager" />
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>org.alfresco.resourceBundleBaseNamesTransactionalCache</value>
|
||||
</property>
|
||||
<property name="maxCacheSize">
|
||||
<value>10</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The cross-transaction shared cache for In-Memory LoadedResourceBundles -->
|
||||
|
||||
<bean name="loadedResourceBundlesSharedCache" 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.cache.loadedResourceBundlesCache</value>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The transactional cache for In-Memory LoadedResourceBundles -->
|
||||
|
||||
<bean name="loadedResourceBundlesCache" class="org.alfresco.repo.cache.TransactionalCache">
|
||||
<property name="sharedCache">
|
||||
<ref bean="loadedResourceBundlesSharedCache" />
|
||||
</property>
|
||||
<property name="cacheManager" >
|
||||
<ref bean="transactionalEHCacheManager" />
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>org.alfresco.loadedResourceBundlesTransactionalCache</value>
|
||||
</property>
|
||||
<property name="maxCacheSize">
|
||||
<value>10</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The cross-transaction shared cache for In-Memory Messages -->
|
||||
|
||||
<bean name="messagesSharedCache" 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.cache.messagesCache</value>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The transactional cache for In-Memory Messages -->
|
||||
|
||||
<bean name="messagesCache" class="org.alfresco.repo.cache.TransactionalCache">
|
||||
<property name="sharedCache">
|
||||
<ref bean="messagesSharedCache" />
|
||||
</property>
|
||||
<property name="cacheManager" >
|
||||
<ref bean="transactionalEHCacheManager" />
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>org.alfresco.messagesTransactionalCache</value>
|
||||
</property>
|
||||
<property name="maxCacheSize">
|
||||
<value>10</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
@@ -246,6 +246,26 @@
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Repo-based Message Service (based on Core I18NUtil) -->
|
||||
|
||||
<bean id="messageService" class="org.alfresco.repo.i18n.MessageServiceImpl">
|
||||
<property name="tenantService">
|
||||
<ref bean="tenantService"/>
|
||||
</property>
|
||||
<property name="serviceRegistry">
|
||||
<ref bean="ServiceRegistry"/>
|
||||
</property>
|
||||
<property name="resourceBundleBaseNamesCache">
|
||||
<ref bean="resourceBundleBaseNamesCache"/>
|
||||
</property>
|
||||
<property name="loadedResourceBundlesCache">
|
||||
<ref bean="loadedResourceBundlesCache"/>
|
||||
</property>
|
||||
<property name="messagesCache">
|
||||
<ref bean="messagesCache"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<!-- -->
|
||||
|
@@ -331,4 +331,27 @@
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
|
||||
<!-- Messages I18N (tenant-based) -->
|
||||
|
||||
<cache
|
||||
name="org.alfresco.cache.resourceBundleBaseNamesCache"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
|
||||
<cache
|
||||
name="org.alfresco.cache.loadedResourceBundlesCache"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
|
||||
<cache
|
||||
name="org.alfresco.cache.messagesCache"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
|
||||
</ehcache>
|
@@ -599,6 +599,56 @@
|
||||
replicateAsynchronously = false"/>
|
||||
|
||||
</cache>
|
||||
|
||||
<!-- Messages I18N (tenant-based) -->
|
||||
|
||||
<cache
|
||||
name="org.alfresco.cache.resourceBundleBaseNamesCache"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false">
|
||||
|
||||
<cacheEventListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
|
||||
properties="replicatePuts = false,
|
||||
replicateUpdates = true,
|
||||
replicateRemovals = true,
|
||||
replicateUpdatesViaCopy = false,
|
||||
replicateAsynchronously = false"/>
|
||||
|
||||
</cache>
|
||||
|
||||
<cache
|
||||
name="org.alfresco.cache.loadedResourceBundlesCache"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false">
|
||||
|
||||
<cacheEventListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
|
||||
properties="replicatePuts = false,
|
||||
replicateUpdates = true,
|
||||
replicateRemovals = true,
|
||||
replicateUpdatesViaCopy = false,
|
||||
replicateAsynchronously = false"/>
|
||||
|
||||
</cache>
|
||||
|
||||
<cache
|
||||
name="org.alfresco.cache.messagesCache"
|
||||
maxElementsInMemory="100"
|
||||
eternal="true"
|
||||
overflowToDisk="false">
|
||||
|
||||
<cacheEventListenerFactory
|
||||
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
|
||||
properties="replicatePuts = false,
|
||||
replicateUpdates = true,
|
||||
replicateRemovals = true,
|
||||
replicateUpdatesViaCopy = false,
|
||||
replicateAsynchronously = false"/>
|
||||
|
||||
</cache>
|
||||
|
||||
</ehcache>
|
||||
|
||||
|
@@ -8,7 +8,5 @@
|
||||
<!-- -->
|
||||
|
||||
<bean id="tenantService" class="org.alfresco.repo.tenant.SingleTServiceImpl" />
|
||||
|
||||
<bean id="tenantAdminService" class="org.alfresco.repo.tenant.SingleTDeployerServiceImpl" />
|
||||
|
||||
</beans>
|
||||
|
@@ -26,6 +26,7 @@
|
||||
<property name="nodeService" ref="nodeService"/>
|
||||
<property name="permissionService" ref="permissionService"/>
|
||||
<property name="namespaceService" ref="namespaceService"/>
|
||||
<property name="tenantService" ref="tenantService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="workflowInterpreter" class="org.alfresco.repo.workflow.WorkflowInterpreter">
|
||||
@@ -89,6 +90,8 @@
|
||||
<property name="dictionaryService" ref="DictionaryService"/>
|
||||
<property name="namespaceService" ref="namespaceService"/>
|
||||
<property name="nodeService" ref="nodeService"/>
|
||||
<property name="tenantService" ref="tenantService"/>
|
||||
<property name="messageService" ref="messageService"/>
|
||||
<property name="personService" ref="personService"/>
|
||||
<property name="authorityDAO" ref="authorityDAO"/>
|
||||
<property name="serviceRegistry" ref="ServiceRegistry"/>
|
||||
|
Reference in New Issue
Block a user