repackaging, removed core module

pom.xml

@@ -9,7 +9,6 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-data-graph-parent</module>
-		<module>spring-data-graph-core</module>
 		<module>spring-data-neo4j</module>
 		<module>spring-data-neo4j-rest</module>
 	</modules>

spring-data-graph-parent/pom.xml

@@ -136,11 +136,6 @@
 				<artifactId>spring-data-commons-core</artifactId>
 				<version>${data.commons.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-graph-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-neo4j</artifactId>

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/JsonHelper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 /**
  * @author mh

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/PropertiesMap.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 /**
  * @author mh

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 import com.sun.jersey.api.client.ClientResponse;
 

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestEntity.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.NotFoundException;
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.helpers.collection.IterableWrapper;
-import org.springframework.data.graph.neo4j.rest.support.util.ArrayConverter;
+import org.springframework.data.neo4j.rest.util.ArrayConverter;
+import org.springframework.data.neo4j.rest.util.ArrayConverter;
 
 import javax.ws.rs.core.Response.Status;
 import java.net.URI;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestGraphDatabase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 
 import org.neo4j.graphdb.*;
@@ -23,12 +23,13 @@ import org.neo4j.graphdb.event.TransactionEventHandler;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.graph.core.GraphDatabase;
-import org.springframework.data.graph.core.Property;
-import org.springframework.data.graph.neo4j.conversion.ResultConverter;
-import org.springframework.data.graph.neo4j.rest.support.index.RestIndexManager;
-import org.springframework.data.graph.neo4j.support.query.ConversionServiceQueryResultConverter;
-import org.springframework.data.graph.neo4j.support.query.QueryEngine;
+import org.springframework.data.neo4j.core.GraphDatabase;
+import org.springframework.data.neo4j.core.Property;
+import org.springframework.data.neo4j.conversion.ResultConverter;
+import org.springframework.data.neo4j.rest.index.RestIndexManager;
+import org.springframework.data.neo4j.rest.index.RestIndexManager;
+import org.springframework.data.neo4j.support.query.ConversionServiceQueryResultConverter;
+import org.springframework.data.neo4j.support.query.QueryEngine;
 
 import javax.ws.rs.core.Response.Status;
 import java.net.URI;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestNode.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 
 import org.neo4j.graphdb.*;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestPathParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestQueryEngine.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 
-import org.springframework.data.graph.neo4j.conversion.*;
-import org.springframework.data.graph.neo4j.support.query.QueryEngine;
+import org.springframework.data.neo4j.conversion.*;
+import org.springframework.data.neo4j.support.query.QueryEngine;
 
 import java.util.*;
 

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRelationship.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 
 import org.neo4j.graphdb.*;
 import org.neo4j.helpers.collection.MapUtil;
-import org.springframework.data.graph.core.Property;
+import org.springframework.data.neo4j.core.Property;
 
 import java.net.URI;
 import java.util.Map;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversal.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 
 import org.neo4j.graphdb.Direction;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversalDescription.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 import org.neo4j.graphdb.traversal.TraversalDescription;
 

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraverser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SimplePath.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndex.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support.index;
+package org.springframework.data.neo4j.rest.index;
 
 
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexHits;
-import org.springframework.data.graph.neo4j.rest.support.*;
+import org.springframework.data.neo4j.rest.*;
+import org.springframework.data.neo4j.support.*;
 
 import java.util.Collection;
 import java.util.Collections;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndexManager.java

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support.index;
+package org.springframework.data.neo4j.rest.index;
 
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.PropertyContainer;
-import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.index.*;
-import org.springframework.data.graph.neo4j.rest.support.RequestResult;
-import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
-import org.springframework.data.graph.neo4j.rest.support.RestRequest;
+import org.springframework.data.neo4j.rest.RequestResult;
+import org.springframework.data.neo4j.rest.RestGraphDatabase;
+import org.springframework.data.neo4j.rest.RestRequest;
 
 import java.util.Collections;
 import java.util.Map;

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestNodeIndex.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support.index;
+package org.springframework.data.neo4j.rest.index;
 
 import org.neo4j.graphdb.Node;
-import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
-import org.springframework.data.graph.neo4j.rest.support.RestNode;
-import org.springframework.data.graph.neo4j.rest.support.RestRequest;
+import org.springframework.data.neo4j.rest.RestGraphDatabase;
+import org.springframework.data.neo4j.rest.RestNode;
+import org.springframework.data.neo4j.rest.RestRequest;
 
 import java.util.Map;
 

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestRelationshipIndex.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support.index;
+package org.springframework.data.neo4j.rest.index;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.index.RelationshipIndex;
-import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
-import org.springframework.data.graph.neo4j.rest.support.RestRelationship;
-import org.springframework.data.graph.neo4j.rest.support.RestRequest;
+import org.springframework.data.neo4j.rest.RestGraphDatabase;
+import org.springframework.data.neo4j.rest.RestRelationship;
+import org.springframework.data.neo4j.rest.RestRequest;
 
 import java.util.Map;
 

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/util/ArrayConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support.util;
+package org.springframework.data.neo4j.rest.util;
 
 import java.lang.reflect.Array;
 import java.util.Collection;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.EntityPropertyValidationTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.EntityPropertyValidationTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
     "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestEntityPropertyValidationTest extends EntityPropertyValidationTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.FinderTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.FinderTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
     "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestFinderTest extends FinderTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.IndexTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.IndexTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
  * @since 28.03.11
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
         "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestIndexTest extends IndexTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -22,10 +22,11 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.graph.core.GraphDatabase;
-import org.springframework.data.graph.neo4j.config.NullTransactionManager;
-import org.springframework.data.graph.neo4j.rest.support.RestTestHelper;
-import org.springframework.data.graph.neo4j.template.Neo4jTemplateApiTest;
+import org.springframework.data.neo4j.core.GraphDatabase;
+import org.springframework.data.neo4j.config.NullTransactionManager;
+import org.springframework.data.neo4j.rest.support.RestTestHelper;
+import org.springframework.data.neo4j.rest.support.RestTestHelper;
+import org.springframework.data.neo4j.template.Neo4jTemplateApiTest;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.jta.JtaTransactionManager;
 

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.data.graph.neo4j.rest.support.RestTestHelper;
-import org.springframework.data.graph.core.GraphDatabase;
-import org.springframework.data.graph.neo4j.template.Neo4jTemplateTest;
+import org.springframework.data.neo4j.rest.support.RestTestHelper;
+import org.springframework.data.neo4j.rest.support.RestTestHelper;
+import org.springframework.data.neo4j.core.GraphDatabase;
+import org.springframework.data.neo4j.template.Neo4jTemplateTest;
 import org.springframework.transaction.PlatformTransactionManager;
 
 public class RestNeo4jTemplateTest extends Neo4jTemplateTest

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.data.graph.core.GraphDatabase;
-import org.springframework.data.graph.neo4j.config.NullTransactionManager;
-import org.springframework.data.graph.neo4j.rest.support.RestTestHelper;
-import org.springframework.data.graph.neo4j.template.NeoTraversalTest;
+import org.springframework.data.neo4j.core.GraphDatabase;
+import org.springframework.data.neo4j.config.NullTransactionManager;
+import org.springframework.data.neo4j.rest.support.RestTestHelper;
+import org.springframework.data.neo4j.rest.support.RestTestHelper;
+import org.springframework.data.neo4j.template.NeoTraversalTest;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.jta.JtaTransactionManager;
 

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.NodeEntityRelationshipTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.NodeEntityRelationshipTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
     "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestNodeEntityRelationshipTest extends NodeEntityRelationshipTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.NodeEntityTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.NodeEntityTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -35,7 +36,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
         "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestNodeEntityTest extends NodeEntityTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.ProjectionTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.ProjectionTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
 "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestProjectionTest extends ProjectionTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.PropertyTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.PropertyTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
 "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestPropertyTest extends PropertyTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.RelationshipEntityTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.RelationshipEntityTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 * @since 28.03.11
 */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
 "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestRelationshipEntityTest extends RelationshipEntityTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.integration;
+package org.springframework.data.neo4j.rest.integration;
 
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
-import org.springframework.data.graph.neo4j.support.TraversalTest;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.data.neo4j.support.TraversalTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
  * @since 28.03.11
  */
 @RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
         "classpath:RestTest-context.xml"} )
 @TestExecutionListeners( {CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class} )
 public class RestTraversalTest extends TraversalTest

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/IsRelationshipToNodeMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.hamcrest.Description;
 import org.junit.internal.matchers.TypeSafeMatcher;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.apache.commons.configuration.Configuration;
 import org.neo4j.graphdb.GraphDatabaseService;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Neo4jDatabaseCleaner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.neo4j.graphdb.*;
 import org.neo4j.graphdb.index.IndexManager;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.graph.core.GraphDatabase;
-import org.springframework.data.graph.neo4j.support.query.QueryOperationsTest;
+import org.springframework.data.neo4j.core.GraphDatabase;
+import org.springframework.data.neo4j.rest.RestGraphDatabase;
+import org.springframework.data.neo4j.support.query.QueryOperationsTest;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -35,7 +36,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
  * @since 23.06.11
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
+@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml",
     "classpath:RestTest-context.xml"})
 @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class RestQueryEngineTest extends QueryOperationsTest {

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 
 import org.apache.log4j.BasicConfigurator;
@@ -24,6 +24,7 @@ import org.junit.BeforeClass;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
+import org.springframework.data.neo4j.rest.RestGraphDatabase;
 
 import java.net.URI;
 import java.util.Iterator;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestHelper.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 
 import org.apache.log4j.BasicConfigurator;
-import org.springframework.data.graph.core.GraphDatabase;
+import org.springframework.data.neo4j.core.GraphDatabase;
+import org.springframework.data.neo4j.rest.RestGraphDatabase;
 
 import java.net.URI;
 import java.net.URISyntaxException;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.neo4j.kernel.Uniqueness;
-import org.springframework.data.graph.neo4j.rest.support.RestTraversal;
-import org.springframework.data.graph.neo4j.rest.support.RestTraversalDescription;
+import org.springframework.data.neo4j.rest.RestTraversal;
+import org.springframework.data.neo4j.rest.RestTraversalDescription;
 
 import java.util.Map;
 

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -22,6 +22,7 @@ import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.neo4j.graphdb.traversal.Traverser;
+import org.springframework.data.neo4j.rest.RestTraversal;
 
 public class RestTraversalExecutionTest extends RestTestBase {
     @Test

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
@@ -23,15 +23,17 @@ import com.sun.jersey.api.client.WebResource;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.data.graph.neo4j.Person;
-import org.springframework.data.graph.neo4j.server.ProvidedClassPathXmlApplicationContext;
+import org.springframework.data.neo4j.Person;
+import org.springframework.data.neo4j.Person;
+import org.springframework.data.neo4j.rest.RequestResult;
+import org.springframework.data.neo4j.server.ProvidedClassPathXmlApplicationContext;
 
 import javax.ws.rs.core.MediaType;
 import java.io.IOException;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
-import static org.springframework.data.graph.neo4j.Person.persistedPerson;
+import static org.springframework.data.neo4j.Person.persistedPerson;
 
 /**
  * @author mh

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
@@ -23,7 +23,8 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.data.graph.neo4j.server.SpringPluginInitializer;
+import org.springframework.data.neo4j.rest.RequestResult;
+import org.springframework.data.neo4j.server.SpringPluginInitializer;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestInterface.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 public interface TestInterface {
     void thisIsARecording();

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java

@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.helpers.collection.IterableWrapper;
 import org.neo4j.server.plugins.*;
 import org.springframework.context.ApplicationContext;
-import org.springframework.data.graph.neo4j.Friendship;
-import org.springframework.data.graph.neo4j.Person;
-import org.springframework.data.graph.neo4j.PersonRepository;
-import org.springframework.data.graph.neo4j.server.ProvidedClassPathXmlApplicationContext;
-import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
+import org.springframework.data.neo4j.Friendship;
+import org.springframework.data.neo4j.*;
+import org.springframework.data.neo4j.Person;
+import org.springframework.data.neo4j.PersonRepository;
+import org.springframework.data.neo4j.server.ProvidedClassPathXmlApplicationContext;
+import org.springframework.data.neo4j.support.GraphDatabaseContext;
 
 /**
  * @author mh

spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Type.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.rest.support;
+package org.springframework.data.neo4j.rest.support;
 
 import org.neo4j.graphdb.RelationshipType;
 

spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle

@@ -1 +1 @@
-org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest
+org.springframework.data.neo4j.rest.support.SpringPluginInitializerTest

spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.ServerPlugin

@@ -1 +1 @@
-org.springframework.data.graph.neo4j.rest.support.TestServerPlugin
+org.springframework.data.neo4j.rest.support.TestServerPlugin

spring-data-neo4j-rest/src/test/resources/Plugin-context.xml

@@ -17,6 +17,6 @@
 
     <datagraph:config graphDatabaseService="graphDatabaseService"/>
 
-    <datagraph:repositories base-package="org.springframework.data.graph.neo4j"/>
+    <datagraph:repositories base-package="org.springframework.data.neo4j"/>
 
 </beans>

spring-data-neo4j-rest/src/test/resources/RestTest-context.xml

@@ -14,7 +14,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <bean id="graphDatabaseService" class="org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase" scope="singleton">
+    <bean id="graphDatabaseService" class="org.springframework.data.neo4j.rest.RestGraphDatabase" scope="singleton">
          <constructor-arg index="0" value="http://localhost:7473/db/data" />
     </bean>
 </beans>

spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml

@@ -14,6 +14,6 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <bean id="testObject" class="org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest" scope="singleton">
+    <bean id="testObject" class="org.springframework.data.neo4j.rest.support.SpringPluginInitializerTest" scope="singleton">
     </bean>
 </beans>

spring-data-neo4j-rest/src/test/resources/log4j.properties

@@ -18,9 +18,9 @@ log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
 
 
 log4j.category.org.springframework=WARN
-#log4j.category.org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeRepresentationStrategytegy=DEBUG
-#log4j.category.org.springframework.data.graph.neo4j.fieldaccess=DEBUG
+#log4j.category.org.springframework.data.neo4j.support.SubReferenceNodeTypeRepresentationStrategytegy=DEBUG
+#log4j.category.org.springframework.data.neo4j.fieldaccess=DEBUG
 #log4j.category.org.springframework.data=TRACE
 #log4j.category.org.springframework.data.support=TRACE
 #log4j.category.org.springframework.persistence=TRACE
-#log4j.category.org.springframework.data.graph.neo4j.support=DEBUG
+#log4j.category.org.springframework.data.neo4j.support=DEBUG

spring-data-neo4j-rest/src/test/resources/server-test-db.properties

@@ -1,2 +1,2 @@
 org.neo4j.server.database.location=target/test-db
-org.neo4j.server.thirdparty_jaxrs_classes=org.springframework.data.graph.neo4j.rest.support=/test
+org.neo4j.server.thirdparty_jaxrs_classes=org.springframework.data.neo4j.rest.support=/test

spring-data-neo4j-rest/template.mf

@@ -6,9 +6,9 @@ Import-Package:
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.data.graph.neo4j.annotation.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.neo4j.annotation.*;version="[1.0.0, 2.0.0)",
  org.springframework.*;version="[3.0.0, 4.0.0)",
- org.springframework.data.graph.*;version="0",
+ org.springframework.data.neo4j.*;version="0",
  org.neo4j.*;version="0",
  org.w3c.dom.*;version="0",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",

spring-data-neo4j/pom.xml

@@ -34,10 +34,6 @@
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-graph-core</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.ow2.jotm</groupId>

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/EndNode.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphProperty.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphTraversal.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder;
-import org.springframework.data.graph.core.NodeBacked;
+import org.springframework.data.neo4j.core.FieldTraversalDescriptionBuilder;
+import org.springframework.data.neo4j.core.NodeBacked;
 
 /**
  * Field that provides access to an iterator which is created by applying the traversal that is built by the supplied

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.*;
 
 /**
- * Annotation to declare an Pojo-Entity as graph backed. It is used by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect to
- * introduce constructor and field advices as well as add the {@link org.springframework.data.graph.core.NodeBacked} interface.
+ * Annotation to declare an Pojo-Entity as graph backed. It is used by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect to
+ * introduce constructor and field advices as well as add the {@link org.springframework.data.neo4j.core.NodeBacked} interface.
  * @author Michael Hunger
  * @since 27.08.2010
  */
@@ -36,14 +36,14 @@ public @interface NodeEntity {
     /**
      * <p>
      * If partial is set, then construction of the node is delayed until the entity's id has been set by another persistent store. Only
-     * {@link org.springframework.data.graph.annotation.GraphProperty} annotated fields will be handled by the graph storage.
+     * {@link org.springframework.data.neo4j.annotation.GraphProperty} annotated fields will be handled by the graph storage.
      * </p>
      *
      * <p>
      * Currently, only JPA storage is supported for partial node entities.
      * </p>
      *
-     * @return true if the entity is only partially managed by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect.
+     * @return true if the entity is only partially managed by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect.
      */
     boolean partial() default false;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Query.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedTo.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
-import org.springframework.data.graph.core.Direction;
-import org.springframework.data.graph.core.NodeBacked;
+import org.springframework.data.neo4j.core.Direction;
+import org.springframework.data.neo4j.core.NodeBacked;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation for {@link org.springframework.data.graph.annotation.NodeEntity} fields that relate to other entities via
+ * Annotation for {@link org.springframework.data.neo4j.annotation.NodeEntity} fields that relate to other entities via
  * relationships. Works for one-to-one and one-to-many relationships. It is optionally possible to define the relationship type,
  * relationship direction and target class (required for one-many-relationships).
  *

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.data.graph.core.Direction;
-import org.springframework.data.graph.core.RelationshipBacked;
+import org.springframework.data.neo4j.core.Direction;
+import org.springframework.data.neo4j.core.RelationshipBacked;
 
 /**
- * Annotation for {@link org.springframework.data.graph.annotation.NodeEntity} fields that relate to other entities via
+ * Annotation for {@link org.springframework.data.neo4j.annotation.NodeEntity} fields that relate to other entities via
  * relationships. The fields represent read only iterators that provide the relationship-entities
  * {@link org.springframework.persistence.RelatedEntity} of the relationships. The iterator reflects the underlying relationships.
  *

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.*;
 
 /**
  * Annotation to declare a Pojo-Entity as graph backed relationship entity.
- * It is used by the {@link org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking} aspect to add
- * field advices as well as the {@link org.springframework.data.graph.core.RelationshipBacked} interface.
+ * It is used by the {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking} aspect to add
+ * field advices as well as the {@link org.springframework.data.neo4j.core.RelationshipBacked} interface.
  *
  * Relationship entities cannot be instantiated directly. The will be provided by relationship fields and the
  * methods relatedTo and getRelationshipTo introduced to the node entities.

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/StartNode.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.annotation;
+package org.springframework.data.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.config;
+package org.springframework.data.neo4j.config;
 
 import org.neo4j.graphdb.Transaction;
-import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
+import org.springframework.data.neo4j.support.GraphDatabaseContext;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphBeanDefinitionParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.config;
+package org.springframework.data.neo4j.config;
 
 import org.neo4j.kernel.EmbeddedGraphDatabase;
 import org.springframework.beans.factory.annotation.Autowire;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.config;
+package org.springframework.data.neo4j.config;
 
 /**
  * @author mh
@@ -24,8 +24,8 @@ package org.springframework.data.graph.neo4j.config;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.data.graph.neo4j.repository.CRUDRepository;
-import org.springframework.data.graph.neo4j.repository.GraphRepositoryFactoryBean;
+import org.springframework.data.neo4j.repository.CRUDRepository;
+import org.springframework.data.neo4j.repository.GraphRepositoryFactoryBean;
 import org.springframework.data.repository.config.*;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.config;
+package org.springframework.data.neo4j.config;
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
@@ -28,22 +28,22 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.graph.core.NodeBacked;
-import org.springframework.data.graph.core.RelationshipBacked;
-import org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean;
-import org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory;
-import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory;
-import org.springframework.data.graph.neo4j.support.node.NodeEntityStateFactory;
-import org.springframework.data.graph.neo4j.support.relationship.RelationshipEntityStateFactory;
-import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
-import org.springframework.data.graph.neo4j.support.typerepresentation.TypeRepresentationStrategyFactory;
-import org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking;
-import org.springframework.data.graph.neo4j.support.node.NodeEntityInstantiator;
-import org.springframework.data.graph.neo4j.support.node.PartialNodeEntityInstantiator;
-import org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking;
-import org.springframework.data.graph.neo4j.support.relationship.RelationshipEntityInstantiator;
-import org.springframework.data.graph.neo4j.template.Neo4jExceptionTranslator;
-import org.springframework.data.graph.neo4j.transaction.ChainedTransactionManager;
+import org.springframework.data.neo4j.core.NodeBacked;
+import org.springframework.data.neo4j.core.RelationshipBacked;
+import org.springframework.data.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean;
+import org.springframework.data.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory;
+import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory;
+import org.springframework.data.neo4j.support.node.NodeEntityStateFactory;
+import org.springframework.data.neo4j.support.relationship.RelationshipEntityStateFactory;
+import org.springframework.data.neo4j.support.GraphDatabaseContext;
+import org.springframework.data.neo4j.support.typerepresentation.TypeRepresentationStrategyFactory;
+import org.springframework.data.neo4j.support.node.Neo4jNodeBacking;
+import org.springframework.data.neo4j.support.node.NodeEntityInstantiator;
+import org.springframework.data.neo4j.support.node.PartialNodeEntityInstantiator;
+import org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking;
+import org.springframework.data.neo4j.support.relationship.RelationshipEntityInstantiator;
+import org.springframework.data.neo4j.template.Neo4jExceptionTranslator;
+import org.springframework.data.neo4j.transaction.ChainedTransactionManager;
 import org.springframework.data.persistence.EntityInstantiator;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/NullTransactionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.config;
+package org.springframework.data.neo4j.config;
 
 import javax.transaction.*;
 import javax.transaction.xa.XAResource;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ConvertedResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.conversion;
+package org.springframework.data.neo4j.conversion;
 
 /**
 * @author mh

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/DefaultConverter.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.conversion;
+package org.springframework.data.neo4j.conversion;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
 import org.neo4j.graphdb.Relationship;
-import org.springframework.data.graph.neo4j.support.path.NodePath;
-import org.springframework.data.graph.neo4j.support.path.RelationshipPath;
+import org.springframework.data.neo4j.support.path.NodePath;
+import org.springframework.data.neo4j.support.path.RelationshipPath;
 
 import java.util.Iterator;
 import java.util.Map;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Handler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.conversion;
+package org.springframework.data.neo4j.conversion;
 
 /**
  * @author mh

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.conversion;
+package org.springframework.data.neo4j.conversion;
 
 /**
 * @author mh

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResultBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.conversion;
+package org.springframework.data.neo4j.conversion;
 
 import org.neo4j.helpers.collection.IteratorWrapper;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ResultConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.conversion;
+package org.springframework.data.neo4j.conversion;
 
 /**
 * @author mh

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Direction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 public enum Direction {
 	

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityPath.java

@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.Path;
-import org.springframework.data.graph.core.GraphBacked;
-import org.springframework.data.graph.core.NodeBacked;
-import org.springframework.data.graph.core.RelationshipBacked;
+import org.springframework.data.neo4j.core.RelationshipBacked;
 
 /**
  * @author mh

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
-
-import org.springframework.data.graph.core.GraphBacked;
-import org.springframework.data.graph.core.NodeBacked;
+package org.springframework.data.neo4j.core;
 
 import java.lang.reflect.Field;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/FieldTraversalDescriptionBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.traversal.TraversalDescription;
 
@@ -22,7 +22,7 @@ import java.lang.reflect.Field;
 
 /**
  * Interface for classes that build traversal descriptions. Those classes can be referred to by
- * {@link org.springframework.data.graph.annotation.GraphTraversal#traversalBuilder()} to  provide fields that return
+ * {@link org.springframework.data.neo4j.annotation.GraphTraversal#traversalBuilder()} to  provide fields that return
  * a dynamic traversal on access.
  *
  * @author Michael Hunger

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 /**
  * super interface denoting entities that are graph backed, the backing STATE can be a {@link org.neo4j.graphdb.Node}

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.PropertyContainer;
@@ -23,8 +23,8 @@ import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine;
-import org.springframework.data.graph.neo4j.support.query.QueryEngine;
+import org.springframework.data.neo4j.support.query.EmbeddedQueryEngine;
+import org.springframework.data.neo4j.support.query.QueryEngine;
 
 
 public interface GraphDatabase {

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 
 /**
- * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect.
+ * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect.
  * annotation, to hold underlying Neo4j Node state.
  *
  * @author Rod Johnson
@@ -104,9 +104,9 @@ public interface NodeBacked extends GraphBacked<Node> {
     /**
      * Removes the all relationships of the given type between this entity's underlying node and the target
      * entity's underlying node. Note that this is handled automatically by
-     * {@link org.springframework.data.graph.annotation.RelatedTo} fields,
+     * {@link org.springframework.data.neo4j.annotation.RelatedTo} fields,
      * single-relationship non-annotated fields, and
-     * {@link org.springframework.data.graph.annotation.RelatedToVia} fields.
+     * {@link org.springframework.data.neo4j.annotation.RelatedToVia} fields.
      *
      * @param target           other node entity
      * @param relationshipType type to be removed

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeTypeRepresentationStrategy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.Node;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Property.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import java.util.HashMap;
 import java.util.Map;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.Relationship;
 
 /**
- * concrete interface introduced onto Relationship entities by the {@link org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking}
+ * concrete interface introduced onto Relationship entities by the {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking}
  * aspect, encapsulates a neo4j relationship as backing state
  */
 public interface RelationshipBacked extends GraphBacked<Relationship>{

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipTypeRepresentationStrategy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.Relationship;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.core;
+package org.springframework.data.neo4j.core;
 
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.helpers.collection.ClosableIterable;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/UncategorizedGraphStoreException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph;
+package org.springframework.data.neo4j.core;
 
 import org.springframework.dao.UncategorizedDataAccessException;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 import org.neo4j.graphdb.*;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.graph.core.GraphBacked;
-import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
+import org.springframework.data.neo4j.core.GraphBacked;
+import org.springframework.data.neo4j.support.GraphDatabaseContext;
 
 import java.lang.reflect.Field;
 import java.util.HashSet;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 import org.neo4j.graphdb.PropertyContainer;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.graph.core.GraphBacked;
-import org.springframework.data.graph.core.NodeBacked;
-import org.springframework.data.graph.core.RelationshipBacked;
+import org.springframework.data.neo4j.core.GraphBacked;
+import org.springframework.data.neo4j.core.NodeBacked;
+import org.springframework.data.neo4j.core.RelationshipBacked;
 
 import java.lang.reflect.Field;
 

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.data.graph.core.EntityState;
-import org.springframework.data.graph.core.GraphBacked;
+import org.springframework.data.neo4j.core.EntityState;
+import org.springframework.data.neo4j.core.GraphBacked;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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.data.neo4j.annotation.NodeEntity;
+import org.springframework.data.neo4j.annotation.RelationshipEntity;
+import org.springframework.data.neo4j.support.GraphDatabaseContext;
 import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Field;

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.neo4j.graphdb.Transaction;
-import org.springframework.data.graph.core.EntityState;
-import org.springframework.data.graph.core.GraphBacked;
-import org.springframework.data.graph.core.NodeBacked;
-import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
+import org.springframework.data.neo4j.core.EntityState;
+import org.springframework.data.neo4j.core.GraphBacked;
+import org.springframework.data.neo4j.core.NodeBacked;
+import org.springframework.data.neo4j.support.GraphDatabaseContext;
 import org.springframework.util.ObjectUtils;
 
 import java.lang.reflect.Field;
@@ -31,7 +31,7 @@ import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.springframework.data.graph.neo4j.support.DoReturn.unwrap;
+import static org.springframework.data.neo4j.support.DoReturn.unwrap;
 
 /**
  * @author Michael Hunger

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 /**
  * interface for listeners for field modifications, used for instance for indexing or tracing

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessor.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.data.graph.neo4j.fieldaccess;
+package org.springframework.data.neo4j.fieldaccess;
 
 /**
  * interface for field accessors, encapsulates reading and writing from fields and write support information about the field.
- * It is used by the {@link org.springframework.data.graph.core.EntityState} which is delegated to by the
- * {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} {@link org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking}
+ * It is used by the {@link org.springframework.data.neo4j.core.EntityState} which is delegated to by the
+ * {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking}
  * aspects.
  * @param <ENTITY>
  */