Skip to content

Commit

Permalink
GEODE-1025: Switching the latest SDG version and reanabling SDG test
Browse files Browse the repository at this point in the history
Spring Data Gemfire (SDG) now implements a service provider required
to start the cache server with spring. Switching to point at the latest
SDG snapshot and renabling the test for starting with SDG.
  • Loading branch information
upthewaterspout committed Apr 7, 2016
1 parent f2eeebb commit 22906e0
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 7 deletions.
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ allprojects {
maven { url "http://repo.spring.io/release" }
maven { url "http://repo.spring.io/milestone" }
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/libs-release" }
maven { url "http://repo.spring.io/ext-release-local" }
}

group = "org.apache.geode"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -799,8 +799,7 @@ public String description() {
assertEquals(Status.NOT_RESPONDING, locatorState.getStatus());
}

@Ignore("Disabled until GEODE-1025, SGF-476 are resolved")
public void IGNORE_test013StartServerWithSpring() {
public void test013StartServerWithSpring() {
String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
File workingDirectory = new File(pathname);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
">

<util:properties id="gemfireProperties">
<prop key="name">SpringGemFireServerBootstrap</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">config</prop>
<prop key="log-file">spring_server.log</prop>
<prop key="http-service-port">0</prop>
</util:properties>

<gfe:cache properties-ref="gemfireProperties" copy-on-read="true"
critical-heap-percentage="0.95" eviction-heap-percentage="0.85"
pdx-ignore-unread-fields="false" pdx-persistent="true" pdx-read-serialized="true"/>

<gfe:partitioned-region id="Example" persistent="false"/>

</beans>
Original file line number Diff line number Diff line change
Expand Up @@ -1172,9 +1172,8 @@ protected List<String> getSpringJars() {
}
})) {
String jarFileName = jarFile.getName();
String jarFileNamePrefix = jarFileName.substring(0, jarFileName.lastIndexOf("-"));

if (SPRING_JAR_NAME_PREFIXES.contains(jarFileNamePrefix.toLowerCase().trim())) {
if (SPRING_JAR_NAME_PREFIXES.stream().anyMatch(prefix -> jarFileName.startsWith(prefix))) {
springJarFilePathnames.add(jarFile.getAbsolutePath());
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependency-versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ scala.version = 2.10.0
slf4j-api.version = 1.7.7
snappy-java.version = 1.1.1.6
spring-data-commons.version = 1.9.1.RELEASE
spring-data-gemfire.version = 1.7.2.RELEASE
spring-data-gemfire.version = 1.7.0.APACHE-GEODE-EA-SNAPSHOT
spring-hateos.version = 0.16.0.RELEASE
spring-shell.version = 1.1.0.RELEASE
spring-ldap-core.version = 1.3.2.RELEASE
Expand Down

0 comments on commit 22906e0

Please sign in to comment.