From 6bf5ceeaf672aeede3e8927248d7bd8d045825cb Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 9 Mar 2016 20:57:59 -0800
Subject: [PATCH] SGF-480 - Change default for use-bean-factory-locator to
 false.

---
 .../org/springframework/data/gemfire/CacheFactoryBean.java     | 2 +-
 .../springframework/data/gemfire/config/spring-gemfire-1.8.xsd | 2 +-
 .../org/springframework/data/gemfire/CacheFactoryBeanTest.java | 1 +
 ...ngDeclarableSupportFunctionBasedIntegrationTest-context.xml | 2 +-
 .../springframework/data/gemfire/cache-with-declarable-ctx.xml | 3 ++-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
index 3f90119a..8299cd02 100644
--- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
@@ -89,7 +89,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware,
 
 	protected boolean close = true;
 	protected boolean lazyInitialize = true;
-	protected boolean useBeanFactoryLocator = true;
+	protected boolean useBeanFactoryLocator = false;
 
 	protected final Log log = LogFactory.getLog(getClass());
 
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd
index 6538f1f9..fec8a06d 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.8.xsd
@@ -141,7 +141,7 @@ For cases in which there are no declared dependencies on the cache, set this att
             ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="use-bean-factory-locator" type="xsd:string" use="optional" default="true">
+		<xsd:attribute name="use-bean-factory-locator" type="xsd:string" use="optional" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 Indicates whether a bean factory locator is enabled (default) for this cache definition or not. The locator stores
diff --git a/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java
index ed3bba09..a222d369 100644
--- a/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/CacheFactoryBeanTest.java
@@ -137,6 +137,7 @@ public class CacheFactoryBeanTest {
 		cacheFactoryBean.setSearchTimeout(45000);
 		cacheFactoryBean.setTransactionListeners(Collections.singletonList(mockTransactionLister));
 		cacheFactoryBean.setTransactionWriter(mockTransactionWriter);
+		cacheFactoryBean.setUseBeanFactoryLocator(true);
 
 		assertTrue(gemfireProperties.isEmpty());
 
diff --git a/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml
index bc66cc70..c6092f23 100644
--- a/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest-context.xml
@@ -28,7 +28,7 @@
 	</util:properties>
 
 	<gfe:cache cache-xml-location="lazy-wiring-declarable-support-function-cache.xml"
-			   properties-ref="gemfireProperties" lazy-init="false"/>
+			   properties-ref="gemfireProperties" lazy-init="false" use-bean-factory-locator="true"/>
 
 	<gfe-data:function-executions base-package="org.springframework.data.gemfire.function.sample">
 		<gfe-data:include-filter type="assignable" expression="org.springframework.data.gemfire.function.sample.HelloFunctionExecution"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml b/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml
index 09ac23a0..13c605a0 100644
--- a/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml
@@ -16,7 +16,8 @@
 		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="classpath:cache-with-declarable.xml" properties-ref="gemfireProperties"/>
+	<gfe:cache cache-xml-location="cache-with-declarable.xml" properties-ref="gemfireProperties"
+			   use-bean-factory-locator="true"/>
 
 	<bean id="bean" class="java.lang.Object"/>