From 6e85f8426af9062787d97b74704a66cb835b6f23 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Wed, 10 Oct 2012 16:13:10 +0000 Subject: [PATCH] Merged BRANCHES/DEV/mward/clustering_p1b to HEAD: 42438: ALF-15888: stopped enterprise hibernate-cfg.properties from being added to global properties. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/management/subsystems/LegacyConfigPostProcessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java b/source/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java index f5c4c23e07..a62adc0296 100644 --- a/source/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java +++ b/source/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java @@ -113,7 +113,8 @@ public class LegacyConfigPostProcessor implements BeanFactoryPostProcessor, Prio MutablePropertyValues hibernateProperties = processLocations(beanFactory, globalPropertyLocations, LegacyConfigPostProcessor.BEAN_NAME_HIBERNATE_PROPERTIES, new String[] { - "classpath:alfresco/domain/hibernate-cfg.properties" + "classpath:alfresco/domain/hibernate-cfg.properties", + "classpath*:alfresco/enterprise/cache/hibernate-cfg.properties" }); // Fix up additional properties to enforce correct order of precedence hibernateProperties.addPropertyValue("localOverride", Boolean.TRUE);