Merge branch 'master' of github.com:SpringSource/spring-data-graph

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

@@ -39,7 +39,7 @@ import org.springframework.data.graph.neo4j.support.relationship.ConstructorBypa
 import org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking;
 import org.springframework.data.graph.neo4j.transaction.ChainedTransactionManager;
 import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.jta.JtaTransactionManager;
 

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

@@ -21,7 +21,7 @@ import org.neo4j.graphdb.NotInTransactionException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
-import org.springframework.persistence.support.StateProvider;
+import org.springframework.data.persistence.StateProvider;
 
 /**
  * @author Michael Hunger

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

@@ -26,7 +26,7 @@ import org.springframework.data.graph.annotation.RelatedTo;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.neo4j.finder.FinderFactory;
 import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
-import org.springframework.persistence.support.StateProvider;
+import org.springframework.data.persistence.StateProvider;
 
 import javax.persistence.Id;
 import java.lang.reflect.Field;

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java

@@ -29,7 +29,7 @@ import org.springframework.data.graph.core.GraphBacked;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.core.NodeTypeStrategy;
 import org.springframework.data.graph.core.RelationshipBacked;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 
 import javax.transaction.Status;
 import javax.transaction.SystemException;

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeStrategy.java

@@ -11,7 +11,7 @@ import org.neo4j.helpers.collection.IterableWrapper;
 import org.springframework.data.graph.annotation.NodeEntity;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.core.NodeTypeStrategy;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 
 public class IndexingNodeTypeStrategy implements NodeTypeStrategy {
 

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NodeTypeStrategyFactoryBean.java

@@ -6,7 +6,7 @@ import org.neo4j.graphdb.Relationship;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.core.NodeTypeStrategy;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 
 public class NodeTypeStrategyFactoryBean implements FactoryBean<NodeTypeStrategy> {
     private GraphDatabaseService graphDatabaseService;

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeStrategy.java

@@ -25,7 +25,7 @@ import org.neo4j.helpers.collection.IterableWrapper;
 import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.core.NodeTypeStrategy;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 
 import java.util.*;
 

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jConstructorGraphEntityInstantiator.java

@@ -18,7 +18,7 @@ package org.springframework.data.graph.neo4j.support.node;
 
 import org.neo4j.graphdb.Node;
 import org.springframework.data.graph.core.NodeBacked;
-import org.springframework.persistence.support.AbstractConstructorEntityInstantiator;
+import org.springframework.data.persistence.AbstractConstructorEntityInstantiator;
 
 /**
  * Implementation of an entity instantiator for neo4j graphdb nodes, binding the entity type to a NodeBacked and the

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNeo4jEntityInstantiator.java

@@ -20,7 +20,7 @@ import org.neo4j.graphdb.Node;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.neo4j.fieldaccess.PartialNodeEntityState;
 import org.springframework.orm.jpa.EntityManagerFactoryUtils;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;

spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/ConstructorBypassingGraphRelationshipInstantiator.java

@@ -20,7 +20,7 @@ import java.lang.reflect.Constructor;
 
 import org.neo4j.graphdb.Relationship;
 import org.springframework.data.graph.core.RelationshipBacked;
-import org.springframework.persistence.support.EntityInstantiator;
+import org.springframework.data.persistence.EntityInstantiator;
 
 import sun.reflect.ReflectionFactory;