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
This commit is contained in:
Matt Ward
2012-10-10 16:13:10 +00:00
parent 40c30b52ce
commit 6e85f8426a

View File

@@ -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);