Demo structure

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

diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath
index 2bc0b0bd8d5168204f70dd5c0f10b72ec28440af..df54f154b2b041bb1e4df96b3f7a2f0714973c3d 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/.classpath
+++ b/demo/org.argeo.slc.demo.basic/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/resources"/>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/resources"/>

-       <classpathentry kind="src" path="src/slc"/>

        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="target/classes"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/demo/org.argeo.slc.demo.basic/.springBeans b/demo/org.argeo.slc.demo.basic/.springBeans
index 72eabe66e1e6962a05768a24b6ed0a200272f525..c11d814860ade8dba00c82079d3507a8a3952aee 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/.springBeans
+++ b/demo/org.argeo.slc.demo.basic/.springBeans
@@ -7,7 +7,6 @@
        </configSuffixes>
        <enableImports><![CDATA[true]]></enableImports>
        <configs>
        </configSuffixes>
        <enableImports><![CDATA[true]]></enableImports>
        <configs>

-               <config>src/slc/conf/main.xml</config>

        </configs>
        <configSets>
        </configSets>
        </configs>
        <configSets>
        </configSets>

diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
index 3bab63176122d6a60059c7247c67ec98d0808de4..33d29dd732415e6f4a1ecb1cf8c29fa887be96cc 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/org.argeo.slc.demo.basic/pom.xml
@@ -23,10 +23,9 @@
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>

-                                               <Export-Package>
-                                                       org.argeo.slc.*
-                                               </Export-Package>
+                                               <Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>

                                                <Require-Bundle>org.argeo.slc.execution,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
                                                <Require-Bundle>org.argeo.slc.execution,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>

+                                               <Spring-Context>conf/main.xml</Spring-Context>

                                        </instructions>
                                </configuration>
                        </plugin>
                                        </instructions>
                                </configuration>
                        </plugin>


@@ -34,7 +33,6 @@
        </build>
        <dependencies>
 
        </build>
        <dependencies>
 

-

                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.execution</artifactId>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.execution</artifactId>

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/BasicExecutionFlow.groovy
new file mode 100644 (file)
index 0000000..da3926e
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/BasicExecutionFlow.groovy
@@ -0,0 +1,12 @@
+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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
new file mode 100644 (file)
index 0000000..c2077f5
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
@@ -0,0 +1,85 @@
+<?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
+       <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
+ \r
+       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData"\r
+               >\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="tata" />\r
+       </bean>\r
+ \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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
new file mode 100644 (file)
index 0000000..4495b2f
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
@@ -0,0 +1,19 @@
+<?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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
new file mode 100644 (file)
index 0000000..aab3785
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
@@ -0,0 +1,75 @@
+<?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="common.xml" />\r
+\r
+       <import resource="basic.xml" />\r
+       <import resource="testCases/basic-001.xml" />\r
+       <import resource="testCases/basic-002.xml" />\r
+\r
+       <bean id="testLaunch" class="org.argeo.slc.execution.TestLaunch"\r
+               p:flowName="main" init-method="launch"/>\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"\r
+                       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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/slc.properties b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/slc.properties
new file mode 100644 (file)
index 0000000..b18dce1
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/slc.properties
@@ -0,0 +1,16 @@
+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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/test.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/test.xml
new file mode 100644 (file)
index 0000000..6cc40e8
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/test.xml
@@ -0,0 +1,105 @@
+<?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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
new file mode 100644 (file)
index 0000000..a542664
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
@@ -0,0 +1,35 @@
+<?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
+       <bean id="basic.001" parent="basic.executionFlowTemplate">\r
+               <constructor-arg>\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
+               </constructor-arg>\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/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
new file mode 100644 (file)
index 0000000..c2946fd
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
@@ -0,0 +1,25 @@
+<?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
+       <bean id="basic.002" parent="basic.executionFlowTemplate">\r
+               <constructor-arg>\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
+               </constructor-arg>\r
+       </bean>\r
+</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.basic/src/slc/conf/BasicExecutionFlow.groovy
deleted file mode 100644 (file)
index da3926e..0000000
--- a/demo/org.argeo.slc.demo.basic/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/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml
deleted file mode 100644 (file)
index c2077f5..0000000
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml
+++ /dev/null
@@ -1,85 +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
-       <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
- \r
-       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData"\r
-               >\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="tata" />\r
-       </bean>\r
- \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/demo/org.argeo.slc.demo.basic/src/slc/conf/common.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/common.xml
deleted file mode 100644 (file)
index 4495b2f..0000000
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/common.xml
+++ /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/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml
deleted file mode 100644 (file)
index aab3785..0000000
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml
+++ /dev/null
@@ -1,75 +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="common.xml" />\r
-\r
-       <import resource="basic.xml" />\r
-       <import resource="testCases/basic-001.xml" />\r
-       <import resource="testCases/basic-002.xml" />\r
-\r
-       <bean id="testLaunch" class="org.argeo.slc.execution.TestLaunch"\r
-               p:flowName="main" init-method="launch"/>\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"\r
-                       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/demo/org.argeo.slc.demo.basic/src/slc/conf/slc.properties b/demo/org.argeo.slc.demo.basic/src/slc/conf/slc.properties
deleted file mode 100644 (file)
index b18dce1..0000000
--- a/demo/org.argeo.slc.demo.basic/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/demo/org.argeo.slc.demo.basic/src/slc/conf/test.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/test.xml
deleted file mode 100644 (file)
index 6cc40e8..0000000
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/test.xml
+++ /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/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml
deleted file mode 100644 (file)
index a542664..0000000
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml
+++ /dev/null
@@ -1,35 +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
-       <bean id="basic.001" parent="basic.executionFlowTemplate">\r
-               <constructor-arg>\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
-               </constructor-arg>\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/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml
deleted file mode 100644 (file)
index c2946fd..0000000
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml
+++ /dev/null
@@ -1,25 +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
-       <bean id="basic.002" parent="basic.executionFlowTemplate">\r
-               <constructor-arg>\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
-               </constructor-arg>\r
-       </bean>\r
-</beans>
\ No newline at end of file

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 54e1ecaad794f8a75b6a7efe7ffb64a745c177c3..f6092a1ff4d055243fbdbec221fb5a470175ccfe 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -84,7 +84,7 @@ limitations under the License.
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <configuration>
                                                <archive>
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <configuration>
                                                <archive>

-                                                       <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>

                                                </archive>
                                        </configuration>
                                </plugin>
                                                </archive>
                                        </configuration>
                                </plugin>


@@ -192,7 +192,7 @@ limitations under the License.
                                        <version>${version.maven-bundle-plugin}</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                        <version>${version.maven-bundle-plugin}</version>
                                        <extensions>true</extensions>
                                        <configuration>

-                                               <manifestLocation>src/main/resources/META-INF</manifestLocation>
+                                               <manifestLocation>target/classes/META-INF</manifestLocation>

                                                <instructions>
                                                        <Bundle-SymbolicName>
                                                                ${pom.artifactId}
                                                <instructions>
                                                        <Bundle-SymbolicName>
                                                                ${pom.artifactId}