From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 21 Feb 2009 13:14:33 +0000 (+0000)
Subject: Introduce SLC Execution
X-Git-Tag: argeo-slc-2.1.7~2139
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=598bba5b938e8e8f1774a884f39f6aecb27d8efc;p=gpl%2Fargeo-slc.git

Introduce SLC Execution

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

diff --git a/runtime/org.argeo.slc.execution/.project b/runtime/org.argeo.slc.execution/.project
index 63e0d7408..63788ab3e 100644
--- a/runtime/org.argeo.slc.execution/.project
+++ b/runtime/org.argeo.slc.execution/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>argeo.slc.executionflow</name>
+	<name>org.argeo.slc.execution</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/runtime/org.argeo.slc.execution/.springBeans b/runtime/org.argeo.slc.execution/.springBeans
index 07dddcb58..c11d81486 100644
--- a/runtime/org.argeo.slc.execution/.springBeans
+++ b/runtime/org.argeo.slc.execution/.springBeans
@@ -7,12 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[true]]></enableImports>
 	<configs>
-		<config>src/slc/conf/main.xml</config>
-		<config>src/slc/conf/testCases/basic-001.xml</config>
-		<config>src/slc/conf/testCases/basic-002.xml</config>
-		<config>src/slc/conf/basic.xml</config>
-		<config>src/slc/conf/common.xml</config>
-		<config>src/slc/conf/test.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/runtime/org.argeo.slc.execution/pom.xml b/runtime/org.argeo.slc.execution/pom.xml
index 1025a48ce..bd0025ed3 100644
--- a/runtime/org.argeo.slc.execution/pom.xml
+++ b/runtime/org.argeo.slc.execution/pom.xml
@@ -7,9 +7,9 @@
 		<version>0.11.3-SNAPSHOT</version>
 		<relativePath>../../org.argeo.slc</relativePath>
 	</parent>
-	<groupId>org.argeo.slc.sandbox</groupId>
-	<artifactId>org.argeo.slc.sandbox.executionflow</artifactId>
-	<name>SLC Sandbox Execution Flow</name>
+	<groupId>org.argeo.slc.runtime</groupId>
+	<artifactId>org.argeo.slc.sandbox.execution</artifactId>
+	<name>SLC Execution</name>
 	<packaging>jar</packaging>
 	<properties></properties>
 	<build>
@@ -53,4 +53,4 @@
 			<version>2.1.3</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/BasicExecutionFlow.groovy b/runtime/org.argeo.slc.execution/src/slc/conf/BasicExecutionFlow.groovy
