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 a94d128b35ee7091e33a8830b104435ebe7c5e59..ee822d2178f45de58bf3a4715d820da4776106f2 100644 (file)
--- 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"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
-       <import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />\r
-       <import resource="execution.xml" />\r
-       <import resource="result.xml" />\r
-\r
-</beans>\r
+<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 (file)
index b288858..0000000
--- 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"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
-\r
-       <bean name="executionBuildListener"\r
-               class="org.argeo.slc.ant.SlcExecutionBuildListener">\r
-               <property name="notifiers">\r
-                       <list>\r
-                               <ref bean="slcDefault.ws.client.slcExecutionNotifier" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean name="fileNotifier"\r
-               class="org.argeo.slc.core.process.FileSlcExecutionNotifier">\r
-               <property name="basePath" value="${slc.workDir}/process" />\r
-               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
-       </bean>\r
-\r
-</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 (file)
index c8cdaaf..0000000
--- 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"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
-\r
-       <bean id="testResult"\r
-               parent="slcDefault.test.basicTreeTestResult">\r
-               <property name="listeners">\r
-                       <list merge="true">\r
-                               <ref\r
-                                       bean="slcDefault.ws.client.treeTestResultWsNotfier" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file