mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.2 to HEAD (V2.1 sourced)
7127: Merged V2.1 to V2.2
7118: Fixed overly-eager applicability of patches brought forward from previous releases
7119: Fixed SQL script patch schema numbering
7245: Merged V2.1 to V2.2:
7238: Serializes alfresco->alfresco deployments to the same target.
7241: Added AVM index tracking into the built-in, cron-controlled config.
7242: More DEBUG messages for index tracking, where required.
7243: Fix for url encoding issue as found by by Ishii Akinori
7372: Merged V2.1 to V2.2
7289: Fix for AWC-1542 where utf-8 characters not displaying correctly in RSS feed output
7300: Bumped up session size management values to reduce potential issues with mix-style, shorter transactions.
7303: Portlet updates for MSIE problems in Liferay.
7304: Added the <cifs-url-suffix>. AWC-1671.
7317: Fix OO shutdown
7319: Catch for raising rule executions using null NodeRefs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -16,5 +16,5 @@ insert into alf_applied_patch
|
||||
values
|
||||
(
|
||||
'patch.db-V1.4-PerfIndexes02', 'Executed script AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql',
|
||||
0, 26, -1, 27, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
0, 75, -1, 76, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -16,5 +16,5 @@ insert into alf_applied_patch
|
||||
values
|
||||
(
|
||||
'patch.db-V1.4-PerfIndexes02', 'Executed script AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql',
|
||||
0, 26, -1, 27, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
|
||||
0, 75, -1, 76, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
|
||||
);
|
||||
@@ -62,7 +62,7 @@
|
||||
<!-- Index tracking -->
|
||||
<!--
|
||||
This is the default index tracker component. It is used during bootstrap when incremental recovery
|
||||
is required. It is also used, by default in the clustered index tracking sample.
|
||||
is required.
|
||||
-->
|
||||
<bean
|
||||
id="admIndexTrackerComponent"
|
||||
@@ -99,10 +99,51 @@
|
||||
<ref bean="schedulerFactory" />
|
||||
</property>
|
||||
<property name="cronExpression">
|
||||
<value>${index.tracking.cronExpression}</value>
|
||||
<value>${index.tracking.adm.cronExpression}</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!--===========================-->
|
||||
<!-- AVM (WCM) index tracking -->
|
||||
<!--===========================-->
|
||||
|
||||
<bean
|
||||
id="avmIndexTrackerComponent"
|
||||
class="org.alfresco.repo.node.index.AVMRemoteSnapshotTracker"
|
||||
parent="indexRecoveryComponentBase">
|
||||
<property name="avmService">
|
||||
<ref bean="avmService" />
|
||||
</property>
|
||||
<property name="avmSnapShotTriggeredIndexingMethodInterceptor">
|
||||
<ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Schedule index tracking for AVM -->
|
||||
<bean id="avmIndexTrackerTrigger" class="org.alfresco.util.CronTriggerBean">
|
||||
<property name="jobDetail">
|
||||
<bean class="org.springframework.scheduling.quartz.JobDetailBean">
|
||||
<property name="jobClass">
|
||||
<value>org.alfresco.repo.node.index.IndexRecoveryJob</value>
|
||||
</property>
|
||||
<property name="jobDataAsMap">
|
||||
<map>
|
||||
<entry key="indexRecoveryComponent">
|
||||
<ref bean="avmIndexTrackerComponent" />
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="scheduler">
|
||||
<ref bean="schedulerFactory" />
|
||||
</property>
|
||||
<property name="cronExpression">
|
||||
<value>${index.tracking.avm.cronExpression}</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Missing Content -->
|
||||
<!-- Bean that attempts to index content that was previously missing -->
|
||||
<bean
|
||||
id="missingContentReindexComponent"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# PatchService messages
|
||||
patch.service.not_relevant=Not relevant to schema {0}
|
||||
patch.executer.checking=Checking for patches to apply ...
|
||||
patch.service.applying_patch=\tApplying patch ''{0}'' ({1}).
|
||||
patch.executer.no_patches_required=No patches were required.
|
||||
patch.executer.system_readonly=Patches cannot be applied to a read-only system. Possible incompatibilities may exist between the application code and the existing data.
|
||||
patch.executer.not_executed =\n=== Recorded patch (not executed) === \nID: {0}\nRESULT: \n{1}\n=====================================
|
||||
|
||||
@@ -185,8 +185,7 @@
|
||||
<value>10000</value>
|
||||
</property>
|
||||
<property name="resourceManagerCallFrequencyMillis">
|
||||
<!-- Was 5000 -->
|
||||
<value>1000</value>
|
||||
<value>5000</value>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="sessionSizeResourceManager" class="org.alfresco.repo.domain.hibernate.SessionSizeResourceManager">
|
||||
@@ -194,8 +193,7 @@
|
||||
<ref bean="sessionFactory" />
|
||||
</property>
|
||||
<property name="threshold">
|
||||
<!-- Was 5000 -->
|
||||
<value>100</value>
|
||||
<value>5000</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
@@ -26,15 +26,19 @@ index.recovery.mode=VALIDATE
|
||||
# Force FULL recovery to stop when encountering errors
|
||||
index.recovery.stopOnError=true
|
||||
# Set the frequency with which the index tracking is triggered.
|
||||
# For more information on index tracking in a cluster:
|
||||
# http://wiki.alfresco.com/wiki/High_Availability_Configuration_V1.4_to_V2.1#Version_1.4.5.2C_2.1.1_and_later
|
||||
# By default, this is effectively never, but can be modified as required.
|
||||
# Examples:
|
||||
# Once every five seconds: 0/5 * * * * ?
|
||||
# Once every two seconds : 0/2 * * * * ?
|
||||
# See http://quartz.sourceforge.net/javadoc/org/quartz/CronTrigger.html
|
||||
index.tracking.cronExpression=* * * * * ? 2099
|
||||
index.tracking.adm.cronExpression=${index.tracking.cronExpression}
|
||||
index.tracking.avm.cronExpression=${index.tracking.cronExpression}
|
||||
# Other properties.
|
||||
index.tracking.maxTxnDurationMinutes=60
|
||||
index.tracking.reindexLagMs=50
|
||||
index.tracking.reindexLagMs=1000
|
||||
index.tracking.maxRecordSetSize=1000
|
||||
|
||||
# Change the failure behaviour of the configuration checker
|
||||
|
||||
Reference in New Issue
Block a user