From: Olivier Lamy <olamy@apache.org>
Date: Thu, 11 Oct 2012 22:43:27 +0000 (+0000)
Subject: [MRM-1692] Archiva should allow PropertyPlaceholderConfigurer in applicationContext.xml
X-Git-Tag: archiva-1.4-M4~778
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1ac1207ab9844763eee64be21fb0358a9e438f86;p=archiva.git

[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
---

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>