mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
MT - fix user usages for tenants
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -233,7 +233,7 @@
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="userUsageCollapseComponent" class="org.alfresco.repo.usage.UserUsageTrackingComponent">
|
||||
<bean id="userUsageTrackingComponent" class="org.alfresco.repo.usage.UserUsageTrackingComponent">
|
||||
<property name="nodeDaoService">
|
||||
<ref bean="nodeDaoService"/>
|
||||
</property>
|
||||
@@ -252,38 +252,17 @@
|
||||
<property name="usageService">
|
||||
<ref bean="usageService"/>
|
||||
</property>
|
||||
<property name="tenantService">
|
||||
<ref bean="tenantService" />
|
||||
</property>
|
||||
<property name="tenantDeployerService">
|
||||
<ref bean="tenantAdminService" />
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<value>${system.usages.enabled}</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="userUsageBootstrapComponent" class="org.alfresco.repo.usage.UserUsageTrackingComponent">
|
||||
<property name="nodeDaoService">
|
||||
<ref bean="nodeDaoService"/>
|
||||
</property>
|
||||
<property name="transactionService">
|
||||
<ref bean="transactionService"/>
|
||||
</property>
|
||||
<property name="contentUsageImpl">
|
||||
<ref bean="contentUsageImpl"/>
|
||||
</property>
|
||||
<property name="personService">
|
||||
<ref bean="personService"/>
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService"/>
|
||||
</property>
|
||||
<property name="usageService">
|
||||
<ref bean="usageService"/>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<value>${system.usages.enabled}</value>
|
||||
</property>
|
||||
<property name="bootstrap">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- enable scheduler property to activate -->
|
||||
<bean id="userUsageCollapseJob" class="org.alfresco.util.TriggerBean">
|
||||
<property name="jobDetail">
|
||||
@@ -293,8 +272,8 @@
|
||||
</property>
|
||||
<property name="jobDataAsMap">
|
||||
<map>
|
||||
<entry key="userUsageCollapseComponent">
|
||||
<ref bean="userUsageCollapseComponent" />
|
||||
<entry key="userUsageTrackingComponent">
|
||||
<ref bean="userUsageTrackingComponent" />
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
@@ -326,8 +305,8 @@
|
||||
</property>
|
||||
<property name="jobDataAsMap">
|
||||
<map>
|
||||
<entry key="userUsageBootstrapComponent">
|
||||
<ref bean="userUsageBootstrapComponent" />
|
||||
<entry key="userUsageTrackingComponent">
|
||||
<ref bean="userUsageTrackingComponent" />
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
|
@@ -5,15 +5,9 @@
|
||||
<beans>
|
||||
|
||||
<bean id="usageService" class="org.alfresco.repo.usage.UsageServiceImpl">
|
||||
<property name="usageDeltaDao">
|
||||
<ref bean="usageDeltaDao"/>
|
||||
</property>
|
||||
<property name="nodeDaoService">
|
||||
<ref bean="nodeDaoService" />
|
||||
</property>
|
||||
<property name="tenantService">
|
||||
<ref bean="tenantService"/>
|
||||
</property>
|
||||
<property name="usageDeltaDao" ref="usageDeltaDao"/>
|
||||
<property name="nodeDaoService" ref="nodeDaoService"/>
|
||||
<property name="tenantService" ref="tenantService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="contentUsageImpl" class="org.alfresco.repo.usage.ContentUsageImpl" init-method="init">
|
||||
@@ -22,6 +16,7 @@
|
||||
<property name="policyComponent" ref="policyComponent"/>
|
||||
<property name="usageService" ref="usageService"/>
|
||||
<property name="authenticationComponent" ref="authenticationComponent"/>
|
||||
<property name="tenantService" ref="tenantService"/>
|
||||
<property name="enabled">
|
||||
<value>${system.usages.enabled}</value>
|
||||
</property>
|
||||
|
Reference in New Issue
Block a user