From: Mathieu Baudier
Date: Sun, 4 May 2008 19:42:22 +0000 (+0000)
Subject: Improve Spring imports
X-Git-Tag: argeo-slc-2.1.7~2925
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=3b13b26a6455e16221c4b2af975b4f970ef21a6b;p=gpl%2Fargeo-slc.git
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 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;
* Name of the {@link WritableTestRun} Spring bean that the
* slc.test task will use by default. This can be overridden when
* calling the task from Ant. |
- * defaultTestRun |
+ * slcDefault.test.testRun |
*
*
*
@@ -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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
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 @@
-
-
-
-
-
-
-
-
+ parent="slcDefault.test.basicTreeTestResult">
\ 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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
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" />
-
-
-
+ parent="slcDefault.test.basicTreeTestResult">
-
-
-
+
+
-
-
-
-
-
-
\ No newline at end of file