mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-22 15:12:38 +00:00
adc940f961
Merged DEV/LIVECYCLE-3.1 to V3.1
12665: Merged V2.1-A to DEV\LIVECYCLE-3.1
8615: Cluster startup and property setting enhancements
8657: Fixed shutdown procedure for JGroups
8676: Enable system property overriding of more JGroups TCP stack properties
- ${alfresco.tcp.start_port:7800}
- ${alfresco.tcp.port_range:3}
8678: More logging of cluster view changes and channel factory config during startup
12667: Merged V2.1-A to DEV/LIVECYCLE-3.1
9188: Index recovery job only calls through if property 'alfresco.cluster.name' has been set
9197: Fixed unit test after bean property name change
12793: Merged V2.1-A to DEV/LIVECYCLE-3.1
7765: Requested mimetypes
8526: Updated Mimetypes
8610: Mimetype changes
Many branding and other non-core changes were omitted
12848: Fixed JAWS-223: Adobe LC Hibernate Dialect Loading
- Hibernate dialect can be null or empty and will be autodetected from the database metadata
- Property 'hibernate.dialect' is set on the System
- iBatis loading (activities) checks for 'hibernate.dialect'
- SchemaBootstrap checks for 'hibernate.dialect'
12854: Merged V2.1-A to DEV/LIVECYCLE-3.1
8681: Fixed mimetype 'application/photoshop'
12856: Merged V2.1-A to DEV/LIVECYCLE-3.1
9008: Fixed ADB-64: NPE when applying aspect cm:mlDocument
12857: Merged V2.1-A to DEV/LIVECYCLE-3.1
9032: ACT-2303: "Namespace is displayed in the Node browser is www.alfresco.org ...
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r7765,8526,8610,8615,8657,8676,8678,9188,9197
Merged /alfresco/BRANCHES/V3.1:r12894
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12665,12667,12793,12848,12854,12856-12857
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
49 lines
2.1 KiB
XML
49 lines
2.1 KiB
XML
<?xml version='1.0' encoding='UTF-8'?>
|
|
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
|
|
|
|
<!--
|
|
This shows the common minimum configuration overrides.
|
|
By default, the content and indexes are located at a relative location, which should only
|
|
be used when doing a quick preview of the Alfresco server.
|
|
-->
|
|
<beans>
|
|
|
|
<!-- overriding to point to custom properties -->
|
|
<bean id="repository-properties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
|
<property name="ignoreUnresolvablePlaceholders">
|
|
<value>true</value>
|
|
</property>
|
|
<property name="locations">
|
|
<list>
|
|
<value>classpath:alfresco/repository.properties</value>
|
|
<value>classpath:alfresco/version.properties</value>
|
|
<value>classpath:alfresco/domain/transaction.properties</value>
|
|
|
|
<!-- Override basic repository properties -->
|
|
<value>classpath:alfresco/extension/custom-repository.properties</value>
|
|
</list>
|
|
</property>
|
|
<property name="systemPropertiesModeName">
|
|
<value>SYSTEM_PROPERTIES_MODE_OVERRIDE</value>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="hibernateConfigProperties" class="org.alfresco.config.SystemPropertiesFactoryBean">
|
|
<property name="systemProperties">
|
|
<list>
|
|
<value>hibernate.dialect</value>
|
|
<value>hibernate.query.substitutions</value>
|
|
<value>hibernate.jdbc.use_get_generated_keys</value>
|
|
<value>hibernate.default_schema</value>
|
|
</list>
|
|
</property>
|
|
<property name="locations">
|
|
<list>
|
|
<value>classpath:alfresco/domain/hibernate-cfg.properties</value>
|
|
<!-- Override hibernate dialect -->
|
|
<value>classpath:alfresco/extension/custom-hibernate-dialect.properties</value>
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
</beans> |