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

renamimg packages from org.springframeork.datastore.* to org.springframework.data.*; resolved package cycles in template package

Browse Source
This commit is contained in:
Thomas Risberg
2010-11-18 09:35:49 -05:00
parent 2577fb4781
commit 53db59a6c1
154 changed files with 489 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pom.xml
View File

@@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-dist</artifactId>
<name>Spring Datastore Graph Distribution</name>
<artifactId>spring-data-graph-dist</artifactId>
<name>Spring Data Graph Distribution</name>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>spring-datastore-graph-parent</module>
<module>spring-datastore-graph-core</module>
<module>spring-datastore-neo4j</module>
<module>spring-datastore-neo4j-roo</module>
<module>spring-data-graph-parent</module>
<module>spring-data-graph-core</module>
<module>spring-data-neo4j</module>
<module>spring-data-neo4j-roo</module>
</modules>
<developers>
@@ -89,8 +89,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dist.* properties are used by the antrun tasks below -->
<dist.id>spring-datastore-graph</dist.id>
<dist.name>Spring Datastore Graph</dist.name>
<dist.id>spring-data-graph</dist.id>
<dist.name>Spring Data Graph</dist.name>
<dist.key>DATAGRAPH</dist.key>
<dist.version>${project.version}</dist.version>
<dist.releaseType>snapshot</dist.releaseType>
@@ -109,15 +109,15 @@
<distributionManagement>
<site>
<id>spring-site-staging</id>
<url>file:///${java.io.tmpdir}/spring-data/datastore-graph/docs/${project.version}</url>
<url>file:///${java.io.tmpdir}/spring-data/data-graph/docs/${project.version}</url>
</site>
<repository>
<id>spring-milestone-staging</id>
<url>file:///${java.io.tmpdir}/spring-data/datastore-graph/milestone</url>
<url>file:///${java.io.tmpdir}/spring-data/data-graph/milestone</url>
</repository>
<snapshotRepository>
<id>spring-snapshot-staging</id>
<url>file:///${java.io.tmpdir}/spring-data/datastore-graph/snapshot</url>
<url>file:///${java.io.tmpdir}/spring-data/data-graph/snapshot</url>
</snapshotRepository>
</distributionManagement>
</profile>
@@ -127,7 +127,7 @@
<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
<site>
<id>static.springframework.org</id>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-graph/docs/${project.version}</url>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/docs/${project.version}</url>
</site>
<repository>
<id>spring-milestone</id>
@@ -206,7 +206,7 @@
</fileset>
</copy>
<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
tofile="${project.basedir}/target/site/reference/pdf/spring-datastore-graph-reference.pdf"
tofile="${project.basedir}/target/site/reference/pdf/spring-data-graph-reference.pdf"
failonerror="false" />
</postProcess>
</configuration>
@@ -224,7 +224,7 @@
<configuration>
<javadoc:aggregate>true</javadoc:aggregate>
<breakiterator>true</breakiterator>
<header>Spring Datastore Graph</header>
<header>Spring Data Graph</header>
<source>1.5</source>
<quiet>true</quiet>
<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>

6
spring-datastore-graph-core/.classpath → spring-data-graph-core/.classpath
View File

@@ -2,11 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

6
spring-datastore-graph-core/.project → spring-data-graph-core/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>spring-datastore-graph-core</name>
<name>spring-data-graph-core</name>
<comment></comment>
<projects>
</projects>
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>

0
spring-datastore-graph-core/.settings/org.eclipse.jdt.core.prefs → spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs
View File

0
spring-datastore-graph-core/.settings/org.eclipse.wst.common.component → spring-data-graph-core/.settings/org.eclipse.wst.common.component
View File

0
spring-datastore-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml → spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml
View File

0
spring-datastore-graph-core/.settings/org.maven.ide.eclipse.prefs → spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs
View File

8
spring-datastore-graph-core/pom.xml → spring-data-graph-core/pom.xml
View File

