From 320483980d500734dad80b77acbe020a5a9e52c6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 22 Oct 2012 09:22:29 +0000
Subject: [PATCH] Fix SLC demo

git-svn-id: https://svn.argeo.org/slc/trunk@5626 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/basic.xml                 | 26 ++++++++++++++-----
 .../META-INF/spring/osgi.xml                  |  5 ++--
 demo/modules/pom.xml                          | 10 +++----
 3 files changed, 27 insertions(+), 14 deletions(-)

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 bc48b51d6..b55754ab4 100644
--- 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"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<bean id="basic.spec" parent="slcTemplate.simpleSpec">
 		<property name="attributes">
@@ -96,17 +98,29 @@
 	<bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
 		scope="prototype" />
 
-	<bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult"
-		scope="execution">
-		<property name="listeners" ref="resultListeners" />
+	<bean id="basic.testResult" class="org.argeo.slc.jcr.JcrTestResult"
+		init-method="init" destroy-method="destroy">
+		<flow:variable />
+		<property name="resultType" value="slc:diffResult" />
 		<property name="attributes">
 			<map>
-				<entry key="testedComponentId" value="@{testedComponentId}" />
+				<entry key="testCase" value="@{slcVar.flow.name}" />
 			</map>
 		</property>
-		<aop:scoped-proxy />
+		<property name="repository" ref="repository" />
 	</bean>
 
+<!-- 	<bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult" -->
+<!-- 		scope="execution"> -->
+<!-- 		<property name="listeners" ref="resultListeners" /> -->
+<!-- 		<property name="attributes"> -->
+<!-- 			<map> -->
+<!-- 				<entry key="testedComponentId" value="@{testedComponentId}" /> -->
+<!-- 			</map> -->
+<!-- 		</property> -->
+<!-- 		<aop:scoped-proxy /> -->
+<!-- 	</bean> -->
+
 	<bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"
 		abstract="true">
 		<property name="testResult" ref="basic.testResult" />
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 e7390c312..f6d6a3e66 100644
--- 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"
 		cardinality="0..1" />
 
-	<list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"
-		cardinality="0..N" />
+	<!-- REFERENCES -->
+	<reference id="repository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=slc)" />
 </beans:beans>
\ No newline at end of file
diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml
index 0fbb29490..a3a3e541a 100644
--- 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,
-- 
2.39.2