Merge pull request #38 from OpenSRP/35-upgrade-spring-beans

Upgrade spring beans, Remove Motech configuration

modules/core/applicationContext-opensrp.xml

@@ -3,31 +3,23 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:util="http://www.springframework.org/schema/util" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-               http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-               http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
-               http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+               http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
+               http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd
+               http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd">
 
 	<bean
 			class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="location" value="classpath:activemq.properties" />
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
-	<import resource="classpath:applicationScheduler.xml" />
-	<import resource="classpath:applicationPlatformServerAPI.xml" />
-	<import resource="classpath:applicationSmsHttp.xml" />
-	<import resource="classpath:applicationSmsAPI.xml" />
-	<import resource="classpath:applicationSchedulerTrackingAPI.xml" />
-
 	<context:property-placeholder location="classpath*:maven.properties" />
 
 	<util:properties id="opensrp" location="classpath:/opensrp.properties" />
 
 	<context:annotation-config />
 
-	<bean id="statsdAgent" class="org.motechproject.metrics.impl.LoggingAgentBackendImpl" />
-
 	<task:scheduler id="applicationScheduler" pool-size="10" />
 	<task:scheduled-tasks
 		scheduler="applicationScheduler">
@@ -75,10 +67,6 @@
 		<import resource="persistence_postgres.xml" />
 	</beans>
 
-	<beans profile="couchDb">
-		<import resource="persistence_couchdb.xml" />
-	</beans>
-
 	<beans profile="jedis">
 		<bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig"
 			p:max-total="${redis.pool.max.connections}" p:test-on-borrow="true"

modules/core/persistence_postgres.xml

@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
+	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
 
 	<context:component-scan base-package="org.opensrp">
 		<context:exclude-filter type="regex"
@@ -60,4 +60,6 @@
 	<bean class="org.opensrp.repository.couch.AllLocations" />
 	<bean class="org.opensrp.repository.couch.AllProviders" />
 	<bean class="org.opensrp.repository.couch.AllUsers" />
+	<bean class="org.opensrp.repository.couch.AllCamp" />
+	<bean class="org.opensrp.repository.couch.AllDHIS2Marker" />
 </beans>