Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geode.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: upthewaterspout@apache.org
To: commits@geode.incubator.apache.org
Date: Thu, 07 Apr 2016 21:52:51 -0000
Message-Id: <4f603834a80a43d080ec4e7c2ab29213@git.apache.org>
In-Reply-To: <0987c8df65944428a61222241e74b3f2@git.apache.org>
References: <0987c8df65944428a61222241e74b3f2@git.apache.org>
Subject: [2/3] incubator-geode git commit: GEODE-1025: Switching the latest
 SDG version and reanabling SDG test

GEODE-1025: Switching the latest SDG version and reanabling SDG test

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.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/22906e0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/22906e0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/22906e0b

Branch: refs/heads/develop
Commit: 22906e0b3d0926c09bb260bcd312863282b7a3bd
Parents: f2eeebb
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Wed Mar 30 15:50:08 2016 -0700
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Thu Apr 7 14:34:19 2016 -0700

----------------------------------------------------------------------
 build.gradle                                    |  2 -
 .../LauncherLifecycleCommandsDUnitTest.java     |  3 +-
 .../resources/spring/spring-gemfire-context.xml | 43 ++++++++++++++++++++
 .../cli/commands/LauncherLifecycleCommands.java |  3 +-
 gradle/dependency-versions.properties           |  2 +-
 5 files changed, 46 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22906e0b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 150038e..890bce3 100755
--- a/build.gradle
+++ b/build.gradle
@@ -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"

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22906e0b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 2344155..1171207 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -799,8 +799,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     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);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22906e0b/geode-assembly/src/test/resources/spring/spring-gemfire-context.xml
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/resources/spring/spring-gemfire-context.xml b/geode-assembly/src/test/resources/spring/spring-gemfire-context.xml
new file mode 100644
index 0000000..d6f6df3
--- /dev/null
+++ b/geode-assembly/src/test/resources/spring/spring-gemfire-context.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22906e0b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
index 40aa320..d9928c5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -1172,9 +1172,8 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
       }
     })) {
       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());
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22906e0b/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 7a5054b..beb2d26 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -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