Fix SVN issues

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / resources / org / argeo / slc / core / execution / spring.xml

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 090b8f6a8274ed549b0d4d8cbacf21d102152193..a21f302463f50cca43d6f5f8baeea5c5d8f1ce48 100644 (file)
--- 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
@@ -8,13 +8,16 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
        <import resource="specs.xml" />
+       <import resource="templates.xml" />
+       <import resource="defaults.xml" />
+       <import resource="utils.xml" />
        <import resource="tasks/core.xml" />
 
        <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
                <property name="scopes">
                        <map>
                                <entry key="execution">
-                                       <ref local="executionScope"/>
+                                       <ref local="executionScope" />
                                </entry>
                        </map>
                </property>
@@ -23,39 +26,33 @@
        <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" >
-               <property name="executionContext">
-                       <ref local="executionContext" />
-               </property>
-               <property name="executionScope">
-                       <ref local="executionScope"/>
-               </property>
-               <property name="instantiationManager">
-                       <ref local="instantiationManager" />
-               </property>             
+       <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="instantiationManager" ref="instantiationManager" />
        </bean>
 
        <bean class="org.argeo.slc.core.execution.InstantiationPostProcessor">
-               <property name="instantiationManager">
-                       <ref local="instantiationManager" />
-               </property>
+               <property name="instantiationManager" ref="instantiationManager" />
        </bean>
-               
+
        <bean class="org.argeo.slc.core.execution.ExecutionAspect">
-               <property name="executionContext">
-                       <ref local="executionContext" />
-               </property>
+               <property name="executionContext" ref="executionContext" />
        </bean>
 
        <aop:aspectj-autoproxy />