From f41d24ec07bd39ca8a29c8da1a57f06ad958a9dc Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Wed, 30 Nov 2011 10:51:51 +0100 Subject: [PATCH 1/2] Made neo4j-cypher-dsl an optional maven dependendy. Marked plugins, cypher and cypherdsl packages as optional in the osgi manifest. --- spring-data-neo4j-aspects/template.mf | 5 +++-- spring-data-neo4j-cross-store/template.mf | 5 +++-- spring-data-neo4j-rest/template.mf | 4 +++- spring-data-neo4j/pom.xml | 2 +- spring-data-neo4j/template.mf | 6 ++++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf index e59eed60e7..ac7d410626 100644 --- a/spring-data-neo4j-aspects/template.mf +++ b/spring-data-neo4j-aspects/template.mf @@ -15,8 +15,9 @@ Import-Template: org.springframework.data.*;version="[1.0.0, 2.0.0)", org.springframework.persistence.*;version="[1.0.0, 3.0.0)", org.springframework.data.neo4j.*;version="[1.0.0, 3.0.0)", - org.neo4j.*;version="0", - org.neo4j.cypher.*;version="0";resolution:=optional, + org.neo4j.cypherdsl.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.*;version="${neo4j.version}", 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)", diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf index 4bb1733071..c4cd7719da 100644 --- a/spring-data-neo4j-cross-store/template.mf +++ b/spring-data-neo4j-cross-store/template.mf @@ -15,8 +15,9 @@ Import-Template: org.springframework.data.*;version="[1.0.0, 2.0.0)", 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.neo4j.cypherdsl.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.*;version="${neo4j.version}", 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)", diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf index 4b0d196eaa..779b4bd168 100644 --- a/spring-data-neo4j-rest/template.mf +++ b/spring-data-neo4j-rest/template.mf @@ -9,7 +9,9 @@ Import-Template: org.springframework.data.neo4j.annotation.*;version="[1.0.0, 2.0.0)", org.springframework.*;version="[3.0.0, 4.0.0)", org.springframework.data.neo4j.*;version="0", - org.neo4j.*;version="0", + org.neo4j.server.plugins.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.*;version="${neo4j.version}", org.w3c.dom.*;version="0", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.lucene.*;version="0", diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 5490910caf..ead4677ff5 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -131,7 +131,7 @@ org.neo4j neo4j-cypher-dsl - + true org.neo4j diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index 8e6da2424c..868e1ed841 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -15,8 +15,10 @@ Import-Template: org.springframework.data.*;version="[1.0.0, 2.0.0)", 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.neo4j.server.plugins.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.cypherdsl.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional, + org.neo4j.*;version="${neo4j.version}", 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)", From 6322b8a0a6669cb8d2cc36ada7684d3c24f1794b Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Wed, 30 Nov 2011 13:00:56 +0100 Subject: [PATCH 2/2] Define postConstruct as the initMethod of the Neo4jTemplate bean --- .../springframework/data/neo4j/config/Neo4jConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java index f06c876399..eba836d98c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java @@ -111,7 +111,8 @@ public MappingInfrastructure mappingInfrastructure() throws Exception { } return infrastructure; } - @Bean + + @Bean(initMethod="postConstruct") public Neo4jTemplate neo4jTemplate() throws Exception { final Neo4jTemplate neo4jTemplate = new Neo4jTemplate(); neo4jTemplate.setInfrastructure(mappingInfrastructure());