From 47535bff817b8b578d8c1521a0e01b235c393348 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 30 Aug 2011 09:16:22 +0300 Subject: [PATCH] + add support for two missing Pool properties (multi-user-authentication & prSingleHopEnabled) --- docs/src/info/changelog.txt | 3 +++ .../data/gemfire/client/PoolFactoryBean.java | 18 ++++++++++++++++++ .../data/gemfire/config/spring-gemfire-1.1.xsd | 2 ++ .../data/gemfire/config/PoolNamespaceTest.java | 3 +++ .../data/gemfire/config/pool-ns.xml | 2 +- 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt index f0bd121a..8f27791c 100644 --- a/docs/src/info/changelog.txt +++ b/docs/src/info/changelog.txt @@ -5,6 +5,9 @@ http://www.springsource.org/spring-gemfire Changes in version 1.1.0.M3 (2011-mm-dd) ---------------------------------------- +Package org.springframework.data.gemfire.client +* Add missing properties to PoolFactoryBean and pool namespace + Changes in version 1.1.0.M2 (2011-08-29) ---------------------------------------- diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java index 53796054..74c95361 100644 --- a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java @@ -76,7 +76,9 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis private int loadConditioningInterval = PoolFactory.DEFAULT_LOAD_CONDITIONING_INTERVAL; private int maxConnections = PoolFactory.DEFAULT_MAX_CONNECTIONS; private int minConnections = PoolFactory.DEFAULT_MIN_CONNECTIONS; + private boolean multiUserAuthentication = PoolFactory.DEFAULT_MULTIUSER_AUTHENTICATION; private long pingInterval = PoolFactory.DEFAULT_PING_INTERVAL; + private boolean prSingleHopEnabled = PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED; private int readTimeout = PoolFactory.DEFAULT_READ_TIMEOUT; private int retryAttempts = PoolFactory.DEFAULT_RETRY_ATTEMPTS; private String serverGroup = PoolFactory.DEFAULT_SERVER_GROUP; @@ -149,7 +151,9 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis poolFactory.setLoadConditioningInterval(loadConditioningInterval); poolFactory.setMaxConnections(maxConnections); poolFactory.setMinConnections(minConnections); + poolFactory.setMultiuserAuthentication(multiUserAuthentication); poolFactory.setPingInterval(pingInterval); + poolFactory.setPRSingleHopEnabled(prSingleHopEnabled); poolFactory.setReadTimeout(readTimeout); poolFactory.setRetryAttempts(retryAttempts); poolFactory.setServerGroup(serverGroup); @@ -334,4 +338,18 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } + + /** + * @param multiUserAuthentication the multiUserAuthentication to set + */ + public void setMultiUserAuthentication(boolean multiUserAuthentication) { + this.multiUserAuthentication = multiUserAuthentication; + } + + /** + * @param prSingleHopEnabled the prSingleHopEnabled to set + */ + public void setPrSingleHopEnabled(boolean prSingleHopEnabled) { + this.prSingleHopEnabled = prSingleHopEnabled; + } } \ No newline at end of file diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.1.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.1.xsd index 2c14ed62..9ad8f8b6 100644 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.1.xsd +++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.1.xsd @@ -942,7 +942,9 @@ The name of the pool definition (by default "gemfire-pool").]]> + + diff --git a/src/test/java/org/springframework/data/gemfire/config/PoolNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/PoolNamespaceTest.java index e042b488..f0719580 100644 --- a/src/test/java/org/springframework/data/gemfire/config/PoolNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/PoolNamespaceTest.java @@ -17,6 +17,7 @@ package org.springframework.data.gemfire.config; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Collection; @@ -64,6 +65,8 @@ public class PoolNamespaceTest { assertEquals(6000, TestUtils.readField("freeConnectionTimeout", pfb)); assertEquals(5000l, TestUtils.readField("pingInterval", pfb)); assertTrue((Boolean) TestUtils.readField("subscriptionEnabled", pfb)); + assertFalse((Boolean) TestUtils.readField("multiUserAuthentication", pfb)); + assertTrue((Boolean) TestUtils.readField("prSingleHopEnabled", pfb)); Collection servers = TestUtils.readField("servers", pfb); assertEquals(2, servers.size()); diff --git a/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml index a0259d2f..ea2bff73 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml @@ -20,7 +20,7 @@ - +