mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-21 18:09:20 +00:00
51e37ecf1a
15908: Merged V3.1 to V3.2 (record only)
15907: Merged V3.2 to V3.1
15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
15972: Merged V3.1 to V3.2
15429: **Record only** I18N message IDs for JSF dashlets
15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
15957: Merged DEV-TEMPORARY to V3.1
15865: Fix for ETHREEOH-2673
15958: Merged DEV-TEMPORARY to V3.1
15885: ETHREEOH-2615: Localization Issue - Japanese UI
15959: Merged DEV-TEMPORARY to V3.1
15882: ETHREEOH-2644: Sending Email using Template throws exception
15962: Fix for ETHREEOH-2390
15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
15965: Merged DEV/BELARUS/V3.1
15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
15966: Merged V2.2 to V3.1
15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
15969: Prep for ETHREEOH-2295 fixes and associated merges.
15970: Merged DEV-TEMPORARY to V3.1
14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
Merged /alfresco/BRANCHES/V2.2:r15948
Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
Merged /alfresco/BRANCHES/V3.2:r15908,15972
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
94 lines
4.3 KiB
XML
94 lines
4.3 KiB
XML
<?xml version='1.0' encoding='UTF-8'?>
|
|
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
|
|
|
|
<beans>
|
|
|
|
<!-- Note: ActivityService / FeedGenerator -> SiteService -> ActivityPostService -->
|
|
|
|
<bean id="activityPostService" class="org.alfresco.repo.activities.ActivityPostServiceImpl">
|
|
<property name="postDAO" ref="postDAO"/>
|
|
<property name="tenantService" ref="tenantService"/>
|
|
<property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
|
|
</bean>
|
|
|
|
<bean id="activityService" class="org.alfresco.repo.activities.ActivityServiceImpl">
|
|
<property name="feedDAO" ref="feedDAO"/>
|
|
<property name="feedControlDAO" ref="feedControlDAO"/>
|
|
<property name="authorityService" ref="AuthorityService"/>
|
|
<property name="tenantService" ref="tenantService"/>
|
|
<property name="siteService" ref="siteService"/>
|
|
<property name="activityPostService" ref="activityPostService"/>
|
|
<property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
|
|
<property name="maxFeedItems" value="${activities.feed.max.size}"/>
|
|
</bean>
|
|
|
|
<!-- cleans out-of-date feed entries -->
|
|
<bean id="feedCleaner" class="org.alfresco.repo.activities.feed.cleanup.FeedCleaner">
|
|
<property name="feedDAO" ref="feedDAO"/>
|
|
<property name="maxAgeMins">
|
|
<value>${activities.feed.max.age.mins}</value> <!-- max age in mins, eg. 44640 mins = 31 days -->
|
|
</property>
|
|
<property name="maxFeedSize">
|
|
<value>${activities.feed.max.size}</value> <!-- max entries per site feed or user feed (to nearest postDate) -->
|
|
</property>
|
|
</bean>
|
|
|
|
<!-- cleans processed posts - max age can be small, unless required to be kept longer (for debugging) -->
|
|
<bean id="postCleaner" class="org.alfresco.repo.activities.post.cleanup.PostCleaner">
|
|
<property name="postDAO" ref="postDAO"/>
|
|
<property name="maxAgeMins">
|
|
<value>30</value> <!-- 30 minutes -->
|
|
</property>
|
|
</bean>
|
|
|
|
<!-- secondary lookup for pending posts -->
|
|
<bean id="postLookup" class="org.alfresco.repo.activities.post.lookup.PostLookup">
|
|
<property name="postDAO" ref="postDAO"/>
|
|
<property name="nodeService" ref="NodeService"/>
|
|
<property name="permissionService" ref="PermissionService"/>
|
|
<property name="transactionService" ref="transactionService"/>
|
|
<property name="personService" ref="personService"/>
|
|
<property name="tenantService" ref="tenantService"/>
|
|
</bean>
|
|
|
|
<bean id="baseFeedGenerator" class="org.alfresco.repo.activities.feed.AbstractFeedGenerator" abstract="true" init-method="init">
|
|
<property name="postDAO" ref="postDAO"/>
|
|
<property name="authenticationService" ref="AuthenticationService"/>
|
|
<property name="repoEndPoint" value="${repo.remote.url}${repo.remote.endpoint}"/>
|
|
<property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
|
|
<property name="maxItemsPerCycle" value="100"/>
|
|
<property name="activityPostServiceImpl" ref="activityPostService"/>
|
|
</bean>
|
|
|
|
|
|
<!-- Local (non-grid-based) Feed Generator -->
|
|
|
|
<bean id="feedGenerator" class="org.alfresco.repo.activities.feed.local.LocalFeedGenerator" parent="baseFeedGenerator">
|
|
<property name="feedTaskProcessor" ref="feedTaskProcessor"/>
|
|
</bean>
|
|
|
|
<bean id="feedTaskProcessor" class="org.alfresco.repo.activities.feed.local.LocalFeedTaskProcessor">
|
|
<!-- NOTE: assumes same sqlMapClient is also configured for postDAO and feedDAO -->
|
|
<property name="sqlMapClient" ref="activitiesSqlMapClient"/>
|
|
<property name="postDAO" ref="postDAO"/>
|
|
<property name="feedDAO" ref="feedDAO"/>
|
|
<property name="feedControlDAO" ref="feedControlDAO"/>
|
|
|
|
<property name="useRemoteCallbacks">
|
|
<value>false</value>
|
|
</property>
|
|
|
|
<property name="siteService" ref="SiteService"/>
|
|
<property name="nodeService" ref="NodeService"/>
|
|
<property name="contentService" ref="ContentService"/>
|
|
<property name="templateSearchPaths">
|
|
<list>
|
|
<value>alfresco/extension/templates/activities</value>
|
|
<value>alfresco/templates/activities</value>
|
|
</list>
|
|
</property>
|
|
|
|
</bean>
|
|
|
|
</beans>
|