deleted file mode 100644
index da3926ef8..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/BasicExecutionFlow.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-import org.argeo.slc.test.*;
-
-public class BasicExecutionFlow implements org.argeo.slc.executionflow.ExecutionFlow {
-
-	ExecutableTestRun firstSubTest = null;
-	ExecutableTestRun secondSubTest = null;
-
-	void execute(){
-		firstSubTest?.execute();
-		secondSubTest?.execute();
-	}
-}
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/basic.xml b/runtime/org.argeo.slc.execution/src/slc/conf/basic.xml
deleted file mode 100644
index 5e1c46e4f..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/basic.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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">
-
-	<import resource="common.xml" />
-
-	<bean id="basic.executionSpec" class="org.argeo.slc.execution.SimpleExecutionSpec">
-		<property name="attributes">
-			<map>
-				<entry key="testedComponentId">
-					<bean parent="specAttribute" p:value="100" />
-				</entry>
-				<entry key="testData1">
-					<bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />
-				</entry>
-				<entry key="testData2">
-					<bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="basic.ref" factory-bean="basic.executionSpec"
-		factory-method="createRef" abstract="true" />
-
-	<bean id="basic.executionFlowTemplate" class="org.argeo.slc.execution.SimpleExecutionFlow"
-		abstract="true">
-		<property name="executionSpec" ref="basic.executionSpec" />
-		<property name="executables">
-			<list>
-				<ref bean="echo1" />
-				<bean parent="testRun">
-					<property name="testDefinition" ref="testDef" />
-					<property name="testData">
-						<bean parent="basic.ref">
-							<constructor-arg value="testData1" />
-						</bean>
-					</property>
-				</bean>
-				<bean parent="testRun">
-					<property name="testDefinition" ref="testDef" />
-					<property name="testData" ref="ref1" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="ref1" parent="basic.ref" scope="prototype">
-		<constructor-arg value="testData2" />
-	</bean>
-
-	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />
-
-	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="testResult" />
-	</bean>
-
-	<!--
-		<bean class="org.springframework.aop.framework.ProxyFactoryBean">
-		<property name="targetClass"
-		value="org.argeo.slc.core.test.BasicTestData" /> <property
-		name="targetSource"> <bean
-		class="org.argeo.slc.executionflow.ExecutionTargetSource"> <property
-		name="name" value="testData" /> <property name="targetClass"
-		value="org.argeo.slc.core.test.BasicTestData" /> </bean> </property>
-		<property name="proxyTargetClass" value="true" /> </bean>
-	-->
-
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/common.xml b/runtime/org.argeo.slc.execution/src/slc/conf/common.xml
deleted file mode 100644
index 4495b2f83..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/common.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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">
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-	<bean id="specAttribute" class="org.argeo.slc.execution.SimpleSpecAttribute"
-		abstract="true" />
-
-	<bean id="refAttribute" class="org.argeo.slc.execution.RefSpecAttribute"
-		abstract="true" />
-
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/main.xml b/runtime/org.argeo.slc.execution/src/slc/conf/main.xml
deleted file mode 100644
index 829e6ee5b..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/main.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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" xmlns:context="http://www.springframework.org/schema/context"
-	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/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<import resource="testCases/basic-001.xml" />
-	<import resource="testCases/basic-002.xml" />
-
-	<bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">
-		<property name="executionSpec">
-			<bean class="org.argeo.slc.execution.SimpleExecutionSpec">
-				<property name="attributes">
-					<map>
-						<entry key="testKey">
-							<bean parent="specAttribute" p:value="660" />
-						</entry>
-					</map>
-				</property>
-			</bean>
-		</property>
-		<property name="executables">
-			<list>
-				<ref local="echo1" />
-				<ref bean="basic.001" />
-				<ref bean="basic.001" />
-				<ref bean="basic.002" />
-			</list>
-		</property>
-	</bean>
-
-	<bean id="echo1" parent="echoTemplate" scope="execution">
-		<property name="message" value="From main! @{testKey}, slc.flows=@{slc.flows}" />
-		<aop:scoped-proxy />
-	</bean>
-
-	<bean id="echoTemplate" class="org.argeo.slc.execution.tasks.Echo"
-		abstract="true">
-	</bean>
-
-	<context:annotation-config />
-	<bean class="org.argeo.slc.execution.ExecutionRegister" />
-
-
-	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
-		<property name="scopes">
-			<map>
-				<entry key="execution">
-					<bean class="org.argeo.slc.execution.ExecutionScope" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-	<bean class="org.argeo.slc.execution.ExecutionParameterPostProcessor" />
-	<bean class="org.argeo.slc.execution.InstantiationPostProcessor" />
-	<bean class="org.argeo.slc.execution.Executor" />
-
-	<bean class="org.argeo.slc.execution.ExecutionAspect"></bean>
-	<aop:aspectj-autoproxy />
-
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/slc.properties b/runtime/org.argeo.slc.execution/src/slc/conf/slc.properties
deleted file mode 100644
index b18dce171..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/slc.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.executionflow.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.executionflow.ExecutionContext=TRACE
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
-testCase=002
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/test.xml b/runtime/org.argeo.slc.execution/src/slc/conf/test.xml
deleted file mode 100644
index 6cc40e80e..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/test.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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:lang="http://www.springframework.org/schema/lang"
-	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
-	">
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-	<import resource="testCases/basic-001.xml" />
-	<import resource="testCases/basic-002.xml" />
-
-	<bean id="executionFlow.basic1" class="org.argeo.slc.executionflow.SimpleExecutionFlow">
-		<meta key="meta1" value="mata1Value" />
-		<qualifier>
-			<attribute key="qual1" value="qual1value" />
-		</qualifier>
-		<property name="executables">
-			<list>
-				<ref local="testGroovyImpl" />
-				<ref local="testBshImpl" />
-				<bean parent="testRun" p:testDefinition-ref="testDef"
-					p:testData-ref="testData-${testCase}" />
-				<bean parent="testRun" p:testDefinition-ref="testDef"
-					p:testData-ref="testData-${testCase}" />
-			</list>
-		</property>
-	</bean>
-
-	<lang:groovy id="executionFlow.groovy1" script-source="src/slc/conf/BasicExecutionFlow.groovy">
-		<lang:property name="firstSubTest">
-			<bean parent="testRun" p:testDefinition-ref="testDef"
-				p:testData-ref="testData-${testCase}" />
-		</lang:property>
-	</lang:groovy>
-
-	<bean id="testGroovyImpl" parent="testGroovy">
-		<property name="message" value="Hello World! Groovy" />
-	</bean>
-	<bean id="testBshImpl" parent="testBsh">
-		<property name="message" value="Hello World! Beanshell" />
-	</bean>
-
-	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-
-	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult">
-	</bean>
-
-	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="testResult" />
-	</bean>
-
-	<lang:groovy id="testGroovyBean">
-		<lang:inline-script><![CDATA[
-		class Message {
-		String message = 'test'
-		
-		public String getMessage(){
-			return message;
-		}
-		}
-		]]></lang:inline-script>
-	</lang:groovy>
-
-	<lang:groovy id="testGroovy">
-		<lang:inline-script><![CDATA[
-		class GroovyMessenger extends org.argeo.slc.core.test.SimpleTestRun {
-	
-		String message = 'test'
-	
-			void execute(){
-				println(message);
-			}
-		}
-		]]></lang:inline-script>
-	</lang:groovy>
-
-	<lang:bsh id="testBsh" script-interfaces="org.argeo.slc.test.ExecutableTestRun">
-		<lang:inline-script><![CDATA[
-		setStrictJava(true);
-
-		class BshMessenger extends org.argeo.slc.core.test.SimpleTestRun {
-
-			String message = "test";
-
-			public void execute(){
-				System.out.println(message);
-			}
-			
-			public void setMessage(String message){
-				this.message = message;
-			}
-		}
-		]]></lang:inline-script>
-	</lang:bsh>
-
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-001.xml b/runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-001.xml
deleted file mode 100644
index 0131cc273..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-001.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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">
-
-	<import resource="../basic.xml" />
-
-	<bean id="basic.001" parent="basic.executionFlowTemplate">
-		<property name="parameters">
-			<map>
-				<entry key="testData1" value-ref="basic.001.testData" />
-				<entry key="testData2">
-					<bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">
-						<aop:scoped-proxy />
-						<property name="expected" value="tata101" />
-						<property name="reached" value="tata@{testKey}" />
-					</bean>
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"
-		scope="execution">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata100" />
-		<property name="reached" value="tata@{testedComponentId}" />
-	</bean>
-
-	<bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-002.xml b/runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-002.xml
deleted file mode 100644
index fc52a03f1..000000000
--- a/runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-002.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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"
-
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import resource="../basic.xml" />
-
-	<bean id="basic.002" parent="basic.executionFlowTemplate">
-		<property name="parameters">
-			<map>
-				<entry key="testData1">
-					<bean class="org.argeo.slc.core.test.BasicTestData">
-						<property name="expected" value="toto" />
-						<property name="reached" value="toto" />
-					</bean>
-				</entry>
-				<entry key="testData2">
-					<bean class="org.argeo.slc.core.test.BasicTestData">
-						<property name="expected" value="tata" />
-						<property name="reached" value="toto" />
-					</bean>
-				</entry>
-			</map>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file