From ae4017368241afd73407d8ac0aca768cf1534a2d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 30 Jun 2009 14:53:07 +0000
Subject: [PATCH 1/1] Refactor runtime

git-svn-id: https://svn.argeo.org/slc/trunk@2633 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/slc/core/execution/runtime.xml  | 46 +++++++++++++++++++
 .../org/argeo/slc/core/execution/spring.xml   | 39 +++-------------
 2 files changed, 52 insertions(+), 33 deletions(-)
 create mode 100644 runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml

diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml
new file mode 100644
index 000000000..8ed4e4c7b
--- /dev/null
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+	
+	<description>Minimal configuration</description>
+	
+	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+		<property name="scopes">
+			<map>
+				<entry key="execution">
+					<ref local="executionScope" />
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
+
+	<bean id="executionStack" class="org.argeo.slc.core.execution.DefaultExecutionStack"
+		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="executionContext" />
+		<property name="instantiationManager" ref="instantiationManager" />
+	</bean>
+
+	<bean class="org.argeo.slc.core.execution.ExecutionAspect">
+		<property name="executionStack" ref="executionStack" />
+		<property name="executionContext" ref="executionContext" />
+	</bean>
+
+	<aop:aspectj-autoproxy />
+
+</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml
index 8b3f6dbba..6548f8a3c 100644
--- a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml
@@ -7,54 +7,27 @@
 	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
+	<description>Default Capabilities</description>
+
+	<import resource="runtime.xml" />
 	<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" />
-				</entry>
-			</map>
-		</property>
+	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext"
+		scope="execution">
+		<aop:scoped-proxy />
 	</bean>
 
-	<bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
-
 	<bean
 		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">
-		<aop:scoped-proxy />
-	</bean>
-	<bean id="executionStack" class="org.argeo.slc.core.execution.DefaultExecutionStack"
-		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="executionContext" />
-		<property name="instantiationManager" ref="instantiationManager" />
-	</bean>
-
-	<bean class="org.argeo.slc.core.execution.ExecutionAspect">
-		<property name="executionStack" ref="executionStack" />
-		<property name="executionContext" ref="executionContext" />
-	</bean>
-
-	<aop:aspectj-autoproxy />
-
 </beans>
\ No newline at end of file
-- 
2.39.2