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

DATAGRAPH-174 update to Neo4j 1.6, SpringFramework 3.0.7.RELEASE, Spring Data Commons 1.2.0.RELEASE, Neo4j-Spatial 0.7

Browse Source
This commit is contained in:
Michael Hunger
2012-02-07 15:51:15 +01:00
parent ee4bafa550
commit 4c991abfbe
19 changed files with 71 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/ivy/settings/ivy.xml
View File

@@ -8,7 +8,7 @@
</dependency>
<dependency org="org.aspectj" name="aspectjrt" rev="1.6.12"/>
<dependency org="org.aspectj" name="aspectjtools" rev="1.6.12"/>
<dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
<dependency org="org.neo4j" name="neo4j-community" rev="1.6"/>
<dependency org="junit" name="junit" rev="4.8.1"/>
</dependencies>
</ivy-module>

2
build/ivy/settings/ivysettings.xml
View File

@@ -11,7 +11,7 @@
<ivy pattern="${local-maven2-pattern}"/>
<artifact pattern="${local-maven2-pattern}"/>
</filesystem>
<ibiblio name="neo4j" root="http://m2.neo4j.org/" m2compatible="true"/>
<ibiblio name="neo4j" root="http://m2.neo4j.org/releases" m2compatible="true"/>
<ibiblio name="maven_central" root="http://repo2.maven.org/maven2/" m2compatible="true"/>
<ibiblio name="jboss" root="http://repository.jboss.org/nexus/content/groups/public/" m2compatible="true"/>
<ibiblio name="springframework" root="http://maven.springframework.org/release" m2compatible="true"/>

1
spring-data-neo4j-aspects/pom.xml
View File

@@ -130,7 +130,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
spring-data-neo4j-examples/cineasts-aspects/pom.xml
View File

@@ -14,7 +14,7 @@
<spring.version>3.0.7.RELEASE</spring.version>
<slf4j.version>1.6.1</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<neo4j.version>1.6.M02</neo4j.version>
<neo4j.version>1.6</neo4j.version>
<spring-data-graph.version>2.1.0.BUILD-SNAPSHOT</spring-data-graph.version>
<aspectj.version>1.6.12</aspectj.version>
<org.slf4j-version>1.6.1</org.slf4j-version>

20
spring-data-neo4j-examples/cineasts-rest/pom.xml
View File

