Refactor demo

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

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-001.xml
new file mode 100644 (file)
index 0000000..c68414a
--- /dev/null
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/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.flowTemplate">\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@{testedComponentId}" />\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/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic-002.xml
new file mode 100644 (file)
index 0000000..5720d96
--- /dev/null
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/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.flowTemplate">\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/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-001.xml
new file mode 100644 (file)
index 0000000..181e3e7
--- /dev/null
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-001.xml
@@ -0,0 +1,18 @@
+<?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="canonic.001" parent="canonic.flowTemplate">\r
+               <description>Canonic 001</description>\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="1" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-002.xml
new file mode 100644 (file)
index 0000000..5916c08
--- /dev/null
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-002.xml
@@ -0,0 +1,20 @@
+<?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="canonic.002" parent="canonic.flowTemplate">\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="2" />\r
+                               <entry key="displayWithoutControl" value="102" />\r
+                               <entry key="displayWithControl" value="202" />\r
+                               <entry key="hide" value="202" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns-001.xml
new file mode 100644 (file)
index 0000000..5b1dbf6
--- /dev/null
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns-001.xml
@@ -0,0 +1,18 @@
+<?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="canonic-ns.001" parent="canonic-ns.flowTemplate">\r
+               <description>Canonic 001</description>\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="1" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns-002.xml
new file mode 100644 (file)
index 0000000..991f67f
--- /dev/null
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns-002.xml
@@ -0,0 +1,16 @@
+<?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:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
+       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
+\r
+       <flow:flow id="canonic-ns.002" parent="canonic-ns.flowTemplate">\r
+               <flow:arg name="parameterAtInstantiation" value="2" />\r
+               <flow:arg name="displayWithoutControl" value="102" />\r
+               <flow:arg name="displayWithControl" value="202" />\r
+               <flow:arg name="hide" value="202" />\r
+       </flow:flow>\r
+</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml
deleted file mode 100644 (file)
index c68414a..0000000
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/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.flowTemplate">\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@{testedComponentId}" />\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/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-002.xml
deleted file mode 100644 (file)
index 5720d96..0000000
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/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.flowTemplate">\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/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml
deleted file mode 100644 (file)
index 181e3e7..0000000
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml
+++ /dev/null
@@ -1,18 +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="canonic.001" parent="canonic.flowTemplate">\r
-               <description>Canonic 001</description>\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="1" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml
deleted file mode 100644 (file)
index 5916c08..0000000
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml
+++ /dev/null
@@ -1,20 +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="canonic.002" parent="canonic.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="2" />\r
-                               <entry key="displayWithoutControl" value="102" />\r
-                               <entry key="displayWithControl" value="202" />\r
-                               <entry key="hide" value="202" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml
deleted file mode 100644 (file)
index 5b1dbf6..0000000
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml
+++ /dev/null
@@ -1,18 +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="canonic-ns.001" parent="canonic-ns.flowTemplate">\r
-               <description>Canonic 001</description>\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="1" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml
deleted file mode 100644 (file)
index 991f67f..0000000
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml
+++ /dev/null
@@ -1,16 +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:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
-       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
-\r
-       <flow:flow id="canonic-ns.002" parent="canonic-ns.flowTemplate">\r
-               <flow:arg name="parameterAtInstantiation" value="2" />\r
-               <flow:arg name="displayWithoutControl" value="102" />\r
-               <flow:arg name="displayWithControl" value="202" />\r
-               <flow:arg name="hide" value="202" />\r
-       </flow:flow>\r
-</beans>\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/pom.xml b/demo/modules/org.argeo.slc.demo.basic/pom.xml
index 0c45539ca50b9bb15a961cafe799df9ae01d9eab..bc7649e0001e4afed0434c33b89f574fbd6db60d 100644 (file)
--- a/demo/modules/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/pom.xml
@@ -9,4 +9,35 @@
        </parent>
        <artifactId>org.argeo.slc.demo.basic</artifactId>
        <name>SLC Demo Basic</name>
+<!--   <build> -->
+<!--           <plugins> -->
+<!--                   <plugin> -->
+<!--                           <groupId>org.apache.felix</groupId> -->
+<!--                           <artifactId>maven-bundle-plugin</artifactId> -->
+<!--                           <configuration> -->
+<!--                                   <instructions> -->
+<!--                                           <SLC-ExecutionModule>default</SLC-ExecutionModule> -->
+<!--                                           <Import-Package> -->
+<!--                                                   *, -->
+<!--                                                   org.argeo.slc.core.structure.tree, -->
+
+<!--                                                   net.sf.cglib.core, -->
+<!--                                                   net.sf.cglib.proxy, -->
+<!--                                                   net.sf.cglib.reflect, -->
+<!--                                                   org.aopalliance.aop, -->
+<!--                                                   org.argeo.slc.core.execution, -->
+<!--                                                   org.argeo.slc.core.execution.tasks, -->
+<!--                                                   org.argeo.slc.execution, -->
+<!--                                                   org.argeo.slc.osgi, -->
+<!--                                                   org.springframework.aop, -->
+<!--                                                   org.springframework.aop.framework, -->
+<!--                                                   org.springframework.aop.scope, -->
+<!--                                                   org.springframework.beans.factory.config, -->
+<!--                                                   org.springframework.core.io,                                                                                             -->
+<!--                                           </Import-Package> -->
+<!--                                   </instructions> -->
+<!--                           </configuration> -->
+<!--                   </plugin> -->
+<!--           </plugins> -->
+<!--   </build> -->
 </project>
\ No newline at end of file

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index b627865d7d3fd1b1f1b7be7ba9ebc6606d0c7c63..c8cf864311591dde35d68e7f72c86b63d3fb1297 100644 (file)
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -43,11 +43,17 @@
                                                <!-- Minimal imports -->
                                                <Import-Package>
                                                        *,
+                                                       net.sf.cglib.core;resolution:=optional,
+                                                       net.sf.cglib.proxy;resolution:=optional,
+                                                       net.sf.cglib.reflect;resolution:=optional,
                                                        org.aopalliance.aop,
                                                        org.argeo.slc.core.execution,
                                                        org.argeo.slc.core.execution.tasks,
+                                                       org.argeo.slc.core.structure.tree;resolution:=optional,
                                                        org.argeo.slc.execution,
                                                        org.argeo.slc.osgi,
+                                                       org.argeo.slc.test;resolution:=optional,
+                                                       org.argeo.slc.structure;resolution:=optional,
                                                        org.springframework.aop,
                                                        org.springframework.aop.framework,
                                                        org.springframework.aop.scope,