From a810979d85db8577367ad4bdbcde1a1411ae0b44 Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Mon, 1 Aug 2011 19:39:23 +0200
Subject: [PATCH 1/3] removed commented out threads from test-server-properties

---
 spring-data-neo4j-rest/src/test/resources/test-db.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-data-neo4j-rest/src/test/resources/test-db.properties b/spring-data-neo4j-rest/src/test/resources/test-db.properties
index 798affebe..64291a371 100644
--- a/spring-data-neo4j-rest/src/test/resources/test-db.properties
+++ b/spring-data-neo4j-rest/src/test/resources/test-db.properties
@@ -1,2 +1 @@
 org.neo4j.server.database.location=target/test-db
-#org.neo4j.server.webserver.maxthreads=2

From a4d87e382aa9a988fcf17e43f354014e2d4e7026 Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Mon, 1 Aug 2011 14:41:25 -0400
Subject: [PATCH 2/3] added pluginRepository for Maven 3.0

---
 pom.xml                          | 7 ++++++-
 spring-data-graph-parent/pom.xml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 182044f4f..6f7e45a76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,10 +371,15 @@
 	</build>
     <pluginRepositories>
         <pluginRepository>
-            <id>repository.source.maven.release</id>
+            <id>repository.springsource.maven.bundles.release</id>
             <name>SpringSource Maven Release Repository</name>
             <url>http://repository.springsource.com/maven/bundles/release</url>
         </pluginRepository>
+		<pluginRepository>
+			<id>repository.springframework.maven.release</id>
+			<name>Spring Framework Maven Release Repository</name>
+			<url>http://maven.springframework.org/release</url>
+		</pluginRepository>
         <pluginRepository>
             <id>jboss-legacy-repository</id>
             <name>Old JBoss Public Repository</name>
diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index 0f226e868..fc7bb1fed 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -452,7 +452,7 @@
 	<pluginRepositories>
 		<pluginRepository>
 			<!-- necessary for utils -->
-			<id>repository.plugin.springsource.release</id>
+            <id>repository.springsource.maven.bundles.release</id>
 			<name>SpringSource Maven Repository</name>
 			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</pluginRepository>

From 4b8c75557eca14077e9d445e8bc93a7704533a31 Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Tue, 2 Aug 2011 22:18:04 +0200
Subject: [PATCH 3/3] trying to figure out the rest-test-connection issue

---
 .../org/springframework/data/neo4j/rest/RequestResult.java    | 2 +-
 .../java/org/springframework/data/neo4j/rest/RestRequest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
index e17350de5..700242bf1 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
@@ -39,7 +39,7 @@ public class RequestResult {
     public static RequestResult extractFrom(ClientResponse clientResponse) {
         final int status = clientResponse.getStatus();
         final URI location = clientResponse.getLocation();
-        final String data = status != Response.Status.NO_CONTENT.getStatusCode() ? clientResponse.getEntity(String.class) : null;
+        final String data = clientResponse.hasEntity() ? clientResponse.getEntity(String.class) : null;
         clientResponse.close();
         return new RequestResult(status, location, data);
     }
diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
index 395ee5a2a..0d9fa8d37 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
 
 public class RestRequest {
 
-    public static final int CONNECT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
-    public static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
+    public static final int CONNECT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(300);
+    public static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(300);
     private final URI baseUri;
     private final Client client;