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

Fix up LegacyConfigPostProcessor for Spring v3

Browse Source 
- has to implement PriorityOrdered interface to be fired at the right point
- should fix up RM build problems

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-11-26 14:37:39 +00:00
parent 1a481a63c2
commit bf7da50140
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/management/subsystems/LegacyConfigPostProcessor.java
View File

@@ -26,7 +26,6 @@ package org.alfresco.repo.management.subsystems;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Properties;
import java.util.Set; import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -41,8 +40,10 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.config.TypedStringValue; import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.support.ManagedList;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.PriorityOrdered;
/** /**
* A {@link BeanFactoryPostProcessor} that upgrades old-style Spring overrides that add location paths to the * A {@link BeanFactoryPostProcessor} that upgrades old-style Spring overrides that add location paths to the
@@ -52,7 +53,7 @@ import org.springframework.core.Ordered;
* *
* @author dward * @author dward
*/ */
public class LegacyConfigPostProcessor implements BeanFactoryPostProcessor, Ordered public class LegacyConfigPostProcessor implements BeanFactoryPostProcessor, PriorityOrdered
{ {
/** The name of the bean that, in new configurations, holds all properties */ /** The name of the bean that, in new configurations, holds all properties */
private static final String BEAN_NAME_GLOBAL_PROPERTIES = "global-properties"; private static final String BEAN_NAME_GLOBAL_PROPERTIES = "global-properties";
@@ -128,12 +129,17 @@ public class LegacyConfigPostProcessor implements BeanFactoryPostProcessor, Orde
.getSingleton(LegacyConfigPostProcessor.BEAN_NAME_REPOSITORY_PROPERTIES); .getSingleton(LegacyConfigPostProcessor.BEAN_NAME_REPOSITORY_PROPERTIES);
if (repositoryConfigurer != null) if (repositoryConfigurer != null)
{ {
repositoryConfigurer.setIgnoreUnresolvablePlaceholders(true); // Reset locations list
repositoryConfigurer.setLocalOverride(false); repositoryConfigurer.setLocations(null);
repositoryConfigurer.setSystemPropertiesModeName("SYSTEM_PROPERTIES_MODE_NEVER");
// At this point we're going to have to resolve the actual global properties bean and reference it! // Invalidate cached merged bean definitions
repositoryConfigurer.setProperties((Properties) beanFactory ((BeanDefinitionRegistry) beanFactory).registerBeanDefinition(
.getBean(LegacyConfigPostProcessor.BEAN_NAME_GLOBAL_PROPERTIES)); LegacyConfigPostProcessor.BEAN_NAME_REPOSITORY_PROPERTIES, beanFactory
.getBeanDefinition(LegacyConfigPostProcessor.BEAN_NAME_REPOSITORY_PROPERTIES));
// Reconfigure the bean according to its new definition
beanFactory.configureBean(repositoryConfigurer,
LegacyConfigPostProcessor.BEAN_NAME_REPOSITORY_PROPERTIES);
} }
} }
catch (NoSuchBeanDefinitionException e) catch (NoSuchBeanDefinitionException e)