From a194942d899062a491401192d18ca4c8b86dce9b Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 19 Mar 2012 21:03:40 +0200 Subject: [PATCH] backport from 1.1.x 33e3a6c - c20602d meaning: c20602d 7f9a096 d439f9b 33e3a6c changed xsd:boolean to string SGF-78 handle CACHING_PROXY in client FB SGF-80 update spring & gemfire dependencies update changelog re-add handle CACHING_PROXY in client FB SGF-80 --- docs/src/info/changelog.txt | 10 +++++++++- gradle.properties | 6 +++--- samples/hello-world/gradle.properties | 2 +- .../data/gemfire/client/ClientRegionFactoryBean.java | 3 +++ .../data/gemfire/config/spring-gemfire-1.1.xsd | 4 ++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt index 757eb528..d8628bbf 100644 --- a/docs/src/info/changelog.txt +++ b/docs/src/info/changelog.txt @@ -2,11 +2,19 @@ SPRING DATA GEMFIRE CHANGELOG ============================= http://www.springsource.org/spring-gemfire -Changes in version 1.1.0.RELEASE (2011-12-14) +Changes in version 1.1.1.RELEASE (2012-03-20) --------------------------------------------- +General +* Upgraded to GemFire 6.6.2 +* Upgraded to Spring Framework 3.1.1 GA + Package org.springframework.data.gemfire * Fixed incorrect parsing of pdx-serializer (from value to reference) +* Fixed incorrect parsing of use-bean-factory-locator + +Package org.springframework.data.gemfire.client +* Fixed bug that caused client namespace to create only local regions Changes in version 1.1.0.RELEASE (2011-12-14) diff --git a/gradle.properties b/gradle.properties index db667a51..2e08bd17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ log4jVersion = 1.2.16 slf4jVersion = 1.6.4 # Common libraries -springVersion = 3.1.0.RELEASE +springVersion = 3.1.1.RELEASE springDataCommonsVersion = 1.3.0.M1 -gemfireVersion = 6.6.1 +gemfireVersion = 6.6.2 # Testing junitVersion = 4.8.1 @@ -17,7 +17,7 @@ hamcrestVersion = 1.2.1 # Manifest properties ## OSGi ranges -spring.range = "[3.1.0, 4.0.0)" +spring.range = "[3.0.0, 4.0.0)" gemfire.range = "[6.5, 7.0)" # -------------------- diff --git a/samples/hello-world/gradle.properties b/samples/hello-world/gradle.properties index 048ae069..16890fe1 100644 --- a/samples/hello-world/gradle.properties +++ b/samples/hello-world/gradle.properties @@ -1,3 +1,3 @@ junitVersion = 4.8.1 -springVersion = 3.1.0.RELEASE +springVersion = 3.1.1.RELEASE version = 1.2.0.BUILD-SNAPSHOT diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java index d10968bc..705d7b84 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java @@ -93,6 +93,9 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean else if (DataPolicy.PERSISTENT_REPLICATE.equals(dataPolicy)) { s = ClientRegionShortcut.LOCAL_PERSISTENT; } + else if (DataPolicy.NORMAL.equals(this.dataPolicy)) { + s = ClientRegionShortcut.CACHING_PROXY; + } else { s = ClientRegionShortcut.LOCAL; } 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 6f1d1a9c..37fe5a6f 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 @@ -6,7 +6,7 @@ targetNamespace="http://www.springframework.org/schema/gemfire" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.1"> + version="1.1.1"> @@ -1074,7 +1074,7 @@ The client subscription configuration that is used to control a clients use of s - +