Fix SLC demo

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

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
index bc48b51d62aee93d3da2674b57171ef0f47902de..b55754ab40ac276bdf99e2e9d1d684229d25c581 100644 (file)
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
@@ -2,10 +2,12 @@
 <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
+       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/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
+       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
        <bean id="basic.spec" parent="slcTemplate.simpleSpec">\r
                <property name="attributes">\r
@@ -96,17 +98,29 @@
        <bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
                scope="prototype" />\r
 \r
-       <bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult"\r
-               scope="execution">\r
-               <property name="listeners" ref="resultListeners" />\r
+       <bean id="basic.testResult" class="org.argeo.slc.jcr.JcrTestResult"\r
+               init-method="init" destroy-method="destroy">\r
+               <flow:variable />\r
+               <property name="resultType" value="slc:diffResult" />\r
                <property name="attributes">\r
                        <map>\r
-                               <entry key="testedComponentId" value="@{testedComponentId}" />\r
+                               <entry key="testCase" value="@{slcVar.flow.name}" />\r
                        </map>\r
                </property>\r
-               <aop:scoped-proxy />\r
+               <property name="repository" ref="repository" />\r
        </bean>\r
 \r
+<!--   <bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult" -->\r
+<!--           scope="execution"> -->\r
+<!--           <property name="listeners" ref="resultListeners" /> -->\r
+<!--           <property name="attributes"> -->\r
+<!--                   <map> -->\r
+<!--                           <entry key="testedComponentId" value="@{testedComponentId}" /> -->\r
+<!--                   </map> -->\r
+<!--           </property> -->\r
+<!--           <aop:scoped-proxy /> -->\r
+<!--   </bean> -->\r
+\r
        <bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
                abstract="true">\r
                <property name="testResult" ref="basic.testResult" />\r

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
index e7390c31249f7b13cca222fb1261781fb50dd0e8..f6d6a3e66e5991f1478d574b3d38c9216348090a 100644 (file)
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
@@ -12,6 +12,7 @@
                interface="org.argeo.slc.core.attachment.AttachmentUploader"\r
                cardinality="0..1" />\r
 \r
-       <list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"\r
-               cardinality="0..N" />\r
+       <!-- REFERENCES -->\r
+       <reference id="repository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=slc)" />\r
 </beans:beans>
\ No newline at end of file

diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index 0fbb29490df2490803cc8041fc16c7731b4e8a84..a3a3e541a3ec9be68fb11b9f8292bba7b4689337 100644 (file)
--- a/demo/modules/pom.xml
+++ b/demo/modules/pom.xml
@@ -42,17 +42,15 @@
                                                <!-- Minimal imports -->
                                                <Import-Package>
                                                        *,
-                                                       net.sf.cglib.core;resolution:=optional,
-                                                       net.sf.cglib.proxy;resolution:=optional,
-                                                       net.sf.cglib.reflect;resolution:=optional,
+                                                       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.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.argeo.slc.test,
                                                        org.springframework.aop,
                                                        org.springframework.aop.framework,
                                                        org.springframework.aop.scope,