svn commit: r1397346 - /archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml

[olamy]

Author: olamy
Date: Thu Oct 11 22:43:27 2012
New Revision: 1397346

URL: http://svn.apache.org/viewvc?rev=1397346&view=rev
Log:
[MRM-1692] Archiva should allow PropertyPlaceholderConfigurer in 
applicationContext.xml
Submitted by Charles Kim.

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml?rev=1397346&r1=1397345&r2=1397346&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
 Thu Oct 11 22:43:27 2012
@@ -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>