Merge pull request #1024 from vorburger/SpringConfigurationTest

New SpringConfigurationTest; the first @RunWith(SpringJUnit4ClassRunner) @vishwasbabu and @mgeiss I'm assuming you have no objection to this one, so I've merged it.
2014-08-26 22:52:43 +02:00
parent 3103f20fdb cd3e26f817
commit e68cba5929
7 changed files with 112 additions and 5 deletions
@@ -63,6 +63,11 @@
 	
 	<import resource="infrastructure.xml" />

+	<!-- do NOT <import resource="jndi.xml" />  here;
+	     because we want the TestDataSourceConfiguration to not have that;
+	     we'll manually list jndi.xml in web.xml
+	-->
+
 	<import resource="securityContext.xml" />

 	<import resource="cache.xml" />