Merge branch 'master' into client-cache

Conflicts:
	src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java

src/test/resources/org/springframework/data/gemfire/basic-cache.xml

@@ -35,5 +35,8 @@
 	<bean id="cache-with-xml" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="cacheXml" value="classpath:cache.xml"/>
 	</bean>
+
+	<bean id="pdx-cache" class="org.springframework.data.gemfire.CacheFactoryBean">
+	</bean>
 	
 </beans>

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

@@ -21,4 +21,6 @@
 	<util:properties id="props">
 		<prop key="disable-tcp">false</prop>
 	</util:properties>
+	
+	<gfe:cache id="no-bl" use-bean-factory-locator="false" />
 </beans>

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

@@ -12,7 +12,7 @@
 	
 	<gfe:partitioned-region id="simple" />
 	
-	<gfe:partitioned-region id="options" copies="1" total-buckets="4" name="redundant" close="true" destroy="false">
+	<gfe:partitioned-region id="options" copies="1" total-buckets="4" name="redundant" close="true" destroy="false" statistics="true">
 		<gfe:partition-resolver>
 			<bean class="org.springframework.data.gemfire.SimplePartitionResolver"/>
 		</gfe:partition-resolver>

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

@@ -0,0 +1,29 @@
+<?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:p="http://www.springframework.org/schema/p"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	default-lazy-init="true"
+	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
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+	<gfe:cache />
+	
+	<!-- Advanced example depicting various cache server configuration options -->
+	<gfe:cache-server id="advanced-config" auto-startup="true"
+		bind-address="localhost" port="${gfe.port.6}" host-name-for-clients="localhost"
+		load-poll-interval="2000" max-connections="22" max-threads="16"
+		max-message-count="1000" max-time-between-pings="30000"
+		groups="test-server">
+
+		<gfe:subscription-config eviction-type="ENTRY" capacity="1000" disk-store="file://${java.io.tmpdir}"/>
+	</gfe:cache-server>
+
+	<context:property-placeholder location="classpath:port.properties" />
+
+	
+</beans>

src/test/resources/port.properties

@@ -1,2 +1,3 @@
 gfe.port=40403
-gfe.port.4=40404
+gfe.port.4=40404
+gfe.port.6=40406