mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.1 to HEAD
6846: used ] instead of } in ${ldap.synchronisation.userIdAttributeName] 6856: Fixed 2 NPEs, one reported by MIT and one found by Jan (WCM-835) 6859: Truncate an existing file when uploading via FTP. WCM-836. 6869: Removed temporary files and folders from deploy-installer project 6870: Updated ignore property 6875: Fix for AWC-1605 6878: Fix for AWC-1587 6880: Fix for French language pack - locked_user message 6883: Fix for AWC-1565 6884: Relax trhe permissions required to get the parent links from a child node 6891: Fix for AR-1781 and AR-1782 (requires CHK-1451) 6892: Fixed AR-1777: Node status not updated for addition and removal of secondary associations (affects index tracking) 6893: Sample for replicating content store sample 6896: Added JVM shutdown check into inner loop to get faster breakout in the event of shutdown. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -73,7 +73,7 @@
|
||||
|
||||
-->
|
||||
<property name="userIdAttributeName">
|
||||
<value>${ldap.synchronisation.userIdAttributeName]</value>
|
||||
<value>${ldap.synchronisation.userIdAttributeName}</value>
|
||||
</property>
|
||||
|
||||
<!-- Services -->
|
||||
|
@@ -7,80 +7,34 @@
|
||||
If you include this file, please ensure that you review the sample
|
||||
beans contained here.
|
||||
-->
|
||||
|
||||
<bean id="backupContentStore"
|
||||
class="org.alfresco.repo.content.filestore.FileContentStore">
|
||||
|
||||
<bean id="localDriveContentStore" class="org.alfresco.repo.content.filestore.FileContentStore">
|
||||
<constructor-arg>
|
||||
<value>${dir.contentstore}/../backups/alfresco</value>
|
||||
<value>/var/alfresco/content-store</value>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
<bean id="contentStoreReplicator"
|
||||
class="org.alfresco.repo.content.replication.ContentStoreReplicator"
|
||||
depends-on="fileContentStore, backupContentStore" >
|
||||
<!-- content source -->
|
||||
<property name="sourceStore">
|
||||
<ref bean="fileContentStore" />
|
||||
</property>
|
||||
<!-- content target -->
|
||||
<property name="targetStore">
|
||||
<ref bean="backupContentStore" />
|
||||
</property>
|
||||
<bean id="networkContentStore" class="org.alfresco.repo.content.filestore.FileContentStore">
|
||||
<constructor-arg>
|
||||
<value>/share/alfresco/content-store</value>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
<bean id="contentStoreBackupTrigger" class="org.alfresco.util.CronTriggerBean">
|
||||
<property name="jobDetail">
|
||||
<bean class="org.springframework.scheduling.quartz.JobDetailBean">
|
||||
<property name="jobClass">
|
||||
<value>org.alfresco.repo.content.replication.ContentStoreReplicator$ContentStoreReplicatorJob</value>
|
||||
</property>
|
||||
<property name="jobDataAsMap">
|
||||
<map>
|
||||
<entry key="contentStoreReplicator">
|
||||
<ref bean="contentStoreReplicator" />
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="scheduler">
|
||||
<ref bean="schedulerFactory" />
|
||||
</property>
|
||||
<!-- trigger at 3am each day -->
|
||||
<property name="cronExpression">
|
||||
<value>0 0 03 * * ?</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="replicatingContentStore"
|
||||
class="org.alfresco.repo.content.replication.ReplicatingContentStore" >
|
||||
<!-- the preferred store for reads and writes -->
|
||||
<bean id="fileContentStore" class="org.alfresco.repo.content.replication.ReplicatingContentStore" >
|
||||
<property name="primaryStore">
|
||||
<ref bean="fileContentStore" />
|
||||
<ref bean="localDriveContentStore" />
|
||||
</property>
|
||||
<!-- example of possible secondary store configuration -->
|
||||
<property name="secondaryStores">
|
||||
<list>
|
||||
<ref bean="archiveStoreA" />
|
||||
<ref bean="archiveStoreB" />
|
||||
<ref bean="networkContentStore" />
|
||||
</list>
|
||||
</property>
|
||||
<!-- enable content missing from the primary store to be pulled in from the secondary stores -->
|
||||
<property name="inbound">
|
||||
<value>false</value>
|
||||
<value>true</value>
|
||||
</property>
|
||||
<!-- enable replication from the primary to the secondary stores -->
|
||||
<property name="outbound">
|
||||
<value>false</value>
|
||||
<value>true</value>
|
||||
</property>
|
||||
<!-- this is required if outbound replication is active, otherwise not -->
|
||||
<property name="retryingTransactionHelper">
|
||||
<ref bean="retryingTransactionHelper"/>
|
||||
</property>
|
||||
<!-- set this to force outbound replication to be asynchronous -->
|
||||
<property name="outboundThreadPoolExecutor">
|
||||
<ref bean="threadPoolExecutor" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
Reference in New Issue
Block a user