From 2eb4a393ebd772b6d354fc0618643e44f8818941 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Wed, 20 Jul 2011 13:51:56 +0200 Subject: [PATCH 1/9] Removed exclusion of impl packages --- spring-data-neo4j/template.mf | 2 -- 1 file changed, 2 deletions(-) diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index f7b029def..51c18555b 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -30,8 +30,6 @@ Import-Template: javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional -Excluded-Imports: - org.neo4j.*.impl.* Import-Package: net.sf.cglib.proxy;version="[2.2.0,3.0.0)", net.sf.cglib.core;version="[2.2.0,3.0.0)", From a810979d85db8577367ad4bdbcde1a1411ae0b44 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Mon, 1 Aug 2011 19:39:23 +0200 Subject: [PATCH 2/9] 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 Date: Mon, 1 Aug 2011 14:41:25 -0400 Subject: [PATCH 3/9] 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 @@ - repository.source.maven.release + repository.springsource.maven.bundles.release SpringSource Maven Release Repository http://repository.springsource.com/maven/bundles/release + + repository.springframework.maven.release + Spring Framework Maven Release Repository + http://maven.springframework.org/release + jboss-legacy-repository Old JBoss Public Repository 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 @@ - repository.plugin.springsource.release + repository.springsource.maven.bundles.release SpringSource Maven Repository http://repository.springsource.com/maven/bundles/release From 4b8c75557eca14077e9d445e8bc93a7704533a31 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 2 Aug 2011 22:18:04 +0200 Subject: [PATCH 4/9] 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; From 6b5112a980f1036ca2dee16d2d99a13f0aceef6e Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 2 Aug 2011 22:30:40 +0200 Subject: [PATCH 5/9] trying to figure out the rest-test-connection issue --- .../java/org/springframework/data/neo4j/rest/RequestResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 700242bf1..a1a24e18c 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 = clientResponse.hasEntity() ? clientResponse.getEntity(String.class) : null; + final String data = status != Response.Status.NO_CONTENT.getStatusCode() ? clientResponse.getEntity(String.class) : null; clientResponse.close(); return new RequestResult(status, location, data); } From cebb5ad3e5df677cff28ab13779437d906ca4498 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Tue, 2 Aug 2011 22:49:14 +0200 Subject: [PATCH 6/9] fixing scope definitions of dependencies and flagging them correctly as optional --- spring-data-graph-parent/pom.xml | 6 +++--- spring-data-neo4j/pom.xml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml index fc7bb1fed..33f6730a0 100644 --- a/spring-data-graph-parent/pom.xml +++ b/spring-data-graph-parent/pom.xml @@ -191,20 +191,20 @@ com.tinkerpop.blueprints blueprints-core ${blueprints.version} - optional + true com.tinkerpop.blueprints blueprints-neo4j-graph ${blueprints.version} - optional + true com.tinkerpop gremlin ${gremlin.version} - optional + true diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index e6119c143..50d5ffadb 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -129,24 +129,24 @@ org.neo4j server-api - optional + true com.tinkerpop.blueprints blueprints-core - optional + true com.tinkerpop.blueprints blueprints-neo4j-graph - optional + true com.tinkerpop gremlin - optional + true From 0d544d41f4840599ac922ac906e6ea1c10cdbe8d Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Tue, 2 Aug 2011 22:50:33 +0200 Subject: [PATCH 7/9] adding version information for the maven-license-plugin to suppress maven warnings --- spring-data-graph-parent/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml index 33f6730a0..b8b061657 100644 --- a/spring-data-graph-parent/pom.xml +++ b/spring-data-graph-parent/pom.xml @@ -388,7 +388,8 @@ com.mycila.maven-license-plugin - maven-license-plugin + maven-license-plugin + 1.9.0 check-licenses From ea667215c618f688e4070b3ad573e409cfbecfba Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Tue, 2 Aug 2011 22:52:50 +0200 Subject: [PATCH 8/9] use the DynamicImport-Package directive to have Class.forName() work in an OSGi environment --- spring-data-neo4j/template.mf | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index f486700ad..0d2ca503a 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -37,3 +37,4 @@ Import-Package: net.sf.cglib.proxy;version="[2.2.0,3.0.0)", net.sf.cglib.core;version="[2.2.0,3.0.0)", net.sf.cglib.reflect;version="[2.2.0,3.0.0)" +DynamicImport-Package: * \ No newline at end of file From f18cd3355067e350b6ae6d4ea6ed8ad978548924 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Tue, 2 Aug 2011 22:54:09 +0200 Subject: [PATCH 9/9] mark the import packages org.neo4j.cypher.* as optional --- spring-data-neo4j/template.mf | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index 0d2ca503a..ab4e5fc82 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -18,6 +18,7 @@ Import-Template: org.springframework.persistence.*;version="[1.0.0, 2.0.0)", org.springframework.data.neo4j.*;version="0", org.neo4j.*;version="0", + org.neo4j.cypher.*;version="0";resolution:=optional, org.w3c.dom.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",