]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Introduce SLC Execution
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 21 Feb 2009 13:14:33 +0000 (13:14 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 21 Feb 2009 13:14:33 +0000 (13:14 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@2160 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

runtime/org.argeo.slc.execution/.project
runtime/org.argeo.slc.execution/.springBeans
runtime/org.argeo.slc.execution/pom.xml
runtime/org.argeo.slc.execution/src/slc/conf/BasicExecutionFlow.groovy [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/basic.xml [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/common.xml [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/main.xml [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/slc.properties [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/test.xml [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-001.xml [deleted file]
runtime/org.argeo.slc.execution/src/slc/conf/testCases/basic-002.xml [deleted file]

index 63e0d74086440933e6a39d17233e9dbc87326a56..63788ab3e9b9bb9e69a2e6f96830882599d2be94 100644 (file)
@@ -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>
index 07dddcb5821c6f5f83c854b364361808abb12967..c11d814860ade8dba00c82079d3507a8a3952aee 100644 (file)
@@ -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>
index 1025a48ce4c87aeeceb2093748b18a1dd7946185..bd0025ed396a165d68be63397a3331b64267aa53 100644 (file)
@@ -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 (file)
index da3926e..0000000
+++ /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 (file)
index 5e1c46e..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <import resource="common.xml" />\r
-\r
-       <bean id="basic.executionSpec" class="org.argeo.slc.execution.SimpleExecutionSpec">\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="testedComponentId">\r
-                                       <bean parent="specAttribute" p:value="100" />\r
-                               </entry>\r
-                               <entry key="testData1">\r
-                                       <bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="basic.ref" factory-bean="basic.executionSpec"\r
-               factory-method="createRef" abstract="true" />\r
-\r
-       <bean id="basic.executionFlowTemplate" class="org.argeo.slc.execution.SimpleExecutionFlow"\r
-               abstract="true">\r
-               <property name="executionSpec" ref="basic.executionSpec" />\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref bean="echo1" />\r
-                               <bean parent="testRun">\r
-                                       <property name="testDefinition" ref="testDef" />\r
-                                       <property name="testData">\r
-                                               <bean parent="basic.ref">\r
-                                                       <constructor-arg value="testData1" />\r
-                                               </bean>\r
-                                       </property>\r
-                               </bean>\r
-                               <bean parent="testRun">\r
-                                       <property name="testDefinition" ref="testDef" />\r
-                                       <property name="testData" ref="ref1" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="ref1" parent="basic.ref" scope="prototype">\r
-               <constructor-arg value="testData2" />\r
-       </bean>\r
-\r
-       <bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />\r
-\r
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="testResult" />\r
-       </bean>\r
-\r
-       <!--\r
-               <bean class="org.springframework.aop.framework.ProxyFactoryBean">\r
-               <property name="targetClass"\r
-               value="org.argeo.slc.core.test.BasicTestData" /> <property\r
-               name="targetSource"> <bean\r
-               class="org.argeo.slc.executionflow.ExecutionTargetSource"> <property\r
-               name="name" value="testData" /> <property name="targetClass"\r
-               value="org.argeo.slc.core.test.BasicTestData" /> </bean> </property>\r
-               <property name="proxyTargetClass" value="true" /> </bean>\r
-       -->\r
-\r
-</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 (file)
index 4495b2f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <bean id="specAttribute" class="org.argeo.slc.execution.SimpleSpecAttribute"\r
-               abstract="true" />\r
-\r
-       <bean id="refAttribute" class="org.argeo.slc.execution.RefSpecAttribute"\r
-               abstract="true" />\r
-\r
-</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 (file)
index 829e6ee..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <import resource="testCases/basic-001.xml" />\r
-       <import resource="testCases/basic-002.xml" />\r
-\r
-       <bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">\r
-               <property name="executionSpec">\r
-                       <bean class="org.argeo.slc.execution.SimpleExecutionSpec">\r
-                               <property name="attributes">\r
-                                       <map>\r
-                                               <entry key="testKey">\r
-                                                       <bean parent="specAttribute" p:value="660" />\r
-                                               </entry>\r
-                                       </map>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref local="echo1" />\r
-                               <ref bean="basic.001" />\r
-                               <ref bean="basic.001" />\r
-                               <ref bean="basic.002" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="echo1" parent="echoTemplate" scope="execution">\r
-               <property name="message" value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
-               <aop:scoped-proxy />\r
-       </bean>\r
-\r
-       <bean id="echoTemplate" class="org.argeo.slc.execution.tasks.Echo"\r
-               abstract="true">\r
-       </bean>\r
-\r
-       <context:annotation-config />\r
-       <bean class="org.argeo.slc.execution.ExecutionRegister" />\r
-\r
-\r
-       <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">\r
-               <property name="scopes">\r
-                       <map>\r
-                               <entry key="execution">\r
-                                       <bean class="org.argeo.slc.execution.ExecutionScope" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
-       <bean class="org.argeo.slc.execution.ExecutionParameterPostProcessor" />\r
-       <bean class="org.argeo.slc.execution.InstantiationPostProcessor" />\r
-       <bean class="org.argeo.slc.execution.Executor" />\r
-\r
-       <bean class="org.argeo.slc.execution.ExecutionAspect"></bean>\r
-       <aop:aspectj-autoproxy />\r
-\r
-</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 (file)
index b18dce1..0000000
+++ /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 (file)
index 6cc40e8..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:lang="http://www.springframework.org/schema/lang"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       ">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <import resource="testCases/basic-001.xml" />\r
-       <import resource="testCases/basic-002.xml" />\r
-\r
-       <bean id="executionFlow.basic1" class="org.argeo.slc.executionflow.SimpleExecutionFlow">\r
-               <meta key="meta1" value="mata1Value" />\r
-               <qualifier>\r
-                       <attribute key="qual1" value="qual1value" />\r
-               </qualifier>\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref local="testGroovyImpl" />\r
-                               <ref local="testBshImpl" />\r
-                               <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                                       p:testData-ref="testData-${testCase}" />\r
-                               <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                                       p:testData-ref="testData-${testCase}" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <lang:groovy id="executionFlow.groovy1" script-source="src/slc/conf/BasicExecutionFlow.groovy">\r
-               <lang:property name="firstSubTest">\r
-                       <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                               p:testData-ref="testData-${testCase}" />\r
-               </lang:property>\r
-       </lang:groovy>\r
-\r
-       <bean id="testGroovyImpl" parent="testGroovy">\r
-               <property name="message" value="Hello World! Groovy" />\r
-       </bean>\r
-       <bean id="testBshImpl" parent="testBsh">\r
-               <property name="message" value="Hello World! Beanshell" />\r
-       </bean>\r
-\r
-       <bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
-\r
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult">\r
-       </bean>\r
-\r
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="testResult" />\r
-       </bean>\r
-\r
-       <lang:groovy id="testGroovyBean">\r
-               <lang:inline-script><![CDATA[\r
-               class Message {\r
-               String message = 'test'\r
-               \r
-               public String getMessage(){\r
-                       return message;\r
-               }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:groovy>\r
-\r
-       <lang:groovy id="testGroovy">\r
-               <lang:inline-script><![CDATA[\r
-               class GroovyMessenger extends org.argeo.slc.core.test.SimpleTestRun {\r
-       \r
-               String message = 'test'\r
-       \r
-                       void execute(){\r
-                               println(message);\r
-                       }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:groovy>\r
-\r
-       <lang:bsh id="testBsh" script-interfaces="org.argeo.slc.test.ExecutableTestRun">\r
-               <lang:inline-script><![CDATA[\r
-               setStrictJava(true);\r
-\r
-               class BshMessenger extends org.argeo.slc.core.test.SimpleTestRun {\r
-\r
-                       String message = "test";\r
-\r
-                       public void execute(){\r
-                               System.out.println(message);\r
-                       }\r
-                       \r
-                       public void setMessage(String message){\r
-                               this.message = message;\r
-                       }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:bsh>\r
-\r
-</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 (file)
index 0131cc2..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <import resource="../basic.xml" />\r
-\r
-       <bean id="basic.001" parent="basic.executionFlowTemplate">\r
-               <property name="parameters">\r
-                       <map>\r
-                               <entry key="testData1" value-ref="basic.001.testData" />\r
-                               <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">\r
-                                               <aop:scoped-proxy />\r
-                                               <property name="expected" value="tata101" />\r
-                                               <property name="reached" value="tata@{testKey}" />\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"\r
-               scope="execution">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata100" />\r
-               <property name="reached" value="tata@{testedComponentId}" />\r
-       </bean>\r
-\r
-       <bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">\r
-       </bean>\r
-\r
-</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 (file)
index fc52a03..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import resource="../basic.xml" />\r
-\r
-       <bean id="basic.002" parent="basic.executionFlowTemplate">\r
-               <property name="parameters">\r
-                       <map>\r
-                               <entry key="testData1">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                               <property name="expected" value="toto" />\r
-                                               <property name="reached" value="toto" />\r
-                                       </bean>\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                               <property name="expected" value="tata" />\r
-                                               <property name="reached" value="toto" />\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-</beans>
\ No newline at end of file