diff --git a/build/ivy/settings/ivy.xml b/build/ivy/settings/ivy.xml index 3e7f55830..0c1703276 100644 --- a/build/ivy/settings/ivy.xml +++ b/build/ivy/settings/ivy.xml @@ -8,7 +8,7 @@ - + diff --git a/build/ivy/settings/ivysettings.xml b/build/ivy/settings/ivysettings.xml index b534a933c..704bb0fbc 100644 --- a/build/ivy/settings/ivysettings.xml +++ b/build/ivy/settings/ivysettings.xml @@ -11,7 +11,7 @@ - + diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml index 88d7247a0..309322378 100644 --- a/spring-data-neo4j-aspects/pom.xml +++ b/spring-data-neo4j-aspects/pom.xml @@ -130,7 +130,6 @@ org.mockito mockito-all - test diff --git a/spring-data-neo4j-examples/cineasts-aspects/pom.xml b/spring-data-neo4j-examples/cineasts-aspects/pom.xml index 9454d809c..2eb0590cd 100644 --- a/spring-data-neo4j-examples/cineasts-aspects/pom.xml +++ b/spring-data-neo4j-examples/cineasts-aspects/pom.xml @@ -14,7 +14,7 @@ 3.0.7.RELEASE 1.6.1 UTF-8 - 1.6.M02 + 1.6 2.1.0.BUILD-SNAPSHOT 1.6.12 1.6.1 diff --git a/spring-data-neo4j-examples/cineasts-rest/pom.xml b/spring-data-neo4j-examples/cineasts-rest/pom.xml index cbd7e947f..a0a92b634 100644 --- a/spring-data-neo4j-examples/cineasts-rest/pom.xml +++ b/spring-data-neo4j-examples/cineasts-rest/pom.xml @@ -14,13 +14,18 @@ 3.0.7.RELEASE 1.6.1 UTF-8 - 1.6.M02 + 1.6 2.1.0.BUILD-SNAPSHOT 1.6.12 1.6.1 + 1.4 + + Sun + http://download.java.net/maven/2 + spring-maven-release Spring Maven Release Repository @@ -276,6 +281,19 @@ ${neo4j.version} + + com.sun.jersey + jersey-client + ${jersey.version} + test + + + com.sun.jersey + jersey-server + ${jersey.version} + test + + org.neo4j.app neo4j-server diff --git a/spring-data-neo4j-examples/cineasts/pom.xml b/spring-data-neo4j-examples/cineasts/pom.xml index a00afc93f..e36241580 100644 --- a/spring-data-neo4j-examples/cineasts/pom.xml +++ b/spring-data-neo4j-examples/cineasts/pom.xml @@ -17,7 +17,7 @@ 2.1.0.BUILD-SNAPSHOT 1.6.1 1.6.12 - 1.6.M02 + 1.6 diff --git a/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml b/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml index d1bd7bcfa..5fb5f95e1 100644 --- a/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml +++ b/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml @@ -8,7 +8,7 @@ - + diff --git a/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivysettings.xml b/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivysettings.xml index b534a933c..704bb0fbc 100644 --- a/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivysettings.xml +++ b/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivysettings.xml @@ -11,7 +11,7 @@ - + diff --git a/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml b/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml index 58f5da722..eebaf840e 100644 --- a/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml +++ b/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml @@ -6,7 +6,7 @@ - + diff --git a/spring-data-neo4j-examples/hello-worlds/settings/ivysettings.xml b/spring-data-neo4j-examples/hello-worlds/settings/ivysettings.xml index b534a933c..704bb0fbc 100644 --- a/spring-data-neo4j-examples/hello-worlds/settings/ivysettings.xml +++ b/spring-data-neo4j-examples/hello-worlds/settings/ivysettings.xml @@ -11,7 +11,7 @@ - + diff --git a/spring-data-neo4j-examples/myrestaurants-social/pom.xml b/spring-data-neo4j-examples/myrestaurants-social/pom.xml index 024649049..0d629535e 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/pom.xml +++ b/spring-data-neo4j-examples/myrestaurants-social/pom.xml @@ -11,9 +11,9 @@ 2.1.0.BUILD-SNAPSHOT 1.6.12 1.6.1 - 1.6.M02 + 1.6 UTF-8 - 3.0.6.RELEASE + 3.0.7.RELEASE diff --git a/spring-data-neo4j-examples/todos/pom.xml b/spring-data-neo4j-examples/todos/pom.xml index 38a70093a..6ae6c3965 100644 --- a/spring-data-neo4j-examples/todos/pom.xml +++ b/spring-data-neo4j-examples/todos/pom.xml @@ -11,8 +11,8 @@ UTF-8 - 1.5 - 3.0.6.RELEASE + 1.6 + 3.0.7.RELEASE ${project.version} 1.6.12 1.6.1 @@ -26,7 +26,7 @@ neo4j-public-repository - http://m2.neo4j.org/ + http://m2.neo4j.org/releases Publicly available Maven 2 repository for Neo4j diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml index 94a10a328..38308d094 100644 --- a/spring-data-neo4j-parent/pom.xml +++ b/spring-data-neo4j-parent/pom.xml @@ -123,10 +123,10 @@ 1.2.15 1.8.4 1.6.1 - 3.0.6.RELEASE - 1.2.0.RC1 - 1.6.M02 - 0.7-SNAPSHOT + 3.0.7.RELEASE + 1.2.0.RELEASE + 1.6 + 0.7 1.6.12 1.1 1.4 @@ -473,12 +473,6 @@ 1.6.M02 - org.neo4j neo4j-shell @@ -495,6 +489,7 @@ org.neo4j neo4j-spatial ${neo4j.spatial.version} + true org.neo4j @@ -798,7 +793,21 @@ Spring Framework Maven Snapshot Repository http://maven.springframework.org/snapshot - + + neo4j-public-snapshot-repository + Neo4J Public Snapshot Repository + http://m2.neo4j.org/snapshots + + true + + + + neo4j-public-release-repository + Neo4J Public Release Repository + http://m2.neo4j.org/releases + + + diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml index 691a4e39e..515b2a801 100644 --- a/spring-data-neo4j-rest/pom.xml +++ b/spring-data-neo4j-rest/pom.xml @@ -19,10 +19,6 @@ - - neo4j - http://m2.neo4j.org - Sun http://download.java.net/maven/2 @@ -41,14 +37,14 @@ - + org.neo4j neo4j-rest-graphdb - 1.6.M02 + 1.6 org.neo4j diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java index 12d1c2e37..9fab1f81d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java @@ -193,7 +193,7 @@ public abstract class AbstractGraphRepository im } return template.getIndex(clazz,property); } catch(NoSuchIndexException nsie) { - return new NullReadableIndex(nsie.getIndex()); + return new NullReadableIndex(nsie.getIndex(),template.getGraphDatabaseService()); } } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NullReadableIndex.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NullReadableIndex.java index 1f5dc44bd..517389ff9 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NullReadableIndex.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NullReadableIndex.java @@ -15,6 +15,7 @@ */ package org.springframework.data.neo4j.support.index; +import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.index.IndexHits; import org.neo4j.graphdb.index.ReadableIndex; @@ -25,9 +26,11 @@ import org.neo4j.graphdb.index.ReadableIndex; */ public class NullReadableIndex implements ReadableIndex { private final String indexName; + private final GraphDatabaseService graphDatabaseService; - public NullReadableIndex(String indexName) { + public NullReadableIndex(String indexName, GraphDatabaseService graphDatabaseService) { this.indexName = indexName; + this.graphDatabaseService = graphDatabaseService; } @Override @@ -35,6 +38,11 @@ public class NullReadableIndex implements ReadableI return indexName; } + @Override + public GraphDatabaseService getGraphDatabase() { + return graphDatabaseService; + } + @Override public Class getEntityType() { return null; diff --git a/src/docbkx/reference/programming-model/typerepresentationstrategy.xml b/src/docbkx/reference/programming-model/typerepresentationstrategy.xml index fc1fd7e59..198669e56 100644 --- a/src/docbkx/reference/programming-model/typerepresentationstrategy.xml +++ b/src/docbkx/reference/programming-model/typerepresentationstrategy.xml @@ -21,7 +21,7 @@ Stores entity types in the integrated index. Each entity node gets indexed with its type and - all supertypes that are also @NodeEntity-annotated. The special index used for this + all supertypes and interfaces that are also @NodeEntity-annotated. The special index used for this is named __types__. Additionally, in order to retrieve the type of an entity node, each node has a property __type__ with the fully qualified type of that entity. @@ -31,7 +31,7 @@ SubReferenceNodeTypeRepresentationStrategy - Stores entity types in a tree in the graph representing the type hierarchy. Each entity + Stores entity types in a tree in the graph representing the type and interface hierarchy. Each entity has a INSTANCE_OF relationship to a type node representing that entity's type. The type may or may not have a SUBCLASS_OF relationship to another type node. @@ -57,7 +57,7 @@ Stores relationship entity types in the integrated index. Each entity relationship gets indexed with its type and - all supertypes that are also @RelationshipEntity-annotated. The special index used for this + all supertypes and interfaces that are also @RelationshipEntity-annotated. The special index used for this is named __rel_types__. Additionally, in order to retrieve the type of an entity relationship, each relationship has a property __type__ with the fully qualified type of that entity. diff --git a/src/docbkx/reference/setup.xml b/src/docbkx/reference/setup.xml index 3f058ad46..39a40a105 100644 --- a/src/docbkx/reference/setup.xml +++ b/src/docbkx/reference/setup.xml @@ -18,7 +18,7 @@ Dependencies for Spring Data Neo4j Simple Mapping For the simple POJO mapping it is enough to add the org.springframework.data:spring-data-neo4j:2.0.0.RELEASE dependency - to your project. If you want to use the Cypher query language please add org.neo4j:neo4j-cypher:1.6.M02 + to your project. If you want to use the Cypher query language please add org.neo4j:neo4j-cypher:1.6 Maven dependencies for Spring Data Neo4j @@ -139,7 +139,7 @@ repositories { [ org.neo4j neo4j-cypher - 1.6.M02 + 1.6 ] ]]> diff --git a/src/docbkx/tutorial/neo4j.xml b/src/docbkx/tutorial/neo4j.xml index 5129504a8..c30ec57b6 100644 --- a/src/docbkx/tutorial/neo4j.xml +++ b/src/docbkx/tutorial/neo4j.xml @@ -40,7 +40,7 @@ org.neo4j neo4j - 1.6.M02 + 1.6 ]]>