diff --git a/pom.xml b/pom.xml index 4fb1a10e4..11321643d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.springframework.data - spring-datastore-graph-dist - Spring Datastore Graph Distribution + spring-data-graph-dist + Spring Data Graph Distribution 1.0.0.BUILD-SNAPSHOT pom - spring-datastore-graph-parent - spring-datastore-graph-core - spring-datastore-neo4j - spring-datastore-neo4j-roo + spring-data-graph-parent + spring-data-graph-core + spring-data-neo4j + spring-data-neo4j-roo @@ -89,8 +89,8 @@ UTF-8 - spring-datastore-graph - Spring Datastore Graph + spring-data-graph + Spring Data Graph DATAGRAPH ${project.version} snapshot @@ -109,15 +109,15 @@ spring-site-staging - file:///${java.io.tmpdir}/spring-data/datastore-graph/docs/${project.version} + file:///${java.io.tmpdir}/spring-data/data-graph/docs/${project.version} spring-milestone-staging - file:///${java.io.tmpdir}/spring-data/datastore-graph/milestone + file:///${java.io.tmpdir}/spring-data/data-graph/milestone spring-snapshot-staging - file:///${java.io.tmpdir}/spring-data/datastore-graph/snapshot + file:///${java.io.tmpdir}/spring-data/data-graph/snapshot @@ -127,7 +127,7 @@ http://www.springsource.com/download/community static.springframework.org - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-graph/docs/${project.version} + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/docs/${project.version} spring-milestone @@ -206,7 +206,7 @@ @@ -224,7 +224,7 @@ true true -
Spring Datastore Graph
+
Spring Data Graph
1.5 true ${project.basedir}/src/main/javadoc diff --git a/spring-datastore-graph-core/.classpath b/spring-data-graph-core/.classpath similarity index 77% rename from spring-datastore-graph-core/.classpath rename to spring-data-graph-core/.classpath index cf634bd40..5d96226ab 100644 --- a/spring-datastore-graph-core/.classpath +++ b/spring-data-graph-core/.classpath @@ -2,11 +2,7 @@ - - - - - + diff --git a/spring-datastore-graph-core/.project b/spring-data-graph-core/.project similarity index 95% rename from spring-datastore-graph-core/.project rename to spring-data-graph-core/.project index 031ee3b7e..6d08c86f8 100644 --- a/spring-datastore-graph-core/.project +++ b/spring-data-graph-core/.project @@ -1,6 +1,6 @@ - spring-datastore-graph-core + spring-data-graph-core @@ -16,12 +16,12 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.maven.ide.eclipse.maven2Builder diff --git a/spring-datastore-graph-core/.settings/org.eclipse.jdt.core.prefs b/spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from spring-datastore-graph-core/.settings/org.eclipse.jdt.core.prefs rename to spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs diff --git a/spring-datastore-graph-core/.settings/org.eclipse.wst.common.component b/spring-data-graph-core/.settings/org.eclipse.wst.common.component similarity index 100% rename from spring-datastore-graph-core/.settings/org.eclipse.wst.common.component rename to spring-data-graph-core/.settings/org.eclipse.wst.common.component diff --git a/spring-datastore-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml similarity index 100% rename from spring-datastore-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml rename to spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/spring-datastore-graph-core/.settings/org.maven.ide.eclipse.prefs b/spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from spring-datastore-graph-core/.settings/org.maven.ide.eclipse.prefs rename to spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs diff --git a/spring-datastore-graph-core/pom.xml b/spring-data-graph-core/pom.xml similarity index 90% rename from spring-datastore-graph-core/pom.xml rename to spring-data-graph-core/pom.xml index a224abe44..b12332055 100644 --- a/spring-datastore-graph-core/pom.xml +++ b/spring-data-graph-core/pom.xml @@ -3,13 +3,13 @@ 4.0.0 org.springframework.data - spring-datastore-graph-parent + spring-data-graph-parent 1.0.0.BUILD-SNAPSHOT - ../spring-datastore-graph-parent/pom.xml + ../spring-data-graph-parent/pom.xml - spring-datastore-graph-core + spring-data-graph-core jar - Spring Datastore Graph Datastore Support + Spring Data Graph Support diff --git a/spring-datastore-graph-core/src/main/java/org/springframework/datastore/graph/UncategorizedGraphStoreException.java b/spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java similarity index 95% rename from spring-datastore-graph-core/src/main/java/org/springframework/datastore/graph/UncategorizedGraphStoreException.java rename to spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java index 961c3a6f3..44ec909c3 100644 --- a/spring-datastore-graph-core/src/main/java/org/springframework/datastore/graph/UncategorizedGraphStoreException.java +++ b/spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph; +package org.springframework.data.graph; import org.springframework.dao.UncategorizedDataAccessException; diff --git a/spring-datastore-graph-core/template.mf b/spring-data-graph-core/template.mf similarity index 71% rename from spring-datastore-graph-core/template.mf rename to spring-data-graph-core/template.mf index 38295009b..d36e0b73b 100644 --- a/spring-datastore-graph-core/template.mf +++ b/spring-data-graph-core/template.mf @@ -1,5 +1,5 @@ -Bundle-SymbolicName: org.springframework.datastore.graph -Bundle-Name: Spring Datastore Graph +Bundle-SymbolicName: org.springframework.data.graph +Bundle-Name: Spring Data Graph Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: @@ -10,8 +10,8 @@ Import-Template: org.springframework.dao.*;version="[3.0.0, 4.0.0)", org.springframework.util.*;version="[3.0.0, 4.0.0)", org.springframework.data.core.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.persistence.*;version="[1.0.0, 2.0.0)", + org.springframework.data.core.*;version="[1.0.0, 2.0.0)", + org.springframework.data.persistence.*;version="[1.0.0, 2.0.0)", org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.w3c.dom.*;version="0" diff --git a/spring-datastore-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml similarity index 95% rename from spring-datastore-graph-parent/pom.xml rename to spring-data-graph-parent/pom.xml index ceb8b56ca..ee4f293ef 100644 --- a/spring-datastore-graph-parent/pom.xml +++ b/spring-data-graph-parent/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.springframework.data - spring-datastore-graph-parent - Spring Datastore Graph Parent - http://www.springsource.org/spring-data/datastore-graph + spring-data-graph-parent + Spring Data Graph Parent + http://www.springsource.org/spring-data/data-graph 1.0.0.BUILD-SNAPSHOT pom @@ -37,15 +37,15 @@ spring-site-staging - file:///${java.io.tmpdir}/spring-data/datastore-graph/docs + file:///${java.io.tmpdir}/spring-data/data-graph/docs spring-milestone-staging - file:///${java.io.tmpdir}/spring-data/datastore-graph/milestone + file:///${java.io.tmpdir}/spring-data/data-graph/milestone spring-snapshot-staging - file:///${java.io.tmpdir}/spring-data/datastore-graph/snapshot + file:///${java.io.tmpdir}/spring-data/data-graph/snapshot @@ -60,7 +60,7 @@ static.springframework.org - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-graph/docs/${project.version} + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/docs/${project.version} @@ -132,12 +132,12 @@ org.springframework.data - spring-datastore-graph-core + spring-data-graph-core ${project.version} org.springframework.data - spring-datastore-neo4j + spring-data-neo4j ${project.version} diff --git a/spring-datastore-neo4j-roo/.classpath b/spring-data-neo4j-roo/.classpath similarity index 100% rename from spring-datastore-neo4j-roo/.classpath rename to spring-data-neo4j-roo/.classpath diff --git a/spring-datastore-neo4j-roo/.project b/spring-data-neo4j-roo/.project similarity index 93% rename from spring-datastore-neo4j-roo/.project rename to spring-data-neo4j-roo/.project index 142fa55f3..4b6128a0b 100644 --- a/spring-datastore-neo4j-roo/.project +++ b/spring-data-neo4j-roo/.project @@ -1,6 +1,6 @@ - spring-datastore-neo4j-roo + spring-data-neo4j-roo diff --git a/spring-datastore-neo4j-roo/.settings/org.eclipse.jdt.core.prefs b/spring-data-neo4j-roo/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from spring-datastore-neo4j-roo/.settings/org.eclipse.jdt.core.prefs rename to spring-data-neo4j-roo/.settings/org.eclipse.jdt.core.prefs diff --git a/spring-datastore-neo4j-roo/.settings/org.maven.ide.eclipse.prefs b/spring-data-neo4j-roo/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from spring-datastore-neo4j-roo/.settings/org.maven.ide.eclipse.prefs rename to spring-data-neo4j-roo/.settings/org.maven.ide.eclipse.prefs diff --git a/spring-datastore-neo4j-roo/pom.xml b/spring-data-neo4j-roo/pom.xml similarity index 94% rename from spring-datastore-neo4j-roo/pom.xml rename to spring-data-neo4j-roo/pom.xml index 27325db68..ac4c32811 100644 --- a/spring-datastore-neo4j-roo/pom.xml +++ b/spring-data-neo4j-roo/pom.xml @@ -3,13 +3,13 @@ 4.0.0 org.springframework.data - spring-datastore-graph-parent + spring-data-graph-parent 1.0.0.BUILD-SNAPSHOT - ../spring-datastore-graph-parent/pom.xml + ../spring-data-graph-parent/pom.xml - spring-datastore-neo4j-roo + spring-data-neo4j-roo jar - Spring Datastore Neo4J Roo Support + Spring Data Neo4J Roo Support 1.6.10.RELEASE @@ -41,7 +41,7 @@ org.springframework.data - spring-datastore-neo4j + spring-data-neo4j @@ -204,7 +204,7 @@ org.springframework.data - spring-datastore-neo4j + spring-data-neo4j 1.6 diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4JQuery.java similarity index 95% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4JQuery.java index dfc994e4c..4164be0b6 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4JQuery.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.finder.Finder; -import org.springframework.datastore.graph.neo4j.finder.FinderFactory; -import org.springframework.datastore.graph.neo4j.support.Tuple2; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.finder.Finder; +import org.springframework.data.graph.neo4j.finder.FinderFactory; +import org.springframework.data.graph.neo4j.support.Tuple2; import javax.persistence.*; import javax.persistence.spi.PersistenceUnitInfo; @@ -27,8 +27,8 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.springframework.datastore.graph.neo4j.jpa.Neo4jQueryParameter.param; -import static org.springframework.datastore.graph.neo4j.support.Tuple2._; +import static org.springframework.data.graph.neo4j.jpa.Neo4jQueryParameter.param; +import static org.springframework.data.graph.neo4j.support.Tuple2._; import static org.springframework.util.ObjectUtils.nullSafeEquals; /** diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManager.java similarity index 97% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManager.java index af77f867f..b465e1503 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManager.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import org.neo4j.graphdb.*; import org.springframework.beans.factory.annotation.Configurable; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.finder.FinderFactory; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.finder.FinderFactory; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerFactory.java similarity index 93% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerFactory.java index dd4d0f079..b7b13718b 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.index.IndexService; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.persistence.support.EntityInstantiator; import javax.persistence.Cache; diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityTransaction.java similarity index 97% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityTransaction.java index f34be0829..feb6c1789 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityTransaction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import javax.persistence.EntityTransaction; import javax.transaction.*; diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jJpaDialect.java similarity index 98% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jJpaDialect.java index 547d85d51..fe4df813f 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jJpaDialect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.datasource.ConnectionHandle; diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jPersistenceProvider.java similarity index 94% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jPersistenceProvider.java index 36fde6803..8a48b8f65 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jPersistenceProvider.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.index.IndexService; import org.springframework.beans.factory.annotation.Configurable; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.persistence.support.EntityInstantiator; import javax.annotation.Resource; diff --git a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jQueryParameter.java similarity index 96% rename from spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java rename to spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jQueryParameter.java index a1aabed6a..cac31d55a 100644 --- a/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java +++ b/spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jQueryParameter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import javax.persistence.Parameter; /** diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Car.java similarity index 55% rename from spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java rename to spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Car.java index 757b4fcf9..47c03c458 100644 --- a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java +++ b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Car.java @@ -1,7 +1,7 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.annotation.NodeEntity; +import org.springframework.data.graph.annotation.NodeEntity; @NodeEntity public abstract class Car { diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Friendship.java similarity index 79% rename from spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java rename to spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Friendship.java index ff78e820b..96ded4ce9 100644 --- a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java +++ b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Friendship.java @@ -1,9 +1,10 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; -import org.springframework.datastore.graph.annotation.EndNode; -import org.springframework.datastore.graph.annotation.RelationshipEntity; -import org.springframework.datastore.graph.annotation.StartNode; +import org.springframework.data.graph.annotation.EndNode; +import org.springframework.data.graph.annotation.RelationshipEntity; +import org.springframework.data.graph.annotation.StartNode; +import org.springframework.data.graph.neo4j.Person; import java.util.Date; diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Person.java similarity index 80% rename from spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java rename to spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Person.java index 48088ff00..750f952eb 100644 --- a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java +++ b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Person.java @@ -1,8 +1,12 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; -import org.springframework.datastore.annotation.Indexed; -import org.springframework.datastore.graph.annotation.*; -import org.springframework.datastore.graph.api.Direction; +import org.springframework.data.graph.annotation.*; +import org.springframework.data.graph.api.Direction; +import org.springframework.data.graph.neo4j.Car; +import org.springframework.data.graph.neo4j.Friendship; +import org.springframework.data.graph.neo4j.Person; +import org.springframework.data.graph.neo4j.Personality; +import org.springframework.data.annotation.Indexed; import java.util.Date; diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Personality.java similarity index 50% rename from spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java rename to spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Personality.java index 56aabee1a..5b4ff038d 100644 --- a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java +++ b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Personality.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; public enum Personality { EXTROVERT, INTROVERT diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest.java similarity index 95% rename from spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java rename to spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest.java index 326399fa8..56c67a470 100644 --- a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java +++ b/spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j.jpa; +package org.springframework.data.graph.neo4j.jpa; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; @@ -16,9 +16,9 @@ import org.junit.*; import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.neo4j.Person; -import org.springframework.datastore.graph.neo4j.spi.node.Neo4jHelper; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.neo4j.Person; +import org.springframework.data.graph.neo4j.spi.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml b/spring-data-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml similarity index 64% rename from spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml rename to spring-data-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml index 98be20d92..5b4ee42c8 100644 --- a/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml +++ b/spring-data-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml @@ -2,10 +2,10 @@ - org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider - org.springframework.datastore.graph.neo4j.Person - org.springframework.datastore.graph.neo4j.Group - org.springframework.datastore.graph.neo4j.Friendship + org.springframework.data.graph.neo4j.jpa.Neo4jPersistenceProvider + org.springframework.data.graph.neo4j.Person + org.springframework.data.graph.neo4j.Group + org.springframework.data.graph.neo4j.Friendship diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml b/spring-data-neo4j-roo/src/test/resources/META-INF/persistence.xml similarity index 81% rename from spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml rename to spring-data-neo4j-roo/src/test/resources/META-INF/persistence.xml index e4381dc2b..381d7c104 100644 --- a/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml +++ b/spring-data-neo4j-roo/src/test/resources/META-INF/persistence.xml @@ -5,8 +5,8 @@ org.hibernate.ejb.HibernatePersistence - org.springframework.datastore.graph.neo4j.partial.User - org.springframework.datastore.graph.neo4j.partial.Restaurant + org.springframework.data.graph.neo4j.partial.User + org.springframework.data.graph.neo4j.partial.Restaurant diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/database.properties b/spring-data-neo4j-roo/src/test/resources/META-INF/spring/database.properties similarity index 100% rename from spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/database.properties rename to spring-data-neo4j-roo/src/test/resources/META-INF/spring/database.properties diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties b/spring-data-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties similarity index 100% rename from spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties rename to spring-data-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties diff --git a/spring-datastore-neo4j-roo/src/test/resources/log4j.properties b/spring-data-neo4j-roo/src/test/resources/log4j.properties similarity index 75% rename from spring-datastore-neo4j-roo/src/test/resources/log4j.properties rename to spring-data-neo4j-roo/src/test/resources/log4j.properties index 86acbf146..091c77eaa 100644 --- a/spring-datastore-neo4j-roo/src/test/resources/log4j.properties +++ b/spring-data-neo4j-roo/src/test/resources/log4j.properties @@ -18,7 +18,7 @@ log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n log4j.category.org.springframework=WARN #log4j.category.org.springframework.data=TRACE -#log4j.category.org.springframework.datastore.support=TRACE +#log4j.category.org.springframework.data.support=TRACE #log4j.category.org.springframework.persistence=TRACE -#log4j.category.org.springframework.datastore.graph.neo4j.spi.Neo4jGraphPersistenceTest=DEBUG -#log4j.category.org.springframework.datastore.graph.neo4j.support=DEBUG +#log4j.category.org.springframework.data.graph.neo4j.spi.Neo4jGraphPersistenceTest=DEBUG +#log4j.category.org.springframework.data.graph.neo4j.support=DEBUG diff --git a/spring-datastore-neo4j-roo/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml b/spring-data-neo4j-roo/src/test/resources/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml similarity index 84% rename from spring-datastore-neo4j-roo/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml rename to spring-data-neo4j-roo/src/test/resources/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml index 38d79ed1a..971b57d98 100644 --- a/spring-datastore-neo4j-roo/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml +++ b/spring-data-neo4j-roo/src/test/resources/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml @@ -59,7 +59,7 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - + @@ -69,9 +69,9 @@ Start datastore config --> - + - + - + @@ -149,10 +149,10 @@ - + - + diff --git a/spring-datastore-neo4j-roo/template.mf b/spring-data-neo4j-roo/template.mf similarity index 76% rename from spring-datastore-neo4j-roo/template.mf rename to spring-data-neo4j-roo/template.mf index 1e1acfe2a..b6e1739a9 100644 --- a/spring-datastore-neo4j-roo/template.mf +++ b/spring-data-neo4j-roo/template.mf @@ -1,5 +1,5 @@ -Bundle-SymbolicName: org.springframework.datastore.neo4j.roo -Bundle-Name: Spring Datastore Neo4J Roo Support +Bundle-SymbolicName: org.springframework.data.neo4j.roo +Bundle-Name: Spring Data Neo4J Roo Support Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: @@ -13,9 +13,9 @@ Import-Template: org.springframework.transaction.*;version="[3.0.0, 4.0.0)", org.springframework.util.*;version="[3.0.0, 4.0.0)", org.springframework.data.core.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.annotation.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.graph.*;version="[1.0.0, 2.0.0)", + org.springframework.data.core.*;version="[1.0.0, 2.0.0)", + org.springframework.data.annotation.*;version="[1.0.0, 2.0.0)", + org.springframework.data.graph.*;version="[1.0.0, 2.0.0)", org.springframework.persistence.*;version="[1.0.0, 2.0.0)", org.neo4j.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", diff --git a/spring-datastore-neo4j/.classpath b/spring-data-neo4j/.classpath similarity index 82% rename from spring-datastore-neo4j/.classpath rename to spring-data-neo4j/.classpath index 8cffbbacf..ca96cfa1e 100644 --- a/spring-datastore-neo4j/.classpath +++ b/spring-data-neo4j/.classpath @@ -4,11 +4,7 @@ - - - - - + diff --git a/spring-datastore-neo4j/.project b/spring-data-neo4j/.project similarity index 96% rename from spring-datastore-neo4j/.project rename to spring-data-neo4j/.project index 068e5358c..a17147aa5 100644 --- a/spring-datastore-neo4j/.project +++ b/spring-data-neo4j/.project @@ -1,6 +1,6 @@ - spring-datastore-neo4j + spring-data-neo4j @@ -16,12 +16,12 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.maven.ide.eclipse.maven2Builder diff --git a/spring-datastore-neo4j/.settings/org.eclipse.jdt.core.prefs b/spring-data-neo4j/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from spring-datastore-neo4j/.settings/org.eclipse.jdt.core.prefs rename to spring-data-neo4j/.settings/org.eclipse.jdt.core.prefs diff --git a/spring-datastore-neo4j/.settings/org.eclipse.wst.common.component b/spring-data-neo4j/.settings/org.eclipse.wst.common.component similarity index 100% rename from spring-datastore-neo4j/.settings/org.eclipse.wst.common.component rename to spring-data-neo4j/.settings/org.eclipse.wst.common.component diff --git a/spring-datastore-neo4j/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-data-neo4j/.settings/org.eclipse.wst.common.project.facet.core.xml similarity index 100% rename from spring-datastore-neo4j/.settings/org.eclipse.wst.common.project.facet.core.xml rename to spring-data-neo4j/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/spring-datastore-neo4j/.settings/org.maven.ide.eclipse.prefs b/spring-data-neo4j/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from spring-datastore-neo4j/.settings/org.maven.ide.eclipse.prefs rename to spring-data-neo4j/.settings/org.maven.ide.eclipse.prefs diff --git a/spring-datastore-neo4j/README.txt b/spring-data-neo4j/README.txt similarity index 71% rename from spring-datastore-neo4j/README.txt rename to spring-data-neo4j/README.txt index 77d6a50d2..ba5219ea3 100644 --- a/spring-datastore-neo4j/README.txt +++ b/spring-data-neo4j/README.txt @@ -1,19 +1,19 @@ -Getting started with datastore-graph-neo4j -========================================== +Getting started with data-graph-neo4j +===================================== It provides an annotation-driven object-graph mapping library. -Datastore-graph-neo4j is to Neo4j what Hibernate is to an RDBMS. It requires +Data-graph-neo4j is to Neo4j what Hibernate is to an RDBMS. It requires AspectJ and Spring Framework. -Standalone setup of project using datastore-graph-neo4j -======================================================= +Standalone setup of project using data-graph-neo4j +================================================== -1. Include datastore-graph-neo4j in your pom.xml: +1. Include data-graph-neo4j in your pom.xml: org.springframework.data - spring-datastore-neo4j + spring-data-neo4j 1.0.0.BUILD-SNAPSHOT @@ -33,7 +33,7 @@ Standalone setup of project using datastore-graph-neo4j org.springframework.data - spring-datastore-neo4j + spring-data-neo4j 1.6 @@ -65,7 +65,7 @@ Standalone setup of project using datastore-graph-neo4j 3. This is a basic Spring XML context configuration to get started. It creates all dependencies required by the library. After this is set up, you can just use the annotated POJOs and they will automatically be backed by Neo4j. The - one thing that the user has to do is wrap any datastore-graph-neo4j usage + one thing that the user has to do is wrap any data-graph-neo4j usage in Neo4j transactions. @@ -94,26 +94,26 @@ Standalone setup of project using datastore-graph-neo4j - - - - + + + + - - + + - - - + + + - + @@ -130,9 +130,9 @@ Standalone setup of project using datastore-graph-neo4j - + - + diff --git a/spring-datastore-neo4j/pom.xml b/spring-data-neo4j/pom.xml similarity index 95% rename from spring-datastore-neo4j/pom.xml rename to spring-data-neo4j/pom.xml index 1c65877dc..45a9cdb03 100644 --- a/spring-datastore-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -3,13 +3,13 @@ 4.0.0 org.springframework.data - spring-datastore-graph-parent + spring-data-graph-parent 1.0.0.BUILD-SNAPSHOT - ../spring-datastore-graph-parent/pom.xml + ../spring-data-graph-parent/pom.xml - spring-datastore-neo4j + spring-data-neo4j jar - Spring Datastore Neo4J Support + Spring Data Neo4J Support 1.6.10.RELEASE @@ -41,7 +41,7 @@ org.springframework.data - spring-datastore-graph-core + spring-data-graph-core diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/EndNode.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/EndNode.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java index edc58fa9f..18661739c 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/EndNode.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphId.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java similarity index 93% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphId.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java index 955112796..922cb070c 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphId.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphInactive.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphInactive.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphInactive.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphInactive.java index 4bda5e574..61bcb1308 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphInactive.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphInactive.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.datastore.graph.api.Direction; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.RelationshipBacked; +import org.springframework.data.graph.api.Direction; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.RelationshipBacked; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphProperty.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphProperty.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java index 5e882a92c..197f64487 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphProperty.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphTraversal.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java similarity index 85% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphTraversal.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java index da635ad72..05f819458 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphTraversal.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.datastore.graph.api.FieldTraversalDescriptionBuilder; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.api.FieldTraversalDescriptionBuilder; +import org.springframework.data.graph.api.NodeBacked; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/NodeEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/NodeEntity.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java index d382d381e..6a5efb0cb 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/NodeEntity.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedTo.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java similarity index 86% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedTo.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java index aba89351d..fa1de0ad1 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedTo.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.datastore.graph.api.Direction; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.api.Direction; +import org.springframework.data.graph.api.NodeBacked; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedToVia.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java similarity index 85% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedToVia.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java index cf1c51d3f..219e10a2e 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedToVia.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.datastore.graph.api.Direction; -import org.springframework.datastore.graph.api.RelationshipBacked; +import org.springframework.data.graph.api.Direction; +import org.springframework.data.graph.api.RelationshipBacked; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelationshipEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelationshipEntity.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java index fcecc1bf3..1a79ac288 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelationshipEntity.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/StartNode.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/StartNode.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java index 4c7215659..104f364d1 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/StartNode.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/Direction.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/Direction.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/Direction.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/api/Direction.java index ac0ee15e1..44ffba85a 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/Direction.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/Direction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.api; +package org.springframework.data.graph.api; public enum Direction { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/FieldTraversalDescriptionBuilder.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/FieldTraversalDescriptionBuilder.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/FieldTraversalDescriptionBuilder.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/api/FieldTraversalDescriptionBuilder.java index 32fbdbad7..f11912c14 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/FieldTraversalDescriptionBuilder.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/FieldTraversalDescriptionBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.api; +package org.springframework.data.graph.api; import org.neo4j.graphdb.traversal.TraversalDescription; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/GraphBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/GraphBacked.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/GraphBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/api/GraphBacked.java index 6c586068d..a7e17c0a3 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/GraphBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/GraphBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.api; +package org.springframework.data.graph.api; import org.neo4j.graphdb.PropertyContainer; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeBacked.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeBacked.java index 2b904a8ff..8034cc100 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.api; +package org.springframework.data.graph.api; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeTypeStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeTypeStrategy.java similarity index 90% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeTypeStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeTypeStrategy.java index 383f1d433..7b72273f4 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeTypeStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeTypeStrategy.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.api; +package org.springframework.data.graph.api; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.api.NodeBacked; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/RelationshipBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/RelationshipBacked.java similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/RelationshipBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/api/RelationshipBacked.java index 7e88637a4..814fc45b8 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/RelationshipBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/api/RelationshipBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.api; +package org.springframework.data.graph.api; import org.neo4j.graphdb.Relationship; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java index b216c2e84..6721a2bde 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.HashSet; import java.util.Set; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java index da733d4ff..7affdf669 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.PropertyContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.springframework.core.convert.ConversionService; -import org.springframework.datastore.graph.api.GraphBacked; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.RelationshipBacked; +import org.springframework.data.graph.api.GraphBacked; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.RelationshipBacked; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java similarity index 96% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java index abe2d65b0..9ed3060db 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.datastore.graph.api.GraphBacked; +import org.springframework.data.graph.api.GraphBacked; import java.lang.reflect.Field; import java.util.List; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java index d263cfa23..9ea211dfe 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.datastore.graph.annotation.NodeEntity; -import org.springframework.datastore.graph.annotation.RelationshipEntity; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.annotation.RelationshipEntity; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java index 3799f2fa7..4353ddb35 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.api.GraphBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.GraphBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.util.ObjectUtils; import java.lang.reflect.Field; @@ -28,7 +28,7 @@ import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.Map; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DoReturn.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DoReturn.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DoReturn.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DoReturn.java index 2a6c97856..b7548fe37 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DoReturn.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DoReturn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/EntityStateAccessors.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/EntityStateAccessors.java similarity index 80% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/EntityStateAccessors.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/EntityStateAccessors.java index f4b025f67..fc8b93ed4 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/EntityStateAccessors.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/EntityStateAccessors.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.api.GraphBacked; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.GraphBacked; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessListener.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessListener.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java index 9b6e3f3d7..6d7adf1fd 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessListener.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; public interface FieldAccessListener { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessor.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java index 2ac673108..d524d8719 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; public interface FieldAccessor { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java index a65d5ed6e..009fc9793 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java similarity index 98% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java index 8b0541b56..0d81b876d 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java index f099ea167..d9d0ee3a3 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java similarity index 87% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java index 33a80e03b..d2a6c9ce8 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.annotation.GraphId; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.annotation.GraphId; +import org.springframework.data.graph.api.NodeBacked; import javax.persistence.Id; import java.lang.reflect.Field; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java index c52c7931d..ba835471a 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.index.IndexService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; -import org.springframework.datastore.annotation.Indexed; -import org.springframework.datastore.graph.annotation.GraphProperty; -import org.springframework.datastore.graph.annotation.NodeEntity; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.annotation.GraphProperty; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.annotation.Indexed; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java similarity index 93% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java index 2a59ffbc6..f5f228405 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.api.NodeBacked; import javax.persistence.Id; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java index 427851428..4d4a53c48 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.api.NodeBacked; import java.util.AbstractSet; import java.util.Iterator; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java similarity index 98% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java index 41c649c83..5406664e8 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.springframework.beans.factory.FactoryBean; import org.springframework.core.convert.ConversionService; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java similarity index 90% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java index e0e6416bc..8b05e3203 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.Arrays; import java.util.Collection; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java index 7941ba4a2..fe46fd025 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotInTransactionException; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java similarity index 83% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java index 6ae9c3ccd..f4dd6735c 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.datastore.graph.annotation.NodeEntity; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import static org.springframework.datastore.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors.getId; +import static org.springframework.data.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors.getId; public class NodeEntityStateAccessorsFactory { @Autowired diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java similarity index 89% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java index 3312a5891..ad8f5702f 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.DynamicRelationshipType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java index 16c35af66..83c1aa32a 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.HashSet; import java.util.Set; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java index 9fbc19376..31ededb8b 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.annotation.RelatedToVia; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.RelationshipBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.RelatedToVia; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.RelationshipBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.HashSet; import java.util.Set; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; @Configurable public class OneToNRelationshipEntityFieldAccessorFactory implements FieldAccessorFactory { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java index 637310945..a86f2d3bc 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; import java.util.Set; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; public class OneToNRelationshipFieldAccessorFactory extends NodeRelationshipFieldAccessorFactory { @Override diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java index ab677de39..1f9e05765 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotInTransactionException; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import org.springframework.datastore.graph.annotation.GraphProperty; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.GraphProperty; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import javax.persistence.Id; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java index a752b523d..d8bed70d3 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.PropertyContainer; -import org.springframework.datastore.graph.api.GraphBacked; +import org.springframework.data.graph.api.GraphBacked; import java.lang.reflect.Field; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java index 741830663..a7470bf9a 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.RelationshipType; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java similarity index 92% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java index fb69e9d5e..a1543ec56 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotInTransactionException; import org.neo4j.graphdb.Relationship; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import org.springframework.datastore.graph.annotation.GraphInactive; -import org.springframework.datastore.graph.api.RelationshipBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.GraphInactive; +import org.springframework.data.graph.api.RelationshipBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.Arrays; import java.util.Collection; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java similarity index 80% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java index 9f7266db5..185f7dc54 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.RelationshipBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.RelationshipBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; public class RelationshipEntityStateAccessorsFactory { @Autowired diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java index 1ab402a74..4915e3faa 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.annotation.EndNode; -import org.springframework.datastore.graph.annotation.StartNode; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.RelationshipBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.EndNode; +import org.springframework.data.graph.annotation.StartNode; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.RelationshipBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java index eb8958ec4..f8a1fbd94 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.Collections; import java.util.Set; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; public class SingleRelationshipFieldAccessorFactory extends NodeRelationshipFieldAccessorFactory { @Override diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java similarity index 93% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java index 7e023ea27..316c3f02d 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.PropertyContainer; -import org.springframework.datastore.graph.api.GraphBacked; +import org.springframework.data.graph.api.GraphBacked; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java index 95557a7f2..9b5d9f1fe 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.fieldaccess; +package org.springframework.data.graph.neo4j.fieldaccess; import org.neo4j.graphdb.traversal.TraversalDescription; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.annotation.GraphTraversal; -import org.springframework.datastore.graph.api.FieldTraversalDescriptionBuilder; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.finder.Finder; -import org.springframework.datastore.graph.neo4j.finder.FinderFactory; +import org.springframework.data.graph.annotation.GraphTraversal; +import org.springframework.data.graph.api.FieldTraversalDescriptionBuilder; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.finder.Finder; +import org.springframework.data.graph.neo4j.finder.FinderFactory; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.doReturn; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.doReturn; @Configurable public class TraversalFieldAccessorFactory implements FieldAccessorFactory { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/Finder.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/Finder.java similarity index 93% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/Finder.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/Finder.java index 6ea40a2eb..5cc1dc00e 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/Finder.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/Finder.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.finder; +package org.springframework.data.graph.neo4j.finder; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.index.IndexHits; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.Collections; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/FinderFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/FinderFactory.java similarity index 81% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/FinderFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/FinderFactory.java index ebfef2108..1c6467af6 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/FinderFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/FinderFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.finder; +package org.springframework.data.graph.neo4j.finder; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.index.IndexService; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.spi.node.Neo4jHelper; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.spi.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.persistence.support.EntityInstantiator; public class FinderFactory { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java similarity index 96% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java index 2b6692559..b311637b0 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.remoting; +package org.springframework.data.graph.neo4j.remoting; import java.net.MalformedURLException; import java.rmi.RemoteException; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java similarity index 87% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java index 5f07f8316..c480f0429 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.node; +package org.springframework.data.graph.neo4j.spi.node; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.api.NodeBacked; +import org.springframework.data.graph.api.NodeBacked; import org.springframework.persistence.support.AbstractConstructorEntityInstantiator; /** diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jHelper.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jHelper.java similarity index 87% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jHelper.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jHelper.java index 5860b3c24..1230f01f1 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jHelper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jHelper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.node; +package org.springframework.data.graph.neo4j.spi.node; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; public abstract class Neo4jHelper { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jNodeBacking.aj b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jNodeBacking.aj similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jNodeBacking.aj rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jNodeBacking.aj index a2f9b308c..7b22d0e15 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jNodeBacking.aj +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jNodeBacking.aj @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.node; +package org.springframework.data.graph.neo4j.spi.node; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; @@ -25,21 +25,21 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.datastore.graph.annotation.NodeEntity; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.RelationshipBacked; -import org.springframework.datastore.graph.neo4j.fieldaccess.*; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.RelationshipBacked; +import org.springframework.data.graph.neo4j.fieldaccess.*; +import org.springframework.data.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator; +import org.springframework.data.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields; import org.springframework.persistence.support.AbstractConstructorEntityInstantiator; -import org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator; -import org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator; import java.lang.reflect.Field; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap; -import org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap; + import org.springframework.persistence.support.StateProvider; /** diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java similarity index 88% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java index abe4f126e..4ba5bbda7 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.node; +package org.springframework.data.graph.neo4j.spi.node; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.traversal.Traverser; import org.neo4j.helpers.collection.IterableWrapper; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java similarity index 89% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java index 14ea21608..cb2806119 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.node; +package org.springframework.data.graph.neo4j.spi.node; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors; import org.springframework.persistence.support.EntityInstantiator; import org.springframework.persistence.support.StateProvider; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/ShouldProceedOrReturn.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/ShouldProceedOrReturn.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/ShouldProceedOrReturn.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/ShouldProceedOrReturn.java index c90d2c94e..408f25072 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/ShouldProceedOrReturn.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/ShouldProceedOrReturn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.node; +package org.springframework.data.graph.neo4j.spi.node; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/ConstructorBypassingGraphRelationshipInstantiator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/relationship/ConstructorBypassingGraphRelationshipInstantiator.java similarity index 90% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/ConstructorBypassingGraphRelationshipInstantiator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/relationship/ConstructorBypassingGraphRelationshipInstantiator.java index eae6d0833..19c9c3243 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/ConstructorBypassingGraphRelationshipInstantiator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/relationship/ConstructorBypassingGraphRelationshipInstantiator.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.relationship; +package org.springframework.data.graph.neo4j.spi.relationship; import java.lang.reflect.Constructor; import org.neo4j.graphdb.Relationship; -import org.springframework.datastore.graph.api.RelationshipBacked; +import org.springframework.data.graph.api.RelationshipBacked; import org.springframework.persistence.support.EntityInstantiator; import sun.reflect.ReflectionFactory; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj index a1b3197cd..5a15bdddf 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.spi.relationship; +package org.springframework.data.graph.neo4j.spi.relationship; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; @@ -24,10 +24,10 @@ import org.neo4j.graphdb.Relationship; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import org.springframework.datastore.graph.annotation.RelationshipEntity; -import org.springframework.datastore.graph.api.*; -import org.springframework.datastore.graph.neo4j.fieldaccess.*; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.annotation.RelationshipEntity; +import org.springframework.data.graph.api.*; +import org.springframework.data.graph.neo4j.fieldaccess.*; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields; import java.lang.reflect.Field; @@ -35,7 +35,7 @@ import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.Collection; -import static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap; +import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap; public aspect Neo4jRelationshipBacking extends AbstractTypeAnnotatingMixinFields { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/GraphDatabaseContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/GraphDatabaseContext.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java index 0fadddeb7..1465586d0 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/GraphDatabaseContext.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,9 +26,9 @@ import org.neo4j.util.GraphDatabaseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.springframework.core.convert.ConversionService; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.NodeTypeStrategy; -import org.springframework.datastore.graph.api.RelationshipBacked; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.NodeTypeStrategy; +import org.springframework.data.graph.api.RelationshipBacked; import org.springframework.persistence.support.EntityInstantiator; import javax.transaction.Status; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/SubReferenceNodeTypeStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeStrategy.java similarity index 97% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/SubReferenceNodeTypeStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeStrategy.java index f28b9cf3d..4388f8902 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/SubReferenceNodeTypeStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,8 +22,8 @@ import org.neo4j.graphdb.*; import org.neo4j.helpers.collection.CombiningIterable; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.util.GraphDatabaseUtil; -import org.springframework.datastore.graph.api.NodeBacked; -import org.springframework.datastore.graph.api.NodeTypeStrategy; +import org.springframework.data.graph.api.NodeBacked; +import org.springframework.data.graph.api.NodeTypeStrategy; import java.util.*; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/Tuple2.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/Tuple2.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/Tuple2.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/Tuple2.java index beffa27b3..5b2a340b9 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/support/Tuple2.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/Tuple2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/Graph.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Graph.java similarity index 79% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/Graph.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Graph.java index d0d0b26ba..bd1239790 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/Graph.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Graph.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Traverser; import org.springframework.core.convert.converter.Converter; -import org.springframework.datastore.graph.neo4j.template.graph.GraphDescription; -import org.springframework.datastore.graph.neo4j.template.graph.Property; -import org.springframework.datastore.graph.neo4j.template.traversal.Traversal; +import org.springframework.data.graph.neo4j.template.traversal.Traversal; import java.util.List; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/GraphDescription.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/GraphDescription.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/GraphDescription.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/GraphDescription.java index a50dfcab6..386877b82 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/GraphDescription.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/GraphDescription.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.graph; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.neo4j.template.Graph; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/NeoCallback.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoCallback.java similarity index 93% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/NeoCallback.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoCallback.java index aa7c87454..af04dc178 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/NeoCallback.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; public interface NeoCallback { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/NeoGraph.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoGraph.java similarity index 93% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/NeoGraph.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoGraph.java index b0e20f2f0..a24e9dc42 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/NeoGraph.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoGraph.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.graph; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Traverser; import org.springframework.core.convert.converter.Converter; -import org.springframework.datastore.graph.neo4j.template.Graph; -import org.springframework.datastore.graph.neo4j.template.traversal.Traversal; +import org.springframework.data.graph.neo4j.template.traversal.Traversal; import java.util.ArrayList; import java.util.List; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/NeoTemplate.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoTemplate.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/NeoTemplate.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoTemplate.java index a2c31d43c..96071d042 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/NeoTemplate.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NeoTemplate.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; -import org.springframework.datastore.graph.neo4j.template.graph.NeoGraph; public class NeoTemplate { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/NodeInfo.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NodeInfo.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/NodeInfo.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NodeInfo.java index 4305f949e..b3b860c7f 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/NodeInfo.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/NodeInfo.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.graph; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.neo4j.template.Graph; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/Property.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Property.java similarity index 95% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/Property.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Property.java index 96df6d1ff..062d048bc 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/Property.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Property.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.graph; +package org.springframework.data.graph.neo4j.template; public class Property { diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/PropertyParser.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/PropertyParser.java similarity index 94% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/PropertyParser.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/PropertyParser.java index edfd14ebe..0c57b701f 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/PropertyParser.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/PropertyParser.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.graph; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.DynamicRelationshipType; -import org.springframework.datastore.graph.neo4j.template.util.Converter; +import org.springframework.data.graph.neo4j.template.util.Converter; import static java.lang.String.format; import java.util.Map; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/RelationShipNodeInfo.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/RelationShipNodeInfo.java similarity index 96% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/RelationShipNodeInfo.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/RelationShipNodeInfo.java index f5f6445d6..059a6f60c 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/graph/RelationShipNodeInfo.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/RelationShipNodeInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.graph; +package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.RelationshipType; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/traversal/RelationShipTypeDirection.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/traversal/RelationShipTypeDirection.java similarity index 96% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/traversal/RelationShipTypeDirection.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/traversal/RelationShipTypeDirection.java index ce34e778b..bb65da7b4 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/traversal/RelationShipTypeDirection.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/traversal/RelationShipTypeDirection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.traversal; +package org.springframework.data.graph.neo4j.template.traversal; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.RelationshipType; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/traversal/Traversal.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/traversal/Traversal.java similarity index 96% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/traversal/Traversal.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/traversal/Traversal.java index 6a69804d3..b7ca0a27b 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/traversal/Traversal.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/traversal/Traversal.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.traversal; +package org.springframework.data.graph.neo4j.template.traversal; import org.neo4j.graphdb.*; -import org.springframework.datastore.graph.neo4j.template.util.NodeEvaluator; +import org.springframework.data.graph.neo4j.template.util.NodeEvaluator; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/util/Converter.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/Converter.java similarity index 96% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/util/Converter.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/Converter.java index 7e9bcc70c..56444380e 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/util/Converter.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/Converter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.util; +package org.springframework.data.graph.neo4j.template.util; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/util/NodeEvaluator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/NodeEvaluator.java similarity index 91% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/util/NodeEvaluator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/NodeEvaluator.java index 58a58e9fc..7812d83d3 100644 --- a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/template/util/NodeEvaluator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/NodeEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.datastore.graph.neo4j.template.util; +package org.springframework.data.graph.neo4j.template.util; import org.neo4j.graphdb.Node; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Car.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Car.java similarity index 55% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Car.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Car.java index 757b4fcf9..47c03c458 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Car.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Car.java @@ -1,7 +1,7 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.annotation.NodeEntity; +import org.springframework.data.graph.annotation.NodeEntity; @NodeEntity public abstract class Car { diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java similarity index 79% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java index ff78e820b..96ded4ce9 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java @@ -1,9 +1,10 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; -import org.springframework.datastore.graph.annotation.EndNode; -import org.springframework.datastore.graph.annotation.RelationshipEntity; -import org.springframework.datastore.graph.annotation.StartNode; +import org.springframework.data.graph.annotation.EndNode; +import org.springframework.data.graph.annotation.RelationshipEntity; +import org.springframework.data.graph.annotation.StartNode; +import org.springframework.data.graph.neo4j.Person; import java.util.Date; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Group.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java similarity index 85% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Group.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java index 97888be59..1775bfaeb 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Group.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java @@ -1,14 +1,15 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl; -import org.springframework.datastore.graph.annotation.GraphTraversal; -import org.springframework.datastore.graph.annotation.GraphProperty; -import org.springframework.datastore.graph.annotation.NodeEntity; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.api.*; +import org.springframework.data.graph.annotation.GraphProperty; +import org.springframework.data.graph.annotation.GraphTraversal; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.api.*; +import org.springframework.data.graph.neo4j.Person; import java.lang.reflect.Field; import java.util.Collection; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Person.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java similarity index 80% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Person.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java index 48088ff00..08e7cc8e3 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Person.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java @@ -1,8 +1,12 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; -import org.springframework.datastore.annotation.Indexed; -import org.springframework.datastore.graph.annotation.*; -import org.springframework.datastore.graph.api.Direction; +import org.springframework.data.graph.annotation.*; +import org.springframework.data.graph.api.Direction; +import org.springframework.data.annotation.Indexed; +import org.springframework.data.graph.neo4j.Car; +import org.springframework.data.graph.neo4j.Friendship; +import org.springframework.data.graph.neo4j.Person; +import org.springframework.data.graph.neo4j.Personality; import java.util.Date; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Person_Graph_Entity.aj b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person_Graph_Entity.aj similarity index 87% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Person_Graph_Entity.aj rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person_Graph_Entity.aj index 8945c8c39..3aaa44233 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Person_Graph_Entity.aj +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person_Graph_Entity.aj @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; -import org.springframework.datastore.graph.neo4j.spi.node.Neo4jHelper; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.datastore.graph.neo4j.support.SubReferenceNodeTypeStrategy; +import org.springframework.data.graph.neo4j.spi.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeStrategy; /** * EXAMPLE OF CODE THAT SHOULD BE GENERATED BY ROO BESIDES EACH GRAPHENTITY CLASS diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Personality.java similarity index 50% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Personality.java index 56aabee1a..5b4ff038d 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Personality.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; public enum Personality { EXTROVERT, INTROVERT diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Toyota.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Toyota.java similarity index 60% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Toyota.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Toyota.java index 679dbe5b9..463a6cb6b 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Toyota.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Toyota.java @@ -1,6 +1,7 @@ -package org.springframework.datastore.graph.neo4j; +package org.springframework.data.graph.neo4j; import org.neo4j.graphdb.Node; +import org.springframework.data.graph.neo4j.Car; public class Toyota extends Car { public Toyota() { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Volvo.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Volvo.java new file mode 100644 index 000000000..b61102a39 --- /dev/null +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Volvo.java @@ -0,0 +1,15 @@ +package org.springframework.data.graph.neo4j; + +import org.neo4j.graphdb.Node; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.neo4j.Car; + +@NodeEntity +public class Volvo extends Car { + public Volvo() { + } + + public Volvo(Node n) { + setUnderlyingState(n); + } +} diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Cuisine.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Cuisine.java similarity index 66% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Cuisine.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Cuisine.java index 95b14f2e1..f4a840801 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Cuisine.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Cuisine.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j.partial; +package org.springframework.data.graph.neo4j.partial; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Recommendation.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Recommendation.java similarity index 60% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Recommendation.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Recommendation.java index 6d32aacfb..f51978bce 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Recommendation.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Recommendation.java @@ -1,8 +1,8 @@ -package org.springframework.datastore.graph.neo4j.partial; +package org.springframework.data.graph.neo4j.partial; -import org.springframework.datastore.graph.annotation.EndNode; -import org.springframework.datastore.graph.annotation.RelationshipEntity; -import org.springframework.datastore.graph.annotation.StartNode; +import org.springframework.data.graph.annotation.EndNode; +import org.springframework.data.graph.annotation.RelationshipEntity; +import org.springframework.data.graph.annotation.StartNode; /** * @author Michael Hunger diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/RecommendationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/RecommendationTest.java similarity index 89% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/RecommendationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/RecommendationTest.java index d4115d220..9454e7263 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/RecommendationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/RecommendationTest.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j.partial; +package org.springframework.data.graph.neo4j.partial; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -7,8 +7,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.datastore.graph.neo4j.spi.node.Neo4jHelper; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.neo4j.spi.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,7 +20,7 @@ import javax.persistence.PersistenceContext; import javax.sql.DataSource; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/datastore/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml"}) //@TransactionConfiguration(defaultRollback = false) @Transactional public class RecommendationTest { diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Restaurant.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java similarity index 72% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Restaurant.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java index 22f730e0a..6cfe9d5b4 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/Restaurant.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java @@ -1,7 +1,7 @@ -package org.springframework.datastore.graph.neo4j.partial; +package org.springframework.data.graph.neo4j.partial; -import org.springframework.datastore.graph.annotation.GraphProperty; -import org.springframework.datastore.graph.annotation.NodeEntity; +import org.springframework.data.graph.annotation.GraphProperty; +import org.springframework.data.graph.annotation.NodeEntity; import javax.persistence.*; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/User.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java similarity index 83% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/User.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java index ff53b51b9..d057bdbe6 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/partial/User.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java @@ -1,11 +1,11 @@ -package org.springframework.datastore.graph.neo4j.partial; +package org.springframework.data.graph.neo4j.partial; import org.neo4j.graphdb.DynamicRelationshipType; -import org.springframework.datastore.graph.annotation.GraphProperty; -import org.springframework.datastore.graph.annotation.NodeEntity; -import org.springframework.datastore.graph.annotation.RelatedTo; -import org.springframework.datastore.graph.annotation.RelatedToVia; -import org.springframework.datastore.graph.api.*; +import org.springframework.data.graph.annotation.GraphProperty; +import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.annotation.RelatedToVia; +import org.springframework.data.graph.api.*; import javax.persistence.*; import java.util.Set; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest.java similarity index 97% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest.java index ce81caca9..8dcb9be26 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j.spi; +package org.springframework.data.graph.neo4j.spi; import org.junit.Assert; import org.apache.commons.logging.Log; @@ -15,11 +15,15 @@ import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.datastore.graph.neo4j.*; -import org.springframework.datastore.graph.neo4j.finder.Finder; -import org.springframework.datastore.graph.neo4j.finder.FinderFactory; -import org.springframework.datastore.graph.neo4j.spi.node.Neo4jHelper; -import org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.neo4j.*; +import org.springframework.data.graph.neo4j.finder.Finder; +import org.springframework.data.graph.neo4j.finder.FinderFactory; +import org.springframework.data.graph.neo4j.spi.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.graph.neo4j.Car; +import org.springframework.data.graph.neo4j.Friendship; +import org.springframework.data.graph.neo4j.Person; +import org.springframework.data.graph.neo4j.Personality; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -30,7 +34,7 @@ import java.util.*; import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml"}) public class Neo4jGraphPersistenceTest { protected final Log log = LogFactory.getLog(getClass()); diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoApiTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoApiTest.java similarity index 77% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoApiTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoApiTest.java index c0a5ef6c9..12a9ce1d7 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoApiTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoApiTest.java @@ -1,10 +1,13 @@ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; import org.junit.After; import org.junit.Before; import org.neo4j.graphdb.*; import org.neo4j.kernel.EmbeddedGraphDatabase; -import org.springframework.datastore.graph.neo4j.template.traversal.Traversal; +import org.springframework.data.graph.neo4j.template.Graph; +import org.springframework.data.graph.neo4j.template.NeoCallback; +import org.springframework.data.graph.neo4j.template.NeoTemplate; +import org.springframework.data.graph.neo4j.template.traversal.Traversal; public abstract class NeoApiTest { protected GraphDatabaseService neo; diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoGraphDescriptionTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoGraphDescriptionTest.java similarity index 86% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoGraphDescriptionTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoGraphDescriptionTest.java index 60dc6c561..63e1a5526 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoGraphDescriptionTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoGraphDescriptionTest.java @@ -1,17 +1,19 @@ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; import org.junit.Test; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.neo4j.template.graph.GraphDescription; +import org.springframework.data.graph.neo4j.template.Graph; +import org.springframework.data.graph.neo4j.template.NeoCallback; +import org.springframework.data.graph.neo4j.template.NeoTemplate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Properties; import static org.junit.Assert.assertEquals; -import static org.springframework.datastore.graph.neo4j.template.NeoGraphDescriptionTest.Type.HAS; +import static org.springframework.data.graph.neo4j.template.NeoGraphDescriptionTest.Type.HAS; public class NeoGraphDescriptionTest extends NeoApiTest { diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoTemplateTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTemplateTest.java similarity index 89% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoTemplateTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTemplateTest.java index 059421dba..8dbef4d2a 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoTemplateTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTemplateTest.java @@ -1,15 +1,17 @@ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; import org.junit.Test; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; -import org.springframework.datastore.graph.neo4j.template.graph.Property; +import org.springframework.data.graph.neo4j.template.Graph; +import org.springframework.data.graph.neo4j.template.NeoCallback; +import org.springframework.data.graph.neo4j.template.NeoTemplate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.springframework.datastore.graph.neo4j.template.NeoTemplateTest.Type.HAS; +import static org.springframework.data.graph.neo4j.template.NeoTemplateTest.Type.HAS; public class NeoTemplateTest extends NeoApiTest { diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoTraversalTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTraversalTest.java similarity index 87% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoTraversalTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTraversalTest.java index 0ac8f745c..41da66820 100644 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/template/NeoTraversalTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTraversalTest.java @@ -1,4 +1,4 @@ -package org.springframework.datastore.graph.neo4j.template; +package org.springframework.data.graph.neo4j.template; import org.junit.Ignore; import org.junit.Test; @@ -6,16 +6,18 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.StopEvaluator; import org.springframework.core.convert.converter.Converter; -import org.springframework.datastore.graph.neo4j.template.graph.GraphDescription; -import org.springframework.datastore.graph.neo4j.template.traversal.Traversal; +import org.springframework.data.graph.neo4j.template.Graph; +import org.springframework.data.graph.neo4j.template.NeoCallback; +import org.springframework.data.graph.neo4j.template.NeoTemplate; +import org.springframework.data.graph.neo4j.template.traversal.Traversal; import java.util.ArrayList; import java.util.Collections; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; -import static org.springframework.datastore.graph.neo4j.template.NeoTraversalTest.Type.HAS; -import static org.springframework.datastore.graph.neo4j.template.traversal.Traversal.walk; +import static org.springframework.data.graph.neo4j.template.NeoTraversalTest.Type.HAS; +import static org.springframework.data.graph.neo4j.template.traversal.Traversal.walk; public class NeoTraversalTest extends NeoApiTest { diff --git a/spring-datastore-neo4j/src/test/resources/META-INF/persistence-neo4j.xml b/spring-data-neo4j/src/test/resources/META-INF/persistence-neo4j.xml similarity index 64% rename from spring-datastore-neo4j/src/test/resources/META-INF/persistence-neo4j.xml rename to spring-data-neo4j/src/test/resources/META-INF/persistence-neo4j.xml index 98be20d92..5b4ee42c8 100644 --- a/spring-datastore-neo4j/src/test/resources/META-INF/persistence-neo4j.xml +++ b/spring-data-neo4j/src/test/resources/META-INF/persistence-neo4j.xml @@ -2,10 +2,10 @@ - org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider - org.springframework.datastore.graph.neo4j.Person - org.springframework.datastore.graph.neo4j.Group - org.springframework.datastore.graph.neo4j.Friendship + org.springframework.data.graph.neo4j.jpa.Neo4jPersistenceProvider + org.springframework.data.graph.neo4j.Person + org.springframework.data.graph.neo4j.Group + org.springframework.data.graph.neo4j.Friendship diff --git a/spring-datastore-neo4j/src/test/resources/META-INF/persistence.xml b/spring-data-neo4j/src/test/resources/META-INF/persistence.xml similarity index 81% rename from spring-datastore-neo4j/src/test/resources/META-INF/persistence.xml rename to spring-data-neo4j/src/test/resources/META-INF/persistence.xml index e4381dc2b..381d7c104 100644 --- a/spring-datastore-neo4j/src/test/resources/META-INF/persistence.xml +++ b/spring-data-neo4j/src/test/resources/META-INF/persistence.xml @@ -5,8 +5,8 @@ org.hibernate.ejb.HibernatePersistence - org.springframework.datastore.graph.neo4j.partial.User - org.springframework.datastore.graph.neo4j.partial.Restaurant + org.springframework.data.graph.neo4j.partial.User + org.springframework.data.graph.neo4j.partial.Restaurant diff --git a/spring-datastore-neo4j/src/test/resources/META-INF/spring/database.properties b/spring-data-neo4j/src/test/resources/META-INF/spring/database.properties similarity index 100% rename from spring-datastore-neo4j/src/test/resources/META-INF/spring/database.properties rename to spring-data-neo4j/src/test/resources/META-INF/spring/database.properties diff --git a/spring-datastore-neo4j/src/test/resources/META-INF/spring/neo4j.properties b/spring-data-neo4j/src/test/resources/META-INF/spring/neo4j.properties similarity index 100% rename from spring-datastore-neo4j/src/test/resources/META-INF/spring/neo4j.properties rename to spring-data-neo4j/src/test/resources/META-INF/spring/neo4j.properties diff --git a/spring-datastore-neo4j/src/test/resources/log4j.properties b/spring-data-neo4j/src/test/resources/log4j.properties similarity index 75% rename from spring-datastore-neo4j/src/test/resources/log4j.properties rename to spring-data-neo4j/src/test/resources/log4j.properties index 86acbf146..091c77eaa 100644 --- a/spring-datastore-neo4j/src/test/resources/log4j.properties +++ b/spring-data-neo4j/src/test/resources/log4j.properties @@ -18,7 +18,7 @@ log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n log4j.category.org.springframework=WARN #log4j.category.org.springframework.data=TRACE -#log4j.category.org.springframework.datastore.support=TRACE +#log4j.category.org.springframework.data.support=TRACE #log4j.category.org.springframework.persistence=TRACE -#log4j.category.org.springframework.datastore.graph.neo4j.spi.Neo4jGraphPersistenceTest=DEBUG -#log4j.category.org.springframework.datastore.graph.neo4j.support=DEBUG +#log4j.category.org.springframework.data.graph.neo4j.spi.Neo4jGraphPersistenceTest=DEBUG +#log4j.category.org.springframework.data.graph.neo4j.support=DEBUG diff --git a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml similarity index 84% rename from spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml index 3c52478a2..7c76a6c61 100644 --- a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml @@ -59,7 +59,7 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - + @@ -69,9 +69,9 @@ Start datastore config --> - + - + - + diff --git a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml similarity index 85% rename from spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml index 626f4f50d..54100cc31 100644 --- a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml @@ -59,7 +59,7 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - + @@ -69,9 +69,9 @@ Start datastore config --> - + - + - + diff --git a/spring-datastore-neo4j/template.mf b/spring-data-neo4j/template.mf similarity index 81% rename from spring-datastore-neo4j/template.mf rename to spring-data-neo4j/template.mf index d48347eee..adf2f4c6e 100644 --- a/spring-datastore-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -1,5 +1,5 @@ -Bundle-SymbolicName: org.springframework.datastore.neo4j -Bundle-Name: Spring Datastore Neo4J +Bundle-SymbolicName: org.springframework.data.neo4j +Bundle-Name: Spring Data Neo4J Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: @@ -13,8 +13,8 @@ Import-Template: org.springframework.transaction.*;version="[3.0.0, 4.0.0)", org.springframework.util.*;version="[3.0.0, 4.0.0)", org.springframework.data.core.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.core.*;version="[1.0.0, 2.0.0)", - org.springframework.datastore.annotation.*;version="[1.0.0, 2.0.0)", + org.springframework.data.core.*;version="[1.0.0, 2.0.0)", + org.springframework.data.annotation.*;version="[1.0.0, 2.0.0)", org.springframework.persistence.*;version="[1.0.0, 2.0.0)", org.neo4j.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Volvo.java b/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Volvo.java deleted file mode 100644 index d323ee181..000000000 --- a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/Volvo.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.springframework.datastore.graph.neo4j; - -import org.neo4j.graphdb.Node; -import org.springframework.datastore.graph.annotation.NodeEntity; - -@NodeEntity -public class Volvo extends Car { - public Volvo() { - } - - public Volvo(Node n) { - setUnderlyingState(n); - } -} diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml index 7b0947d2c..9bd56a174 100644 --- a/src/ant/upload-dist.xml +++ b/src/ant/upload-dist.xml @@ -6,15 +6,15 @@ - the classpath is set up for you ant -f src/ant/upload-dist.xml \ - -Ddist.id=spring-datastore-graph \ - -Ddist.name='Spring Datastore Graph' \ + -Ddist.id=spring-data-graph \ + -Ddist.name='Spring Data Graph' \ -Ddist.key=DATADOC \ -Ddist.releaseType=milestone \ -Ddist.accessKey= \ -Ddist.secretKey= \ -Ddist.bucketName=dist.springframework.org \ - -Ddist.fileName=spring-datastore-graph-1.0.0.M1.zip \ - -Ddist.filePath=../../spring-datastore-graph-1.0.0.M1.zip \ + -Ddist.fileName=spring-data-graph-1.0.0.M1.zip \ + -Ddist.filePath=../../spring-data-graph-1.0.0.M1.zip \ -Ddist.version=1.0.0.M1 \ upload-dist --> diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml index d64e99aa0..af3adb940 100644 --- a/src/assembly/distribution.xml +++ b/src/assembly/distribution.xml @@ -42,8 +42,8 @@ - org.springframework.data:spring-datastore-graph-core - org.springframework.data:spring-datastore-neo4j + org.springframework.data:spring-data-graph-core + org.springframework.data:spring-data-neo4j dist @@ -55,8 +55,8 @@ - org.springframework.data:spring-datastore-graph-core - org.springframework.data:spring-datastore-neo4j + org.springframework.data:spring-data-graph-core + org.springframework.data:spring-data-neo4j sources diff --git a/src/docbkx/cross-store.xml b/src/docbkx/cross-store.xml index d0eb3a6a5..13d0d49ce 100644 --- a/src/docbkx/cross-store.xml +++ b/src/docbkx/cross-store.xml @@ -4,7 +4,7 @@ Cross-store persistence with a graph database - The Spring Datastore Graph project support cross-store persistence + The Spring Data Graph project support cross-store persistence ...
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml index 1a18be2a3..7852cb95d 100644 --- a/src/docbkx/index.xml +++ b/src/docbkx/index.xml @@ -3,7 +3,7 @@ - Spring Datastore Graph - Reference Documentation + Spring Data Graph - Reference Documentation &version; diff --git a/src/docbkx/preface.xml b/src/docbkx/preface.xml index 763a38456..7ced7fb52 100644 --- a/src/docbkx/preface.xml +++ b/src/docbkx/preface.xml @@ -4,6 +4,6 @@ Preface - The Spring Datastore Graph project applies core Spring concepts to the development of solutions using a graph style data store. + The Spring Data Graph project applies core Spring concepts to the development of solutions using a graph style data store. diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl index 7b49cdf8a..b0dba2c8c 100644 --- a/src/docbkx/resources/xsl/fopdf.xsl +++ b/src/docbkx/resources/xsl/fopdf.xsl @@ -100,7 +100,7 @@ - Spring Datastore Graph ( + Spring Data Graph ( ) diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index 339073013..bb5324f56 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,4 +1,4 @@ -Spring Datastore Key-Value 1.0.0 Milestone 1 (?, 2010) +Spring Data Graph 1.0.0 Milestone 1 (?, 2010) ============================================= New Features diff --git a/src/main/resources/readme.txt b/src/main/resources/readme.txt index 35be799a8..14eca41c5 100644 --- a/src/main/resources/readme.txt +++ b/src/main/resources/readme.txt @@ -1,7 +1,7 @@ -SPRING DATASTORE KEY-VALUE 1.0.0 M1 (? ? 2010) -------------------------------------------------- +SPRING DATA GRAPH 1.0.0 M1 (? ? 2010) +------------------------------------- -Spring Datastore Key-Value is released under the terms of the Apache Software License Version 2.0 (see license.txt). +Spring Data Graph is released under the terms of the Apache Software License Version 2.0 (see license.txt). DISTRIBUTION CONTENTS: