From a37af0700f3209984af335d4d41b2a60aea6fbc0 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 29 Jun 2008 19:57:53 +0000
Subject: [PATCH] Improve example structure

git-svn-id: https://svn.argeo.org/slc/trunk@1336 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.example/.classpath              | 17 +++----
 .../ws/client/spring/applicationContext.xml   | 45 +++++++++++++++++++
 .../src/main/slc/conf/runtime/default.xml     | 14 +++---
 .../src/main/slc/conf/runtime/ws.xml          | 39 ++++++++++++++++
 .../src/main/slc/conf/slc.properties          |  5 ++-
 .../slc/root/Category1/SubCategory2/build.xml |  5 ++-
 6 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml
 create mode 100644 org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml

diff --git a/org.argeo.slc.example/.classpath b/org.argeo.slc.example/.classpath
index 06e97dacc..b6a31cb81 100644
--- a/org.argeo.slc.example/.classpath
+++ b/org.argeo.slc.example/.classpath
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml b/org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml
new file mode 100644
index 000000000..522acb9da
--- /dev/null
+++ b/org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	default-lazy-init="true">
+
+	<import
+		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+	<import
+		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
+
+
+	<bean id="exampleDefault.ws.client.webServiceTemplate"
+		parent="slcTemplate.ws.client.webServiceTemplate">
+		<constructor-arg ref="slcDefault.ws.client.messageFactory" />
+		<property name="defaultUri" value="${slc.ws.uri}" />
+	</bean>
+
+	<bean name="exampleDefault.ws.client.slcExecutionNotifier"
+		parent="slcDefault.ws.client.slcExecutionNotifier">
+		<property name="template"
+			ref="exampleDefault.ws.client.webServiceTemplate" />
+	</bean>
+
+	<bean name="exampleDefault.ws.client.treeTestResultWsNotfier"
+		parent="slcDefault.ws.client.treeTestResultWsNotfier">
+		<property name="template"
+			ref="exampleDefault.ws.client.webServiceTemplate" />
+	</bean>
+
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+		lazy-init="false">
+		<property name="systemPropertiesModeName"
+			value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="properties">
+			<props>
+				<prop key="slc.ws.uri">
+					http://localhost:9090/org.argeo.slc.webapp/slcService/
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml b/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml
index 64f39f5f6..b671a0c56 100644
--- a/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml
+++ b/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml
@@ -9,22 +9,19 @@
 		resource="classpath:/org/argeo/slc/core/process/spring/applicationContext.xml" />
 
 	<bean id="testResult"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid" value="1" />
+		parent="slcDefault.test.basicTreeTestResult">
 		<property name="listeners">
-			<list>
-				<ref bean="slcDefault.test.resultLogger" />
+			<list merge="true">
 				<ref bean="slcDefault.castor.xsltReportGenerator" />
 			</list>
 		</property>
 	</bean>
 
 	<bean id="testResult2"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid" value="2" />
+		parent="slcDefault.test.basicTreeTestResult">
 		<property name="listeners">
-			<list>
-				<ref bean="slcDefault.test.resultLogger" />
+			<list merge="true">
+				<ref bean="slcDefault.castor.xsltReportGenerator" />
 			</list>
 		</property>
 	</bean>
@@ -35,7 +32,6 @@
 		<property name="notifiers">
 			<list>
 				<ref bean="slcDefault.process.fileSlcExecutionNotifier" />
-				<!-- <ref bean="webServiceNotifier" />-->
 			</list>
 		</property>
 	</bean>
diff --git a/org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml b/org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml
new file mode 100644
index 000000000..36c5015d1
--- /dev/null
+++ b/org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<import
+		resource="classpath:/org/argeo/slc/example/ws/client/spring/applicationContext.xml" />
+
+	<bean id="testResult"
+		parent="slcDefault.test.basicTreeTestResult">
+		<property name="listeners">
+			<list merge="true">
+				<ref
+					bean="exampleDefault.ws.client.treeTestResultWsNotfier" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="testResult2"
+		parent="slcDefault.test.basicTreeTestResult">
+		<property name="listeners">
+			<list merge="true">
+				<ref
+					bean="exampleDefault.ws.client.treeTestResultWsNotfier" />
+			</list>
+		</property>
+	</bean>
+
+	<bean name="executionBuildListener"
+		class="org.argeo.slc.ant.SlcExecutionBuildListener">
+		<property name="logLevel" value="INFO" />
+		<property name="notifiers">
+			<list>
+				<ref
+					bean="exampleDefault.ws.client.slcExecutionNotifier" />
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/src/main/slc/conf/slc.properties b/org.argeo.slc.example/src/main/slc/conf/slc.properties
index 8968a5466..af47c9efb 100644
--- a/org.argeo.slc.example/src/main/slc/conf/slc.properties
+++ b/org.argeo.slc.example/src/main/slc/conf/slc.properties
@@ -1,4 +1,7 @@
-rootTest=TEST
+example.testMessage=PROPERTIES ARE PROPERLY READ
+
+# Web Service
+slc.ws.uri=http://localhost:9090/org.argeo.slc.webapp/slcService/
 
 # Log4j additional config
 #log4j.logger.org.argeo.slc=DEBUG
diff --git a/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml b/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml
index 9d98053b2..88f8c6c75 100644
--- a/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml
@@ -3,13 +3,16 @@
 
 	<import file="complex.xml" />
 
-	<target name="test" depends="testSimple,testComplex,testError">
+	<target name="test" depends="testSimple,testComplex,testError">
+		<echo message="${example.testMessage}" />
+		<!--
 		<slc.closeResult>
 			<result bean="testResult" />
 		</slc.closeResult>
 		<slc.closeResult>
 			<result bean="testResult2" />
 		</slc.closeResult>
+		-->
 	</target>
 
 	<target name="testSimple" description="Simple tests">
-- 
2.39.2