inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
8121: Merged V2.1 to V2.2
      8088: Turned off debug logging.
      8090: Tweaked session cache limiting for AVM.
      8095: Fix for issue raised in ACT 402
      8108: Fix for AWC-1816
      8115: Build fix 
      8117: Fix AR-1217: OpenOffice connection is actively maintained

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-03-10 15:22:43 +00:00
parent 316924e8de
commit 1f8c86d46d
13 changed files with 230 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/attributes-service-context.xml
View File

@@ -13,7 +13,7 @@
</property>
<property name="interceptorNames">
<list>
<value>sessionSizeResourceInterceptor</value>
<value>avmSessionSizeResourceInterceptor</value>
</list>
</property>
</bean>

22
config/alfresco/avm-services-context.xml
View File

@@ -378,4 +378,26 @@
</property>
</bean>
<bean id="avmSessionSizeResourceInterceptor" class="org.alfresco.repo.transaction.TransactionResourceInterceptor" >
<property name="methodResourceManagers">
<list>
<ref bean="avmSessionSizeResourceManager"></ref>
</list>
</property>
<property name="elapsedTimeBeforeActivationMillis">
<value>500</value>
</property>
<property name="resourceManagerCallFrequencyMillis">
<value>250</value>
</property>
</bean>
<bean id="avmSessionSizeResourceManager" class="org.alfresco.repo.domain.hibernate.SessionSizeResourceManager">
<property name="sessionFactory">
<ref bean="sessionFactory" />
</property>
<property name="threshold">
<value>100</value>
</property>
</bean>
</beans>

18
config/alfresco/extension/index-recovery-context.xml.sample
View File

@@ -3,12 +3,8 @@
<beans>
<!-- Forces the reindexing of nodes where content may have been missing before -->
<!--
This component can be triggered at intervals where asynchronous content sharing
between clustered servers has been set up.
-->
<bean id="missingContentReindexTrigger" class="org.alfresco.util.TriggerBean">
<!-- Forces the reindexing of content where full text extraction has previously failed -->
<bean id="missingFullTextReindexTrigger" class="org.alfresco.util.CronTriggerBean">
<property name="jobDetail">
<bean class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
@@ -17,7 +13,7 @@
<property name="jobDataAsMap">
<map>
<entry key="indexRecoveryComponent">
<ref bean="missingContentReindexComponent" />
<ref bean="missingFullTextReindexComponent" />
</entry>
</map>
</property>
@@ -26,12 +22,8 @@
<property name="scheduler">
<ref bean="schedulerFactory" />
</property>
<!-- Give the server 5 minutes and then check for missing content -->
<property name="startDelayMinutes">
<value>5</value>
</property>
<property name="repeatCount">
<value>0</value>
<property name="cronExpression">
<value>0 0 21 * * ?</value>
</property>
</bean>

12
config/alfresco/index-recovery-context.xml
View File

@@ -143,10 +143,16 @@
</property>
</bean>
<!-- Missing Content -->
<!-- Bean that attempts to index content that was previously missing -->
<!-- Failed FTS reindexer -->
<!--
Bean that triggers full text indexing for content that was previously flagged with:
nitf: Not Indexed Transformation Failed
nicm: Not Indexed Content Missing
nint: Not Indexed No Transformation
Use a CronTriggerBean and Quartz scheduler to trigger as required
-->
<bean
id="missingContentReindexComponent"
id="missingFullTextReindexComponent"
class="org.alfresco.repo.node.index.MissingContentReindexComponent"
parent="indexRecoveryComponentBase">
</bean>

4
config/alfresco/messages/system-messages.properties
View File

@@ -16,4 +16,6 @@ system.config_check.warn.starting_with_errors=Alfresco is starting with errors.
# OpenOffice
system.openoffice.info.connection_verified=The connection to OpenOffice has been established.
system.openoffice.err.connection_failed=A connection to OpenOffice could not be established.
system.openoffice.err.connection_failed=An initial OpenOffice connection could not be established.
system.openoffice.err.connection_lost=The OpenOffice connection has been lost.
system.openoffice.err.connection_remade=The OpenOffice connection was re-established.

2
config/alfresco/public-services-context.xml
View File

@@ -830,7 +830,7 @@
</property>
<property name="interceptorNames">
<list>
<value>sessionSizeResourceInterceptor</value>
<value>avmSessionSizeResourceInterceptor</value>
</list>
</property>
</bean>

3
config/alfresco/repository.properties
View File

@@ -56,6 +56,9 @@ system.bootstrap.config_check.strict=true
# 0 prevents further logins, including the ability to enter single-user mode
server.maxusers=-1
# The Cron expression controlling the frequency with which the OpenOffice connection is tested
openOffice.test.cronExpression=0 * * * * ?
#
# Properties to limit resources spent on individual searches
#

24
config/alfresco/scheduled-jobs-context.xml
View File

@@ -133,6 +133,30 @@
</property>
</bean>
<bean id="openOfficeConnectionTesterJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
<value>org.alfresco.util.OpenOfficeConnectionTester$OpenOfficeConnectionTesterJob</value>
</property>
<property name="jobDataAsMap">
<map>
<entry key="openOfficeConnectionTester">
<ref bean="openOfficeConnectionTester" />
</entry>
</map>
</property>
</bean>
<bean id="openOfficeConnectionTesterTrigger" class="org.alfresco.util.CronTriggerBean">
<property name="jobDetail">
<ref bean="openOfficeConnectionTesterJobDetail" />
</property>
<property name="scheduler">
<ref bean="schedulerFactory" />
</property>
<property name="cronExpression">
<value>${openOffice.test.cronExpression}</value>
</property>
</bean>
<bean id="indexBackupJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
<value>org.alfresco.repo.search.impl.lucene.AbstractLuceneIndexerAndSearcherFactory$LuceneIndexBackupJob</value>