From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 26 Jun 2008 16:51:45 +0000 (+0000)
Subject: Improve auto-detection of Spring beans.
X-Git-Tag: argeo-slc-2.1.7~2752
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2f3231524b8e53f771e6adb9d013debf7f6dffc7;p=gpl%2Fargeo-slc.git

Improve auto-detection of Spring beans.
Make WS communications more robust

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

diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
index a94d128b3..ee822d217 100644
--- a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/applicationContext.xml
@@ -1,11 +1,27 @@
-<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/ws/client/spring/applicationContext.xml" />
-	<import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
-	<import resource="execution.xml" />
-	<import resource="result.xml" />
-
-</beans>
+<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/ws/client/spring/applicationContext.xml" />
+	<import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
+
+	<bean name="executionBuildListener"
+		class="org.argeo.slc.ant.SlcExecutionBuildListener">
+		<property name="notifiers">
+			<list>
+				<ref bean="slcDefault.ws.client.slcExecutionNotifier" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="testResult"
+		parent="slcDefault.test.basicTreeTestResult">
+		<property name="listeners">
+			<list merge="true">
+				<ref
+					bean="slcDefault.ws.client.treeTestResultWsNotfier" />
+			</list>
+		</property>
+	</bean>
+</beans>
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml
deleted file mode 100644
index b28885837..000000000
--- a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/execution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/ws/client/spring/applicationContext.xml" />
-
-	<bean name="executionBuildListener"
-		class="org.argeo.slc.ant.SlcExecutionBuildListener">
-		<property name="notifiers">
-			<list>
-				<ref bean="slcDefault.ws.client.slcExecutionNotifier" />
-			</list>
-		</property>
-	</bean>
-
-	<bean name="fileNotifier"
-		class="org.argeo.slc.core.process.FileSlcExecutionNotifier">
-		<property name="basePath" value="${slc.workDir}/process" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml b/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml
deleted file mode 100644
index c8cdaafa6..000000000
--- a/org.argeo.slc.webapp/src/test/resources/org/argeo/slc/ws/result.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/ws/client/spring/applicationContext.xml" />
-
-	<bean id="testResult"
-		parent="slcDefault.test.basicTreeTestResult">
-		<property name="listeners">
-			<list merge="true">
-				<ref
-					bean="slcDefault.ws.client.treeTestResultWsNotfier" />
-			</list>
-		</property>
-	</bean>
-
-</beans>
\ No newline at end of file