mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should go together by tomorrow AM (for me) I'll dig back in. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -0,0 +1,57 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
|
||||
|
||||
<!--
|
||||
An example of how to override the dataSource bean.
|
||||
If an alternative pool is desired, such as C3P0, then it can be referenced by
|
||||
changing the 'class' attribute and adding or removing the required properties.
|
||||
The required libraries can be dropped into the servers extension lib folders.
|
||||
-->
|
||||
<beans>
|
||||
|
||||
<!-- Datasource bean -->
|
||||
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
|
||||
<!-- connection settings -->
|
||||
<property name="driverClassName">
|
||||
<value>${db.driver}</value>
|
||||
</property>
|
||||
<property name="url">
|
||||
<value>${db.url}</value>
|
||||
</property>
|
||||
<property name="username">
|
||||
<value>${db.username}</value>
|
||||
</property>
|
||||
<property name="password">
|
||||
<value>${db.password}</value>
|
||||
</property>
|
||||
<property name="defaultAutoCommit" >
|
||||
<value>false</value>
|
||||
</property>
|
||||
<!-- pool settings -->
|
||||
<property name="initialSize" >
|
||||
<value>${db.pool.initial}</value>
|
||||
</property>
|
||||
<property name="maxActive" >
|
||||
<value>${db.pool.max}</value>
|
||||
</property>
|
||||
<property name="timeBetweenEvictionRunsMillis" >
|
||||
<value>300000</value>
|
||||
</property>
|
||||
<property name="minEvictableIdleTimeMillis" >
|
||||
<value>-1</value>
|
||||
</property>
|
||||
<property name="testOnBorrow" >
|
||||
<value>false</value>
|
||||
</property>
|
||||
<property name="maxWait" >
|
||||
<value>50000</value>
|
||||
</property>
|
||||
<property name="testWhileIdle" >
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="validationQuery" >
|
||||
<value>select 1</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
@@ -9,7 +9,13 @@
|
||||
#db.pool.max=100
|
||||
|
||||
#
|
||||
# MySQL connection (This is default and requires mysql-connector-java-3.1.12-bin.jar, which ships with the Alfresco server)
|
||||
# HSQL connection
|
||||
#
|
||||
#db.driver=org.hsqldb.jdbcDriver
|
||||
#db.url=jdbc:hsqldb:file:alf_data/hsql_data/alfresco;ifexists=true;shutdown=true;
|
||||
|
||||
#
|
||||
# MySQL connection (This is default and requires mysql-connector-java-5.0.3-bin.jar, which ships with the Alfresco server)
|
||||
#
|
||||
#db.driver=org.gjt.mm.mysql.Driver
|
||||
#db.url=jdbc:mysql://localhost/alfresco
|
||||
|
@@ -7,6 +7,11 @@
|
||||
# For a full list: http://www.hibernate.org/hib_docs/v3/reference/en/html_single/#configuration-optional-dialects
|
||||
#
|
||||
|
||||
#
|
||||
# HSQL dialect
|
||||
#
|
||||
#hibernate.dialect=org.hibernate.dialect.HSQLDialect
|
||||
|
||||
#
|
||||
# MySQL dialect (default)
|
||||
#
|
||||
|
55
config/alfresco/extension/file-servers-custom.xml
Normal file
55
config/alfresco/extension/file-servers-custom.xml
Normal file
@@ -0,0 +1,55 @@
|
||||
<alfresco-config area="file-servers">
|
||||
|
||||
<!-- To override the default Alfresco filesystem use replace="true", to -->
|
||||
<!-- add additional filesystems remove the replace="true" attribute -->
|
||||
|
||||
<config evaluator="string-compare" condition="Filesystems" replace="true">
|
||||
<filesystems>
|
||||
|
||||
<filesystem name="Alfresco">
|
||||
<store>workspace://SpacesStore</store>
|
||||
<rootPath>/app:company_home</rootPath>
|
||||
|
||||
<!-- Add a URL file to each folder that links back to the web client -->
|
||||
<urlFile>
|
||||
<filename>__Alfresco.url</filename>
|
||||
<webpath>http://${localname}:8080/alfresco/</webpath>
|
||||
</urlFile>
|
||||
|
||||
<!-- Mark locked files as offline -->
|
||||
<offlineFiles/>
|
||||
|
||||
<!-- Desktop actions -->
|
||||
|
||||
<desktopActions>
|
||||
<global>
|
||||
<path>alfresco/desktop/Alfresco.exe</path>
|
||||
<webpath>http://${localname}:8080/alfresco/</webpath>
|
||||
</global>
|
||||
<action>
|
||||
<class>org.alfresco.filesys.smb.server.repo.desk.CheckInOutDesktopAction</class>
|
||||
<name>CheckInOut</name>
|
||||
<filename>__CheckInOut.exe</filename>
|
||||
</action>
|
||||
<action>
|
||||
<class>org.alfresco.filesys.smb.server.repo.desk.JavaScriptDesktopAction</class>
|
||||
<name>JavaScriptURL</name>
|
||||
<filename>__ShowDetails.exe</filename>
|
||||
<script>alfresco/desktop/showDetails.js</script>
|
||||
<attributes>anyFiles</attributes>
|
||||
<preprocess>copyToTarget</preprocess>
|
||||
</action>
|
||||
|
||||
</desktopActions>
|
||||
|
||||
<!--
|
||||
<accessControl default="Write">
|
||||
<user name="admin" access="Write"/>
|
||||
<address subnet="90.1.0.0" mask="255.255.0.0" access="Write"/>
|
||||
</accessControl>
|
||||
-->
|
||||
</filesystem>
|
||||
</filesystems>
|
||||
</config>
|
||||
|
||||
</alfresco-config>
|
71
config/alfresco/extension/index-tracking-context.xml.sample
Normal file
71
config/alfresco/extension/index-tracking-context.xml.sample
Normal file
@@ -0,0 +1,71 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
|
||||
|
||||
<beans>
|
||||
|
||||
<!-- Schedule index tracking every 30s -->
|
||||
<bean id="indexTrackerTrigger" 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="indexTrackerComponent" />
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="scheduler">
|
||||
<ref bean="schedulerFactory" />
|
||||
</property>
|
||||
<property name="cronExpression">
|
||||
<value>0,30 * * * * ?</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean
|
||||
id="indexTrackerComponent"
|
||||
class="org.alfresco.repo.node.index.IndexRemoteTransactionTracker"
|
||||
parent="indexRecoveryComponentBase">
|
||||
<property name="remoteOnly">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- 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">
|
||||
<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="missingContentReindexComponent" />
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<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>
|
||||
</bean>
|
||||
|
||||
</beans>
|
Reference in New Issue
Block a user