Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-560 - Prepare next developement iteration.

Browse Source
This commit is contained in:
John Blum
2016-11-02 21:29:54 -07:00
parent 9b3603d399
commit 8c372d72d0
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -2,7 +2,7 @@ antlrVersion=2.7.7
aspectjVersion=1.8.9
assertjVersion=3.5.2
cdiVersion=1.0
gemfireVersion=1.0.0-incubating
gemfireVersion=1.1.0-incubating-SNAPSHOT
googleCodeFindbugsVersion=2.0.2
hamcrestVersion=1.3
jacksonVersion=2.7.6
@@ -20,4 +20,4 @@ springVersion=4.3.3.RELEASE
springDataBuildVersion=1.8.4.RELEASE
springDataCommonsVersion=1.12.4.RELEASE
springShellVersion=1.1.0.RELEASE
version=1.0.0.INCUBATING-RELEASE
version=1.1.0.INCUBATING-SNAPSHOT

4
pom.xml
View File

@@ -13,7 +13,7 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-geode</artifactId>
<version>1.0.0.INCUBATING-RELEASE</version>
<version>1.1.0.INCUBATING-SNAPSHOT</version>
<name>Spring Data Geode</name>
@@ -22,7 +22,7 @@
<antlr.version>2.7.7</antlr.version>
<apache-shiro.version>1.3.2</apache-shiro.version>
<assertj.version>3.5.2</assertj.version>
<gemfire.version>1.0.0-incubating</gemfire.version>
<gemfire.version>1.1.0-incubating-SNAPSHOT</gemfire.version>
<google-code-findbugs.version>2.0.2</google-code-findbugs.version>
<multithreadedtc.version>1.01</multithreadedtc.version>
<servlet-api.version>2.5</servlet-api.version>

4
src/main/java/org/springframework/data/gemfire/config/annotation/ApacheShiroSecurityConfiguration.java
View File

@@ -210,11 +210,11 @@ public class ApacheShiroSecurityConfiguration implements BeanFactoryAware {
if (securityService != null) {
Field isIntegratedSecurity = ReflectionUtils.findField(securityService.getClass(),
"isIntegratedSecurity", Boolean.TYPE);
"isIntegratedSecurity", Boolean.class);
if (isIntegratedSecurity != null) {
ReflectionUtils.makeAccessible(isIntegratedSecurity);
ReflectionUtils.setField(isIntegratedSecurity, securityService, true);
ReflectionUtils.setField(isIntegratedSecurity, securityService, Boolean.TRUE);
return true;
}

20
src/test/java/org/springframework/data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
View File

@@ -183,8 +183,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(20)).intValue());
serverOnePool.setRetryAttempts(1);
serverOnePool.setServerGroup("serverOne");
//serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
serverOnePool.setServers(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 41414)));
serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
return serverOnePool;
}
@@ -198,8 +197,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
serverOnePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(20)).intValue());
serverOnePool.setRetryAttempts(1);
serverOnePool.setServerGroup("serverTwo");
//serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
serverOnePool.setServers(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 42424)));
serverOnePool.setLocators(ConnectionEndpointList.from(newConnectionEndpoint("localhost", 11235)));
return serverOnePool;
}
@@ -256,10 +254,9 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
.setProperty("name", applicationName())
.setProperty("mcast-port", "0")
.setProperty("log-level", logLevel())
//.setProperty("locators", "localhost[11235]")
//.setProperty("enable-cluster-configuration", enableClusterConfiguration())
.setProperty("locators", "localhost[11235]")
.setProperty("groups", groups())
//.setProperty("start-locator", startLocator())
.setProperty("start-locator", startLocator())
.build();
}
@@ -269,10 +266,6 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
abstract String groups();
boolean enableClusterConfiguration() {
return false;
}
String logLevel() {
return System.getProperty("gemfire.log.level", DEFAULT_GEMFIRE_LOG_LEVEL);
}
@@ -314,11 +307,6 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT
@Resource(name = "Cats")
private org.apache.geode.cache.Region<String, Cat> cats;
@Override
boolean enableClusterConfiguration() {
return true;
}
Cat save(Cat cat) {
cats.put(cat.getName(), cat);
return cat;