Improve Spring imports

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

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 90dc99149109ed2fb221487cbd4b1cdcfab051fd..c70c922e42b86828a3e333fba3871430c5f27e2b 100644 (file)
--- 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\r
  * <code>slc.test</code> task will use by default. This can be overridden when\r
  * calling the task from Ant.</td>\r
- * <td>defaultTestRun</td>\r
+ * <td>slcDefault.test.testRun</td>\r
  * </tr>\r
  * </table>\r
  * </p>\r
@@ -155,15 +155,15 @@ public class SlcAntConfig {
                System.getProperties().putAll((Map<?, ?>) project.getUserProperties());\r
                Properties all = new Properties();\r
                all.putAll(System.getProperties());\r
-               prepareAllProperties(slcRootFile,all);\r
+               prepareAllProperties(slcRootFile, all);\r
 \r
                Log log = LogFactory.getLog(this.getClass());\r
                for (Object o : all.keySet()) {\r
                        String key = o.toString();\r
                        // System.out.println(key+"="+all.getProperty(key));\r
                        if (project.getUserProperty(key) == null) {// not already set\r
-//                             if (log.isDebugEnabled())\r
-//                                     log.debug(key + "=" + all.getProperty(key));\r
+                       // if (log.isDebugEnabled())\r
+                       // log.debug(key + "=" + all.getProperty(key));\r
                                project.setUserProperty(key, all.getProperty(key));\r
                        }\r
                }\r
@@ -246,7 +246,8 @@ public class SlcAntConfig {
                        }\r
                        // Default test run\r
                        if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {\r
-                               all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");\r
+                               all.setProperty(DEFAULT_TEST_RUN_PROPERTY,\r
+                                               "slcDefault.test.testRun");\r
                        }\r
 \r
                        // Default log4j\r

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 (file)
index 0000000..216ac54
--- /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"?>\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
+       default-lazy-init="true">\r
+\r
+       <bean id="slcDefault.test.resultLogger"\r
+               class="org.argeo.slc.core.test.tree.TreeTestResultLogger">\r
+       </bean>\r
+\r
+       <bean name="slcDefault.test.testRun"\r
+               class="org.argeo.slc.core.test.SimpleTestRun">\r
+       </bean>\r
+\r
+       <bean name="slcDefault.test.uuid" class="java.util.UUID"\r
+               factory-method="randomUUID" scope="prototype">\r
+       </bean>\r
+\r
+       <bean id="slcDefault.test.basicTreeTestResult"\r
+               class="org.argeo.slc.core.test.tree.TreeTestResult" abstract="true">\r
+               <property name="uuid">\r
+                       <bean factory-bean="slcDefault.test.uuid" factory-method="toString"></bean>\r
+               </property>\r
+               <property name="listeners">\r
+                       <list>\r
+                               <ref bean="slcDefault.test.resultLogger" />\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+</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 0239264c322f4d10089d653f55c5b1d18282bb49..9b9c55506838a6dbad68215185ea44973af99637 100644 (file)
--- 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"?>\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.0.xsd"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
        default-lazy-init="true">\r
 \r
        <bean id="slcDefault.dataSource.inMemoryTestHSQL"\r

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 e128c32c1a1ce020f85e5899a00b1785426f3c1b..9bb2ff7f44da1a2f6efee162b2c450e82df4e49b 100644 (file)
--- 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"\r
                class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />\r
 \r
+       <bean name="slcDefault.ws.client.treeTestResultWsNotfier"\r
+               class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier">\r
+               <property name="template"\r
+                       ref="slcDefault.ws.client.webServiceTemplate" />\r
+               <property name="onlyOnClose" value="false" />\r
+       </bean>\r
+\r
 </beans>\r

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 d988d2022ad71d9fb377115ca7090e58e314a510..6ff9b8522adc78d3db5a25dfcd3e1a1e2f019831 100644 (file)
--- 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" />\r
 \r
        <bean id="testResult"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="uuid">\r
-                       <bean factory-bean="uuid" factory-method="toString"></bean>\r
-               </property>\r
-               <property name="listeners">\r
-                       <list>\r
-                               <ref bean="resultLogger" />\r
-                       </list>\r
-               </property>\r
+               parent="slcDefault.test.basicTreeTestResult">\r
        </bean>\r
 \r
 </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 3f8f15f6fd748de35a105ab9a3a9b9f7ec046e66..56da88a8b6c959d9057d7393381a92c324b27a51 100644 (file)
--- 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"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <bean name="testRun"\r
-               class="org.argeo.slc.core.test.SimpleTestRun">\r
-       </bean>\r
-\r
-       <bean id="testResult"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="uuid">\r
-                       <bean factory-bean="uuid" factory-method="toString"></bean>\r
-               </property>\r
-               <property name="listeners">\r
-                       <list>\r
-                               <ref bean="resultLogger" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean name="uuid" class="java.util.UUID" factory-method="randomUUID"\r
-               scope="prototype">\r
-       </bean>\r
-\r
-       <bean id="resultLogger"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResultLogger">\r
-       </bean>\r
+       <import\r
+               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
 \r
        <bean name="testDef"\r
                class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />\r

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 b2cb1ff947a3be395368329b3187311849bde80b..36733d18f3233f534b79453cb9a53cf7e4a4c1d2 100644 (file)
--- 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" />\r
 \r
        <bean id="testResult"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="uuid">\r
-                       <bean factory-bean="uuid" factory-method="toString"></bean>\r
-               </property>\r
+               parent="slcDefault.test.basicTreeTestResult">\r
                <property name="listeners">\r
-                       <list>\r
-                               <ref bean="resultLogger" />\r
-                               <ref bean="resultWsNotfier" />\r
+                       <list merge="true">\r
+                               <ref bean="slcDefault.ws.client.treeTestResultWsNotfier" />\r
                        </list>\r
                </property>\r
        </bean>\r
-\r
-       <bean name="resultWsNotfier"\r
-               class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier">\r
-               <property name="template"\r
-                       ref="slcDefault.ws.client.webServiceTemplate" />\r
-               <property name="onlyOnClose" value="false" />\r
-       </bean>\r
-\r
 </beans>
\ No newline at end of file