@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-parent</artifactId>
<artifactId>spring-data-graph-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-datastore-graph-parent/pom.xml</relativePath>
<relativePath>../spring-data-graph-parent/pom.xml</relativePath>
</parent>
<artifactId>spring-datastore-graph-core</artifactId>
<artifactId>spring-data-graph-core</artifactId>
<packaging>jar</packaging>
<name>Spring Datastore Graph Datastore Support</name>
<name>Spring Data Graph Support</name>
<dependencies>
<!-- Spring -->

2
spring-datastore-graph-core/src/main/java/org/springframework/datastore/graph/UncategorizedGraphStoreException.java → spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java
View File

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

8
spring-datastore-graph-core/template.mf → spring-data-graph-core/template.mf
View File

@@ -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"

18
spring-datastore-graph-parent/pom.xml → spring-data-graph-parent/pom.xml
View File

@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-parent</artifactId>
<name>Spring Datastore Graph Parent</name>
<url>http://www.springsource.org/spring-data/datastore-graph</url>
<artifactId>spring-data-graph-parent</artifactId>
<name>Spring Data Graph Parent</name>
<url>http://www.springsource.org/spring-data/data-graph</url>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -37,15 +37,15 @@
<distributionManagement>
<site>
<id>spring-site-staging</id>
<url>file:///${java.io.tmpdir}/spring-data/datastore-graph/docs</url>
<url>file:///${java.io.tmpdir}/spring-data/data-graph/docs</url>
</site>
<repository>
<id>spring-milestone-staging</id>
<url>file:///${java.io.tmpdir}/spring-data/datastore-graph/milestone</url>
<url>file:///${java.io.tmpdir}/spring-data/data-graph/milestone</url>
</repository>
<snapshotRepository>
<id>spring-snapshot-staging</id>
<url>file:///${java.io.tmpdir}/spring-data/datastore-graph/snapshot</url>
<url>file:///${java.io.tmpdir}/spring-data/data-graph/snapshot</url>
</snapshotRepository>
</distributionManagement>
</profile>
@@ -60,7 +60,7 @@
</downloadUrl>
<site>
<id>static.springframework.org</id>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/datastore-graph/docs/${project.version}
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-graph/docs/${project.version}
</url>
</site>
<repository>
@@ -132,12 +132,12 @@
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-core</artifactId>
<artifactId>spring-data-graph-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-neo4j</artifactId>
<artifactId>spring-data-neo4j</artifactId>
<version>${project.version}</version>
</dependency>

0
spring-datastore-neo4j-roo/.classpath → spring-data-neo4j-roo/.classpath
View File

2
spring-datastore-neo4j-roo/.project → spring-data-neo4j-roo/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>spring-datastore-neo4j-roo</name>
<name>spring-data-neo4j-roo</name>
<comment></comment>
<projects>
</projects>

0
spring-datastore-neo4j-roo/.settings/org.eclipse.jdt.core.prefs → spring-data-neo4j-roo/.settings/org.eclipse.jdt.core.prefs
View File

0
spring-datastore-neo4j-roo/.settings/org.maven.ide.eclipse.prefs → spring-data-neo4j-roo/.settings/org.maven.ide.eclipse.prefs
View File

12
spring-datastore-neo4j-roo/pom.xml → spring-data-neo4j-roo/pom.xml
View File

@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-parent</artifactId>
<artifactId>spring-data-graph-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-datastore-graph-parent/pom.xml</relativePath>
<relativePath>../spring-data-graph-parent/pom.xml</relativePath>
</parent>
<artifactId>spring-datastore-neo4j-roo</artifactId>
<artifactId>spring-data-neo4j-roo</artifactId>
<packaging>jar</packaging>
<name>Spring Datastore Neo4J Roo Support</name>
<name>Spring Data Neo4J Roo Support</name>
<properties>
<aspectj.version>1.6.10.RELEASE</aspectj.version>
</properties>
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-neo4j</artifactId>
<artifactId>spring-data-neo4j</artifactId>
</dependency>
<!-- Logging -->
@@ -204,7 +204,7 @@
</aspectLibrary>
<aspectLibrary>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-neo4j</artifactId>
<artifactId>spring-data-neo4j</artifactId>
</aspectLibrary>
</aspectLibraries>
<source>1.6</source>