@@ -14,13 +14,18 @@
<spring.version>3.0.7.RELEASE</spring.version>
<slf4j.version>1.6.1</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<neo4j.version>1.6.M02</neo4j.version>
<neo4j.version>1.6</neo4j.version>
<spring-data-graph.version>2.1.0.BUILD-SNAPSHOT</spring-data-graph.version>
<aspectj.version>1.6.12</aspectj.version>
<org.slf4j-version>1.6.1</org.slf4j-version>
<jersey.version>1.4</jersey.version>
</properties>
<repositories>
<repository>
<id>Sun</id>
<url>http://download.java.net/maven/2</url>
</repository>
<repository>
<id>spring-maven-release</id>
<name>Spring Maven Release Repository</name>
@@ -276,6 +281,19 @@
<version>${neo4j.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j.app</groupId>
<artifactId>neo4j-server</artifactId>

2
spring-data-neo4j-examples/cineasts/pom.xml
View File

@@ -17,7 +17,7 @@
<spring-data-graph.version>2.1.0.BUILD-SNAPSHOT</spring-data-graph.version>
<org.slf4j-version>1.6.1</org.slf4j-version>
<aspectj.version>1.6.12</aspectj.version>
<neo4j.version>1.6.M02</neo4j.version>
<neo4j.version>1.6</neo4j.version>
</properties>
<repositories>

2
spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml
View File

@@ -8,7 +8,7 @@
</dependency>
<dependency org="org.aspectj" name="aspectjrt" rev="1.6.12"/>
<dependency org="org.aspectj" name="aspectjtools" rev="1.6.12"/>
<dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
<dependency org="org.neo4j" name="neo4j-community" rev="1.6"/>
<dependency org="junit" name="junit" rev="4.8.1"/>
</dependencies>
</ivy-module>

2
spring-data-neo4j-examples/hello-worlds-aspects/settings/ivysettings.xml
View File

@@ -11,7 +11,7 @@
<ivy pattern="${local-maven2-pattern}"/>
<artifact pattern="${local-maven2-pattern}"/>
</filesystem>
<ibiblio name="neo4j" root="http://m2.neo4j.org/" m2compatible="true"/>
<ibiblio name="neo4j" root="http://m2.neo4j.org/releases" m2compatible="true"/>
<ibiblio name="maven_central" root="http://repo2.maven.org/maven2/" m2compatible="true"/>
<ibiblio name="jboss" root="http://repository.jboss.org/nexus/content/groups/public/" m2compatible="true"/>
<ibiblio name="springframework" root="http://maven.springframework.org/release" m2compatible="true"/>

2
spring-data-neo4j-examples/hello-worlds/settings/ivy.xml
View File

@@ -6,7 +6,7 @@
<exclude module="jmxtools"/>
<exclude module="jmxri"/>
</dependency>
<dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
<dependency org="org.neo4j" name="neo4j-community" rev="1.6"/>
<dependency org="junit" name="junit" rev="4.8.1"/>
</dependencies>
</ivy-module>

2
spring-data-neo4j-examples/hello-worlds/settings/ivysettings.xml
View File

@@ -11,7 +11,7 @@
<ivy pattern="${local-maven2-pattern}"/>
<artifact pattern="${local-maven2-pattern}"/>
</filesystem>
<ibiblio name="neo4j" root="http://m2.neo4j.org/" m2compatible="true"/>
<ibiblio name="neo4j" root="http://m2.neo4j.org/releases" m2compatible="true"/>
<ibiblio name="maven_central" root="http://repo2.maven.org/maven2/" m2compatible="true"/>
<ibiblio name="jboss" root="http://repository.jboss.org/nexus/content/groups/public/" m2compatible="true"/>
<ibiblio name="springframework" root="http://maven.springframework.org/release" m2compatible="true"/>

4
spring-data-neo4j-examples/myrestaurants-social/pom.xml
View File

@@ -11,9 +11,9 @@
<spring-data-graph.version>2.1.0.BUILD-SNAPSHOT</spring-data-graph.version>
<aspectj.version>1.6.12</aspectj.version>
<slf4j.version>1.6.1</slf4j.version>
<neo4j.version>1.6.M02</neo4j.version>
<neo4j.version>1.6</neo4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-security.version>3.0.6.RELEASE</spring-security.version>
<spring-security.version>3.0.7.RELEASE</spring-security.version>
</properties>
<repositories>
<repository>

6
spring-data-neo4j-examples/todos/pom.xml
View File

@@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<neo4j.version>1.5</neo4j.version>
<spring.version>3.0.6.RELEASE</spring.version>
<neo4j.version>1.6</neo4j.version>
<spring.version>3.0.7.RELEASE</spring.version>
<spring-data-neo4j.version>${project.version}</spring-data-neo4j.version>
<aspectj.version>1.6.12</aspectj.version>
<slf4j.version>1.6.1</slf4j.version>
@@ -26,7 +26,7 @@
</repository>
<repository>
<id>neo4j-public-repository</id>
<url>http://m2.neo4j.org/</url>
<url>http://m2.neo4j.org/releases</url>
<name>Publicly available Maven 2 repository for Neo4j</name>
</repository>
<repository>

31
spring-data-neo4j-parent/pom.xml
View File

@@ -123,10 +123,10 @@
<log4j.version>1.2.15</log4j.version>
<org.mockito.version>1.8.4</org.mockito.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<org.springframework.version>3.0.6.RELEASE</org.springframework.version>
<data.commons.version>1.2.0.RC1</data.commons.version>
<neo4j.version>1.6.M02</neo4j.version>
<neo4j.spatial.version>0.7-SNAPSHOT</neo4j.spatial.version>
<org.springframework.version>3.0.7.RELEASE</org.springframework.version>
<data.commons.version>1.2.0.RELEASE</data.commons.version>
<neo4j.version>1.6</neo4j.version>
<neo4j.spatial.version>0.7</neo4j.spatial.version>
<aspectj.version>1.6.12</aspectj.version>
<blueprints.version>1.1</blueprints.version>
<gremlin.version>1.4</gremlin.version>
@@ -473,12 +473,6 @@
<version>1.6.M02</version>
<!--optional>true</optional-->
</dependency>
<!--dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-spatial</artifactId>
<version>${neo4j.spatial.version}</version>
<optional>true</optional>
</dependency-->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-shell</artifactId>
@@ -495,6 +489,7 @@
<groupId>org.neo4j</groupId>
<artifactId>neo4j-spatial</artifactId>
<version>${neo4j.spatial.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.neo4j</groupId>
@@ -798,7 +793,21 @@
<name>Spring Framework Maven Snapshot Repository</name>
<url>http://maven.springframework.org/snapshot</url>
</repository>
</repositories>
<repository>
<id>neo4j-public-snapshot-repository</id>
<name>Neo4J Public Snapshot Repository</name>
<url>http://m2.neo4j.org/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>neo4j-public-release-repository</id>
<name>Neo4J Public Release Repository</name>
<url>http://m2.neo4j.org/releases</url>
</repository>
</repositories>
<reporting>
<plugins>
<plugin>

10
spring-data-neo4j-rest/pom.xml
View File

@@ -19,10 +19,6 @@
</properties>
<repositories>
<repository>
<id>neo4j</id>
<url>http://m2.neo4j.org</url>
</repository>
<repository>
<id>Sun</id>
<url>http://download.java.net/maven/2</url>
@@ -41,14 +37,14 @@
</exclusions>
</dependency>
<!--dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
</dependency-->
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-rest-graphdb</artifactId>
<version>1.6.M02</version>
<version>1.6</version>
<exclusions>
<exclusion>
<groupId>org.neo4j</groupId>

2
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java
View File

@@ -193,7 +193,7 @@ public abstract class AbstractGraphRepository<S extends PropertyContainer, T> im
}
return template.getIndex(clazz,property);
} catch(NoSuchIndexException nsie) {
return new NullReadableIndex<S>(nsie.getIndex());
return new NullReadableIndex<S>(nsie.getIndex(),template.getGraphDatabaseService());
}
}

