Upgrades Spring Data GemFire 1.5 to GemFire 7.5.

src/test/resources/org/springframework/data/gemfire/config/client-ns.xml

@@ -32,8 +32,8 @@
 
 	<gfe:client-region id="persistent" name="PersistentRegion" pool-name="gemfire-pool" persistent="true" disk-store-ref="diskStore" disk-synchronous="true"/>
 
-	<gfe:disk-store id="diskStore" queue-size="50" auto-compact="true" max-oplog-size="10" time-interval="9999">
-		<gfe:disk-dir location="./" max-size="1"/>
+	<gfe:disk-store id="diskStore" queue-size="50" auto-compact="true" max-oplog-size="5" time-interval="9999">
+		<gfe:disk-dir location="./" max-size="10"/>
 	</gfe:disk-store>
 
 	<gfe:client-region id="overflow" name="OverflowRegion" pool-name="gemfire-pool" disk-store-ref="diskStore">

src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-context.xml

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+">
 
- 
-	<gfe:client-cache/>	
-	 
-	<gfe:client-region id="test-region"/>
-	
-	<gfe:pool>
-		<gfe:server host="localhost" port="40404"/>
+	<gfe:pool id="serverBasedPool">
+		<gfe:server host="localhost" port="15243"/>
 	</gfe:pool>
-	
+
+	<gfe:client-cache pool-name="serverBasedPool"/>
+
+	<gfe:client-region id="test-region" pool-name="serverBasedPool" shortcut="PROXY"/>
+
 </beans>

src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml

@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   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.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">FunctionIntegrationTestsServer</prop>
+		<prop key="statistic-sampling-enabled">false</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+	<gfe:cache-server port="15243"/>
+	<gfe:partitioned-region id="test-region"/>
+	<gfe:annotation-driven/>
 
 	<context:component-scan base-package="org.springframework.data.gemfire.function.execution"/>
 
-	<gfe:annotation-driven/>
-	<gfe:cache/>	
-	<gfe:cache-server/>
-	<gfe:partitioned-region id="test-region"/>
-	
 </beans>

src/test/resources/org/springframework/data/gemfire/support/JSONRegionAdviceTest-context.xml

@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   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.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd">
+">
 
-	<util:properties id="props">
-		<prop key="bind-address">127.0.0.1</prop>
+	<util:properties id="gemfireProperties">
+		<prop key="name">JSONRegionAdviceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
 	</util:properties>
 
-	<gfe-data:json-region-autoproxy 
-	pretty-print="false" 
-	convert-returned-collections="true" 
-	region-refs="someRegion"/>
-	<!-- Above replaces -->
-	<!-- 	<aop:aspectj-autoproxy /> -->
-	<!-- 	<bean class="org.springframework.data.gemfire.support.JSONRegionAdvice" /> -->
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<gfe:replicated-region id="jsonRegion"/>
+
+	<gfe-data:json-region-autoproxy pretty-print="false" convert-returned-collections="true" region-refs="jsonRegion"/>
+	<!-- gfe-data:json-region-autoproxy replaces... -->
+	<!--
+	<aop:aspectj-autoproxy/>
+	<bean class="org.springframework.data.gemfire.support.JSONRegionAdvice"/>
+	-->
+
+	<bean class="org.springframework.data.gemfire.GemfireTemplate" p:region-ref="jsonRegion"/>
 
-	<gfe:cache properties-ref="props"/>
-	<gfe:replicated-region id="someRegion"/>
-	
-	<bean id="template" class="org.springframework.data.gemfire.GemfireTemplate">
-		<constructor-arg ref="someRegion"/>
-	</bean>
 </beans>