14
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4JQuery.java
View File

@@ -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;
/**

8
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManager.java
View File

@@ -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;

6
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerFactory.java
View File

@@ -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;

2
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityTransaction.java
View File

@@ -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.*;

2
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jJpaDialect.java
View File

@@ -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;

6
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jPersistenceProvider.java
View File

@@ -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;

2
spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java → spring-data-neo4j-roo/src/main/java/org/springframework/data/graph/neo4j/jpa/Neo4jQueryParameter.java
View File

@@ -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;
/**

4
spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java → spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Car.java
View File

@@ -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 {

9
spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java → spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Friendship.java
View File

@@ -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;

12
spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java → spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Person.java
View File

@@ -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;

2
spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java → spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/Personality.java
View File

@@ -1,4 +1,4 @@
package org.springframework.datastore.graph.neo4j;
package org.springframework.data.graph.neo4j;
public enum Personality {
EXTROVERT, INTROVERT

8
spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java → spring-data-neo4j-roo/src/test/java/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest.java
View File

@@ -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;

8
spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml → spring-data-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml
View File

@@ -2,10 +2,10 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="neo4j-persistence" transaction-type="RESOURCE_LOCAL">
<provider>org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider</provider>
<class>org.springframework.datastore.graph.neo4j.Person</class>
<class>org.springframework.datastore.graph.neo4j.Group</class>
<class>org.springframework.datastore.graph.neo4j.Friendship</class>
<provider>org.springframework.data.graph.neo4j.jpa.Neo4jPersistenceProvider</provider>
<class>org.springframework.data.graph.neo4j.Person</class>
<class>org.springframework.data.graph.neo4j.Group</class>
<class>org.springframework.data.graph.neo4j.Friendship</class>
<properties>
<property name="neo4j.path" value="test/data"/> <!-- TODO handle this -->
</properties>

4
spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml → spring-data-neo4j-roo/src/test/resources/META-INF/persistence.xml
View File

@@ -5,8 +5,8 @@
<persistence-unit name="default" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<class>org.springframework.datastore.graph.neo4j.partial.User</class>
<class>org.springframework.datastore.graph.neo4j.partial.Restaurant</class>
<class>org.springframework.data.graph.neo4j.partial.User</class>
<class>org.springframework.data.graph.neo4j.partial.Restaurant</class>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>

0
spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/database.properties → spring-data-neo4j-roo/src/test/resources/META-INF/spring/database.properties
View File

0
spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties → spring-data-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties
View File

6
spring-datastore-neo4j-roo/src/test/resources/log4j.properties → spring-data-neo4j-roo/src/test/resources/log4j.properties
View File

@@ -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

28
spring-datastore-neo4j-roo/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml → spring-data-neo4j-roo/src/test/resources/org/springframework/data/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml
View File

@@ -59,7 +59,7 @@
The most commonly used annotation is @Autowired, which instructs Spring to
dependency inject an object into your class.
-->
<context:component-scan base-package="org.springframework.datastore.graph.neo4j">
<context:component-scan base-package="org.springframework.data.graph.neo4j">
<context:exclude-filter expression=".*_Roo_.*" type="regex"/>
<context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
</context:component-scan>
@@ -69,9 +69,9 @@
Start datastore config
-->
<bean class="org.springframework.datastore.graph.neo4j.spi.node.Neo4jNodeBacking" factory-method="aspectOf" />
<bean class="org.springframework.data.graph.neo4j.spi.node.Neo4jNodeBacking" factory-method="aspectOf" />
<bean class="org.springframework.datastore.graph.neo4j.spi.relationship.Neo4jRelationshipBacking" factory-method="aspectOf" />
<bean class="org.springframework.data.graph.neo4j.spi.relationship.Neo4jRelationshipBacking" factory-method="aspectOf" />
<!--
<bean class="org.springframework.persistence.graph.Neo4jSimpleNodePropertyStorageForeignStoreKeyManager"/>
@@ -82,31 +82,31 @@
<constructor-arg index="0" value="target/data/emtest" />
</bean>
<bean id="nodeTypeStrategy" class="org.springframework.datastore.graph.neo4j.support.SubReferenceNodeTypeStrategy">
<bean id="nodeTypeStrategy" class="org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeStrategy">
<constructor-arg index="0" ref="graphDatabaseContext"/>
</bean>
<bean id="indexService" class="org.neo4j.index.lucene.LuceneIndexService" destroy-method="shutdown">
<constructor-arg index="0" ref="graphDbService" />
</bean>
<bean id="graphDatabaseContext" class="org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext"/>
<bean id="graphDatabaseContext" class="org.springframework.data.graph.neo4j.support.GraphDatabaseContext"/>
<bean id="nodeEntityStateAccessorsFactory" class="org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory" />
<bean id="relationshipEntityStateAccessorsFactory" class="org.springframework.datastore.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory" />
<bean id="nodeDelegatingFieldAccessorFactory" class="org.springframework.datastore.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory">
<bean id="nodeEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory" />
<bean id="relationshipEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory" />
<bean id="nodeDelegatingFieldAccessorFactory" class="org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory">
<constructor-arg ref="graphDatabaseContext"/>
</bean>
<bean id="finderFactory" class="org.springframework.datastore.graph.neo4j.finder.FinderFactory">
<bean id="finderFactory" class="org.springframework.data.graph.neo4j.finder.FinderFactory">
<constructor-arg ref="graphDatabaseContext" />
</bean>
<bean id="graphEntityInstantiator" name="gei" class="org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator" />
<bean id="graphEntityInstantiator" name="gei" class="org.springframework.data.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator" />
<bean id="relationshipEntityInstantiator" name="rei" class="org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator" />
<bean id="relationshipEntityInstantiator" name="rei" class="org.springframework.data.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator" />
<!-- conversion support -->
<bean id="conversionService" class="org.springframework.datastore.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean"/>
<bean id="conversionService" class="org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean"/>
<!--
-->
@@ -149,10 +149,10 @@
<bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
<property name="jpaDialect">
<bean class="org.springframework.datastore.graph.neo4j.jpa.Neo4jJpaDialect"/>
<bean class="org.springframework.data.graph.neo4j.jpa.Neo4jJpaDialect"/>
</property>
<property name="persistenceProvider">
<bean class="org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider"/>
<bean class="org.springframework.data.graph.neo4j.jpa.Neo4jPersistenceProvider"/>
</property>
<property name="persistenceXmlLocation" value="classpath:META-INF/persistence-neo4j.xml"/>
</bean>

10
spring-datastore-neo4j-roo/template.mf → spring-data-neo4j-roo/template.mf
View File

@@ -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)",

6
spring-datastore-neo4j/.classpath → spring-data-neo4j/.classpath
View File

@@ -4,11 +4,7 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

6
spring-datastore-neo4j/.project → spring-data-neo4j/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>spring-datastore-neo4j</name>
<name>spring-data-neo4j</name>
<comment></comment>
<projects>
</projects>
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>

0
spring-datastore-neo4j/.settings/org.eclipse.jdt.core.prefs → spring-data-neo4j/.settings/org.eclipse.jdt.core.prefs
View File

0
spring-datastore-neo4j/.settings/org.eclipse.wst.common.component → spring-data-neo4j/.settings/org.eclipse.wst.common.component
View File

0
spring-datastore-neo4j/.settings/org.eclipse.wst.common.project.facet.core.xml → spring-data-neo4j/.settings/org.eclipse.wst.common.project.facet.core.xml
View File

0
spring-datastore-neo4j/.settings/org.maven.ide.eclipse.prefs → spring-data-neo4j/.settings/org.maven.ide.eclipse.prefs
View File

42
spring-datastore-neo4j/README.txt → spring-data-neo4j/README.txt
View File

@@ -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:
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-neo4j</artifactId>
<artifactId>spring-data-neo4j</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
</dependency>
@@ -33,7 +33,7 @@ Standalone setup of project using datastore-graph-neo4j
</aspectLibrary>
<aspectLibrary>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-neo4j</artifactId>
<artifactId>spring-data-neo4j</artifactId>
</aspectLibrary>
</aspectLibraries>
<source>1.6</source>
@@ -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.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -94,26 +94,26 @@ Standalone setup of project using datastore-graph-neo4j
</context:component-scan>
<tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
<bean class="org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator" id="graphEntityInstantiator"/>
<bean class="org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator" id="relationshipEntityInstantiator"/>
<bean class="org.springframework.datastore.graph.neo4j.spi.node.Neo4jNodeBacking" factory-method="aspectOf" id="neo4jNodeBacking"/>
<bean class="org.springframework.datastore.graph.neo4j.spi.relationship.Neo4jRelationshipBacking" factory-method="aspectOf" id="neo4jRelationshipBacking"/>
<bean class="org.springframework.data.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator" id="graphEntityInstantiator"/>
<bean class="org.springframework.data.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator" id="relationshipEntityInstantiator"/>
<bean class="org.springframework.data.graph.neo4j.spi.node.Neo4jNodeBacking" factory-method="aspectOf" id="neo4jNodeBacking"/>
<bean class="org.springframework.data.graph.neo4j.spi.relationship.Neo4jRelationshipBacking" factory-method="aspectOf" id="neo4jRelationshipBacking"/>
<bean class="org.neo4j.kernel.EmbeddedGraphDatabase" destroy-method="shutdown" id="graphDbService" scope="singleton">
<constructor-arg index="0" value="${neo4j.location}"/>
</bean>
<bean class="org.neo4j.index.lucene.LuceneIndexService" destroy-method="shutdown" id="indexService">
<constructor-arg index="0" ref="graphDbService"/>
</bean>
<bean class="org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext" id="graphDatabaseContext"/>
<bean class="org.springframework.datastore.graph.neo4j.support.SubReferenceNodeTypeStrategy" id="nodeTypeStrategy">
<bean class="org.springframework.data.graph.neo4j.support.GraphDatabaseContext" id="graphDatabaseContext"/>
<bean class="org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeStrategy" id="nodeTypeStrategy">
<constructor-arg index="0" ref="graphDatabaseContext"/>
</bean>
<bean class="org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory" id="nodeEntityStateAccessorsFactory"/>
<bean class="org.springframework.datastore.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory" id="relationshipEntityStateAccessorsFactory"/>
<bean class="org.springframework.datastore.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory" id="nodeDelegatingFieldAccessorFactory">
<bean class="org.springframework.data.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory" id="nodeEntityStateAccessorsFactory"/>
<bean class="org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory" id="relationshipEntityStateAccessorsFactory"/>
<bean class="org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory" id="nodeDelegatingFieldAccessorFactory">
<constructor-arg index="0" ref="graphDatabaseContext"/>
</bean>
<bean class="org.springframework.datastore.graph.neo4j.finder.FinderFactory" id="finderFactory">
<bean class="org.springframework.data.graph.neo4j.finder.FinderFactory" id="finderFactory">
<constructor-arg index="0" ref="graphDatabaseContext"/>
</bean>
<bean class="org.springframework.transaction.jta.JtaTransactionManager" id="transactionManager">
@@ -130,9 +130,9 @@ Standalone setup of project using datastore-graph-neo4j
</bean>
<bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
<property name="persistenceUnitName" value="NEO4J"/>
<property name="persistenceProviderClass" value="org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider"/>
<property name="persistenceProviderClass" value="org.springframework.data.graph.neo4j.jpa.Neo4jPersistenceProvider"/>
<property name="jpaDialect">
<bean class="org.springframework.datastore.graph.neo4j.jpa.Neo4jJpaDialect"/>
<bean class="org.springframework.data.graph.neo4j.jpa.Neo4jJpaDialect"/>
</property>
</bean>
<bean class="org.springframework.context.support.ConversionServiceFactoryBean" id="conversionService"/>

10
spring-datastore-neo4j/pom.xml → spring-data-neo4j/pom.xml
View File

@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-parent</artifactId>
<artifactId>spring-data-graph-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-datastore-graph-parent/pom.xml</relativePath>
<relativePath>../spring-data-graph-parent/pom.xml</relativePath>
</parent>
<artifactId>spring-datastore-neo4j</artifactId>
<artifactId>spring-data-neo4j</artifactId>
<packaging>jar</packaging>
<name>Spring Datastore Neo4J Support</name>
<name>Spring Data Neo4J Support</name>
<properties>
<aspectj.version>1.6.10.RELEASE</aspectj.version>
</properties>
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-datastore-graph-core</artifactId>
<artifactId>spring-data-graph-core</artifactId>
</dependency>
<!-- Logging -->

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/EndNode.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphId.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphInactive.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphInactive.java
View File

@@ -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)

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphProperty.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/GraphTraversal.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java
View File

@@ -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

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/NodeEntity.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedTo.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java
View File

@@ -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

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelatedToVia.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java
View File

@@ -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

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/RelationshipEntity.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/annotation/StartNode.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/Direction.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/api/Direction.java
View File

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

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/FieldTraversalDescriptionBuilder.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/api/FieldTraversalDescriptionBuilder.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/GraphBacked.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/api/GraphBacked.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeBacked.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeBacked.java
View File

@@ -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;

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/NodeTypeStrategy.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/api/NodeTypeStrategy.java
View File

@@ -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

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/api/RelationshipBacked.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/api/RelationshipBacked.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java
View File

@@ -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;

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityStateAccessors.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachableEntityStateAccessors.java
View File

@@ -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

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/DoReturn.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DoReturn.java
View File

@@ -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

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/EntityStateAccessors.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/EntityStateAccessors.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessListener.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java
View File

@@ -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<ENTITY, TARGET> {

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessor.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java
View File

@@ -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<ENTITY, TARGET> {

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java
View File

@@ -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

10
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingNodePropertyFieldAccessorListenerFactory.java
View File

@@ -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;

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java
View File

@@ -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;

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java
View File

@@ -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;

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessors.java
View File

@@ -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;

10
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeEntityStateAccessorsFactory.java
View File

@@ -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

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java
View File

@@ -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;

12
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java
View File

@@ -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<NodeBacked> {

10
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java
View File

@@ -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

10
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PartialNodeEntityStateAccessors.java
View File

@@ -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;

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java
View File

@@ -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

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessors.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipEntityStateAccessorsFactory.java
View File

@@ -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

14
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java
View File

@@ -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

10
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java
View File

@@ -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

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java
View File

@@ -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;

14
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java
View File

@@ -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<NodeBacked> {

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/Finder.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/Finder.java
View File

@@ -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;

8
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/finder/FinderFactory.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/finder/FinderFactory.java
View File

@@ -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 {

2
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/remoting/RmiGraphDatabaseServiceExporter.java
View File

@@ -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;

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jConstructorGraphEntityInstantiator.java
View File

@@ -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;
/**

4
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jHelper.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jHelper.java
View File

@@ -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 {

20
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jNodeBacking.aj → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/Neo4jNodeBacking.aj
View File

@@ -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;
/**

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/NodeBackedNodeIterableWrapper.java
View File

@@ -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

6
spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java → spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/spi/node/PartialNeo4jEntityInstantiator.java
View File

@@ -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;

Some files were not shown because too many files have changed in this diff Show More