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.

mifosng-provider/src/main/resources/META-INF/spring/appContext.xml

@@ -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" />

mifosng-provider/src/main/resources/META-INF/spring/infrastructure.xml

@@ -40,6 +40,4 @@
 		<property name="transactionManager" ref="transactionManager"></property>
 	</bean>	
 
-	<jee:jndi-lookup jndi-name="java:comp/env/jdbc/mifosplatform-tenants"
-		id="tenantDataSourceJndi" />
 </beans>

mifosng-provider/src/main/resources/META-INF/spring/jndi.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public 
+	License, v. 2.0. If a copy of the MPL was not distributed with this file, 
+	You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+	xmlns:jee="http://www.springframework.org/schema/jee"
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+    	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    	http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd">
+
+	<!-- name here must match TestDataSourceConfiguration -->
+	<jee:jndi-lookup jndi-name="java:comp/env/jdbc/mifosplatform-tenants"
+		id="tenantDataSourceJndi" />
+</beans>

mifosng-provider/src/main/webapp/WEB-INF/web.xml

@@ -18,7 +18,7 @@
 
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath*:META-INF/spring/appContext.xml</param-value>
+		<param-value>classpath*:META-INF/spring/jndi.xml classpath*:META-INF/spring/appContext.xml</param-value>
 	</context-param>
 
 	<filter>
@@ -36,7 +36,7 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>jersey-serlvet</servlet-name>
+		<servlet-name>jersey-servlet</servlet-name>
 		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
 		<init-param>
 			<param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
@@ -54,7 +54,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>jersey-serlvet</servlet-name>
+		<servlet-name>jersey-servlet</servlet-name>
 		<url-pattern>/api/v1/*</url-pattern>
 	</servlet-mapping>
 </web-app>