10
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NullReadableIndex.java
View File

@@ -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<S extends PropertyContainer> implements ReadableIndex<S> {
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<S extends PropertyContainer> implements ReadableI
return indexName;
}
@Override
public GraphDatabaseService getGraphDatabase() {
return graphDatabaseService;
}
@Override
public Class<S> getEntityType() {
return null;

6
src/docbkx/reference/programming-model/typerepresentationstrategy.xml
View File

@@ -21,7 +21,7 @@
</para>
<para>
Stores entity types in the integrated index. Each entity node gets indexed with its type and
all supertypes that are also <code>@NodeEntity</code>-annotated. The special index used for this
all supertypes and interfaces that are also <code>@NodeEntity</code>-annotated. The special index used for this
is named <code>__types__</code>. Additionally, in order to retrieve the type of an entity node, each
node has a property <code>__type__</code> with the fully qualified type of that entity.
</para>
@@ -31,7 +31,7 @@
<code>SubReferenceNodeTypeRepresentationStrategy</code>
</para>
<para>
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.
</para>
@@ -57,7 +57,7 @@
</para>
<para>
Stores relationship entity types in the integrated index. Each entity relationship gets indexed with its type and
all supertypes that are also <code>@RelationshipEntity</code>-annotated. The special index used for this
all supertypes and interfaces that are also <code>@RelationshipEntity</code>-annotated. The special index used for this
is named <code>__rel_types__</code>. Additionally, in order to retrieve the type of an entity relationship, each
relationship has a property <code>__type__</code> with the fully qualified type of that entity.
</para>

4
src/docbkx/reference/setup.xml
View File

@@ -18,7 +18,7 @@
<title>Dependencies for Spring Data Neo4j Simple Mapping</title>
<para>
For the simple POJO mapping it is enough to add the <code>org.springframework.data:spring-data-neo4j:2.0.0.RELEASE</code> dependency
to your project. If you want to use the Cypher query language please add <code>org.neo4j:neo4j-cypher:1.6.M02</code>
to your project. If you want to use the Cypher query language please add <code>org.neo4j:neo4j-cypher:1.6</code>
</para>
<example>
<title>Maven dependencies for Spring Data Neo4j</title>
@@ -139,7 +139,7 @@ repositories {
[<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher</artifactId>
<version>1.6.M02</version>
<version>1.6</version>
</dependency>]
]]></programlisting>
</example>

2
src/docbkx/tutorial/neo4j.xml
View File

@@ -40,7 +40,7 @@
<programlisting language="xml" ><![CDATA[<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<version>1.6.M02</version>
<version>1.6</version>
</dependency>
]]></programlisting>
</example>