From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 22 Jun 2009 13:14:54 +0000 (+0000)
Subject: Make default properties placeholder configurer for execution more permissive
X-Git-Tag: argeo-slc-2.1.7~1774
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=1a352fa091424bda524c18b9d23e6c548578a76d;p=gpl%2Fargeo-slc.git

Make default properties placeholder configurer for execution more permissive

git-svn-id: https://svn.argeo.org/slc/trunk@2568 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
index 33d4b7ef8..a21f30246 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
+++ b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
@@ -17,7 +17,7 @@
 		<property name="scopes">
 			<map>
 				<entry key="execution">
-					<ref local="executionScope"/>
+					<ref local="executionScope" />
 				</entry>
 			</map>
 		</property>
@@ -26,27 +26,31 @@
 	<bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
 
 	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>
 
-	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext" scope="execution">
+	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext"
+		scope="execution">
 		<aop:scoped-proxy />
 	</bean>
 
 	<bean id="instantiationManager" class="org.argeo.slc.core.execution.InstantiationManager" />
-	
-	<bean id="parameterRef" factory-bean="instantiationManager" factory-method="createRef"
-		abstract="true" />	
 
-	<bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor" >
+	<bean id="parameterRef" factory-bean="instantiationManager"
+		factory-method="createRef" abstract="true" />
+
+	<bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor">
 		<property name="executionContext" ref="executionContext" />
-		<property name="executionScope" ref="executionScope"/>
+		<property name="executionScope" ref="executionScope" />
 		<property name="instantiationManager" ref="instantiationManager" />
 	</bean>
 
 	<bean class="org.argeo.slc.core.execution.InstantiationPostProcessor">
 		<property name="instantiationManager" ref="instantiationManager" />
 	</bean>
-		
+
 	<bean class="org.argeo.slc.core.execution.ExecutionAspect">
 		<property name="executionContext" ref="executionContext" />
 	</bean>