Simplify defaults

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java
index 15e7f679e77f364e0b3908306b3e08175d7d1961..bd6b2f993109374b98e472821da0284967ab30fa 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/IndependentDbTestCase.java
@@ -74,7 +74,7 @@ public abstract class IndependentDbTestCase extends AbstractSpringTestCase {
         * returns <i>dataSource</i>.\r
         */\r
        protected String getDataSourceBeanName() {\r
-               return "dataSource";\r
+               return "slcDefault.dataSource.inMemoryTestHSQL";\r
        }\r
 \r
        /**\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
index 216ac5423bf642c27f205185479d33d439882f7e..3e1cd53eb342efb6003f49d3dc55b02478a86caf 100644 (file)
--- 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
@@ -28,4 +28,11 @@
                </property>\r
        </bean>\r
 \r
+       <bean id="slcDefault.test.basicSimpleTestResult"\r
+               class="org.argeo.slc.core.test.SimpleTestResult" abstract="true">\r
+               <property name="uuid">\r
+                       <bean factory-bean="slcDefault.test.uuid" factory-method="toString"></bean>\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 9b9c55506838a6dbad68215185ea44973af99637..588e00f2f363761cc3cfccc0cf7a8d83f549e6b9 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
@@ -89,4 +89,5 @@
                class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"\r
                abstract="true">\r
        </bean>\r
+\r
 </beans>
\ No newline at end of file