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

Merge branch 'master' of git://github.com/SpringSource/spring-data-graph

Browse Source
This commit is contained in:
Jean-Pierre Bergamin
2011-08-02 22:29:17 +02:00
parent f67f9ab2f3 4b8c75557e
commit f0a84c4711
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -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>

2
spring-data-graph-parent/pom.xml
View File

@@ -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>

2
spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java
View File

@@ -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);
}

4
spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java
View File

@@ -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;

1
spring-data-neo4j-rest/src/test/resources/test-db.properties
View File

@@ -1,2 +1 @@
org.neo4j.server.database.location=target/test-db
#org.neo4j.server.webserver.maxthreads=2