From 3b13b26a6455e16221c4b2af975b4f970ef21a6b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 May 2008 19:42:22 +0000
Subject: [PATCH] Improve Spring imports

git-svn-id: https://svn.argeo.org/slc/trunk@1115 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../java/org/argeo/slc/ant/SlcAntConfig.java  | 11 ++++---
 .../core/test/spring/applicationContext.xml   | 31 +++++++++++++++++++
 .../hibernate/spring/applicationContext.xml   |  2 +-
 .../ws/client/spring/applicationContext.xml   |  7 +++++
 .../org/argeo/slc/ant/applicationContext.xml  | 10 +-----
 .../org/argeo/slc/ant/nonDepContext.xml       | 25 ++-------------
 .../resources/org/argeo/slc/ws/result.xml     | 18 ++---------
 7 files changed, 51 insertions(+), 53 deletions(-)
 create mode 100644 org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index 90dc99149..c70c922e4 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -99,7 +99,7 @@ import org.apache.tools.ant.Project;
  * <td>Name of the {@link WritableTestRun} Spring bean that the
  * <code>slc.test</code> task will use by default. This can be overridden when
  * calling the task from Ant.</td>
- * <td>defaultTestRun</td>
+ * <td>slcDefault.test.testRun</td>
  * </tr>
  * </table>
  * </p>
@@ -155,15 +155,15 @@ public class SlcAntConfig {
 		System.getProperties().putAll((Map<?, ?>) project.getUserProperties());
 		Properties all = new Properties();
 		all.putAll(System.getProperties());
-		prepareAllProperties(slcRootFile,all);
+		prepareAllProperties(slcRootFile, all);
 
 		Log log = LogFactory.getLog(this.getClass());
 		for (Object o : all.keySet()) {
 			String key = o.toString();
 			// System.out.println(key+"="+all.getProperty(key));
 			if (project.getUserProperty(key) == null) {// not already set
-//				if (log.isDebugEnabled())
-//					log.debug(key + "=" + all.getProperty(key));
+			// if (log.isDebugEnabled())
+			// log.debug(key + "=" + all.getProperty(key));
 				project.setUserProperty(key, all.getProperty(key));
 			}
 		}
@@ -246,7 +246,8 @@ public class SlcAntConfig {
 			}
 			// Default test run
 			if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {
-				all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");
+				all.setProperty(DEFAULT_TEST_RUN_PROPERTY,
+						"slcDefault.test.testRun");
 			}
 
 			// Default log4j
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
new file mode 100644
index 000000000..216ac5423
--- /dev/null
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/test/spring/applicationContext.xml
@@ -0,0 +1,31 @@
+<?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">
+
+	<bean id="slcDefault.test.resultLogger"
+		class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
+	</bean>
+
+	<bean name="slcDefault.test.testRun"
+		class="org.argeo.slc.core.test.SimpleTestRun">
+	</bean>
+
+	<bean name="slcDefault.test.uuid" class="java.util.UUID"
+		factory-method="randomUUID" scope="prototype">
+	</bean>
+
+	<bean id="slcDefault.test.basicTreeTestResult"
+		class="org.argeo.slc.core.test.tree.TreeTestResult" abstract="true">
+		<property name="uuid">
+			<bean factory-bean="slcDefault.test.uuid" factory-method="toString"></bean>
+		</property>
+		<property name="listeners">
+			<list>
+				<ref bean="slcDefault.test.resultLogger" />
+			</list>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
index 0239264c3..9b9c55506 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
@@ -1,7 +1,7 @@
 <?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.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	default-lazy-init="true">
 
 	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
index e128c32c1..9bb2ff7f4 100644
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
@@ -30,4 +30,11 @@
 	<bean id="slcDefault.ws.client.messageFactory"
 		class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />
 
+	<bean name="slcDefault.ws.client.treeTestResultWsNotfier"
+		class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier">
+		<property name="template"
+			ref="slcDefault.ws.client.webServiceTemplate" />
+		<property name="onlyOnClose" value="false" />
+	</bean>
+
 </beans>
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
index d988d2022..6ff9b8522 100644
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
@@ -6,15 +6,7 @@
 	<import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
 
 	<bean id="testResult"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid">
-			<bean factory-bean="uuid" factory-method="toString"></bean>
-		</property>
-		<property name="listeners">
-			<list>
-				<ref bean="resultLogger" />
-			</list>
-		</property>
+		parent="slcDefault.test.basicTreeTestResult">
 	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
index 3f8f15f6f..56da88a8b 100644
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
@@ -3,29 +3,8 @@
 	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">
 
-	<bean name="testRun"
-		class="org.argeo.slc.core.test.SimpleTestRun">
-	</bean>
-
-	<bean id="testResult"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid">
-			<bean factory-bean="uuid" factory-method="toString"></bean>
-		</property>
-		<property name="listeners">
-			<list>
-				<ref bean="resultLogger" />
-			</list>
-		</property>
-	</bean>
-
-	<bean name="uuid" class="java.util.UUID" factory-method="randomUUID"
-		scope="prototype">
-	</bean>
-
-	<bean id="resultLogger"
-		class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
-	</bean>
+	<import
+		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
 
 	<bean name="testDef"
 		class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />
diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml
index b2cb1ff94..36733d18f 100644
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml
@@ -7,23 +7,11 @@
 		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
 
 	<bean id="testResult"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid">
-			<bean factory-bean="uuid" factory-method="toString"></bean>
-		</property>
+		parent="slcDefault.test.basicTreeTestResult">
 		<property name="listeners">
-			<list>
-				<ref bean="resultLogger" />
-				<ref bean="resultWsNotfier" />
+			<list merge="true">
+				<ref bean="slcDefault.ws.client.treeTestResultWsNotfier" />
 			</list>
 		</property>
 	</bean>
-
-	<bean name="resultWsNotfier"
-		class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier">
-		<property name="template"
-			ref="slcDefault.ws.client.webServiceTemplate" />
-		<property name="onlyOnClose" value="false" />
-	</bean>
-
 </beans>
\ No newline at end of file
-- 
2.39.2