From 07b3e97db315dde8ee120f55a980cba1f28deaff Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Thu, 25 Aug 2011 18:56:08 +0300
Subject: [PATCH] SGF-35 + more tests + small fixes

---
 .../data/gemfire/CacheFactoryBean.java               |  5 +++--
 .../data/gemfire/client/client-cache.xml             | 12 +++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
index 1e1f98e9..a565b1af 100644
--- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
@@ -149,10 +149,11 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 			// load/init cache.xml
 			if (cacheXml != null) {
 				cache.loadCacheXml(cacheXml.getInputStream());
+
+				if (log.isDebugEnabled())
+					log.debug("Initialized cache from " + cacheXml);
 			}
 
-			if (log.isDebugEnabled())
-				log.debug("Initialized cache from " + cacheXml);
 
 		} finally {
 			th.setContextClassLoader(oldTCCL);
diff --git a/src/test/resources/org/springframework/data/gemfire/client/client-cache.xml b/src/test/resources/org/springframework/data/gemfire/client/client-cache.xml
index d019b540..a9372eaf 100644
--- a/src/test/resources/org/springframework/data/gemfire/client/client-cache.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/client-cache.xml
@@ -5,11 +5,9 @@
     xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.1.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean class="org.springframework.data.gemfire.client.ClientCacheFactoryBean">
-        <property name="poolName" value="pool"/>
-    </bean>
-
-    <gfe:pool id="pool">
-        <gfe:locator host="localhost" port="12345"/>
-    </gfe:pool>
+	<gfe:client-cache use-bean-factory-locator="false" pool-name="gemfire-pool"/>
+	
+	<gfe:pool subscription-enabled="false">
+		<gfe:server host="localhost" port="40404"/>
+	</gfe:pool>
 </beans>