diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-10-11 22:43:27 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-10-11 22:43:27 +0000 |
| commit | 1ac1207ab9844763eee64be21fb0358a9e438f86 (patch) | |
| tree | 947419ebd5f3276a4ca651edd6fc3e0f4da57ad3 /archiva-modules/archiva-base/archiva-policies | |
| parent | e7bc35db81e879f19a7846098d1f6eed31e1b142 (diff) | |
| download | archiva-1ac1207ab9844763eee64be21fb0358a9e438f86.tar.gz archiva-1ac1207ab9844763eee64be21fb0358a9e438f86.zip | |
[MRM-1692] Archiva should allow PropertyPlaceholderConfigurer in applicationContext.xml
Submitted by Charles Kim.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1397346 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-policies')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml index c02cbc097..3cf02da6a 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml @@ -26,7 +26,10 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd" default-lazy-init="true"> - <context:property-placeholder system-properties-mode="FALLBACK"/> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="ignoreUnresolvablePlaceholders" value="true"/> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/> + </bean> <context:annotation-config/> <context:component-scan base-package="org.apache.archiva.policies"/> @@ -51,4 +54,4 @@ <!-- 30 minutes = 1800 seconds --> <property name="timeToLiveSeconds" value="1800"/> </bean> -</beans>
\ No newline at end of file +</beans> |