diff --git a/pom.xml b/pom.xml index bf43fbacb..7e34e509b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ spring-datastore-graph-parent spring-datastore-graph-core spring-datastore-neo4j + spring-datastore-neo4j-roo diff --git a/spring-datastore-neo4j-roo/.classpath b/spring-datastore-neo4j-roo/.classpath new file mode 100644 index 000000000..7c3d14f89 --- /dev/null +++ b/spring-datastore-neo4j-roo/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-datastore-neo4j-roo/.project b/spring-datastore-neo4j-roo/.project new file mode 100644 index 000000000..142fa55f3 --- /dev/null +++ b/spring-datastore-neo4j-roo/.project @@ -0,0 +1,24 @@ + + + spring-datastore-neo4j-roo + + + + + + org.eclipse.ajdt.core.ajbuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.eclipse.ajdt.ui.ajnature + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/spring-datastore-neo4j-roo/.settings/org.eclipse.jdt.core.prefs b/spring-datastore-neo4j-roo/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..98db1447e --- /dev/null +++ b/spring-datastore-neo4j-roo/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,6 @@ +#Fri Oct 29 18:37:18 EDT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/spring-datastore-neo4j-roo/.settings/org.maven.ide.eclipse.prefs b/spring-datastore-neo4j-roo/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..c588f5799 --- /dev/null +++ b/spring-datastore-neo4j-roo/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Oct 29 18:37:14 EDT 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-datastore-neo4j-roo/pom.xml b/spring-datastore-neo4j-roo/pom.xml new file mode 100644 index 000000000..a31106eb6 --- /dev/null +++ b/spring-datastore-neo4j-roo/pom.xml @@ -0,0 +1,220 @@ + + 4.0.0 + + org.springframework.data + spring-datastore-graph-parent + 1.0.0.BUILD-SNAPSHOT + ../spring-datastore-graph-parent/pom.xml + + spring-datastore-neo4j-roo + jar + Spring Datastore Neo4J Roo Support + + 1.6.10.BUILD-SNAPSHOT + + + + + + org.springframework + spring-beans + + + org.springframework + spring-tx + + + org.springframework + spring-orm + ${org.springframework.version} + + + + + org.springframework.data + spring-data-commons-core + + + org.springframework.data + spring-data-commons-aspects + + + org.springframework.data + spring-datastore-neo4j + + + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + compile + + + org.slf4j + slf4j-log4j12 + runtime + + + log4j + log4j + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + runtime + + + + javax.annotation + jsr250-api + true + + + + org.mockito + mockito-all + test + + + + junit + junit + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + + + org.neo4j + neo4j-kernel + 1.1 + + + org.neo4j + neo4j-remote-graphdb + 0.7 + + + org.neo4j + neo4j-utils + 1.1 + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + + + + + org.hibernate + hibernate-entitymanager + 3.5.5-Final + test + + + hsqldb + hsqldb + 1.8.0.10 + test + + + + + + neo4j-public-repository + Neo4J Public Repository + http://m2.neo4j.org + + + jboss-repository + JBoss Public Repository + http://repository.jboss.org/nexus/content/groups/public-jboss + + + spring-maven-snapshot + + true + + Springframework Maven SNAPSHOT Repository + http://maven.springframework.org/snapshot + + + + + + org.codehaus.mojo + aspectj-maven-plugin + 1.2 + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + + + compile + test-compile + + + + + true + + + org.springframework + spring-aspects + + + org.springframework.data + spring-data-commons-aspects + + + org.springframework.data + spring-datastore-neo4j + + + 1.6 + 1.6 + + + + com.springsource.bundlor + com.springsource.bundlor.maven + + + + diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4JQuery.java diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerFactory.java diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityTransaction.java diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jJpaDialect.java diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jPersistenceProvider.java diff --git a/spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java b/spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java similarity index 100% rename from spring-datastore-neo4j/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java rename to spring-datastore-neo4j-roo/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jQueryParameter.java diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java new file mode 100644 index 000000000..757b4fcf9 --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Car.java @@ -0,0 +1,14 @@ +package org.springframework.datastore.graph.neo4j; + +import org.neo4j.graphdb.Node; +import org.springframework.datastore.graph.annotation.NodeEntity; + +@NodeEntity +public abstract class Car { + public Car() { + } + + public Car(Node n) { + setUnderlyingState(n); + } +} diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java new file mode 100644 index 000000000..ff78e820b --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Friendship.java @@ -0,0 +1,78 @@ +package org.springframework.datastore.graph.neo4j; + + +import org.springframework.datastore.graph.annotation.EndNode; +import org.springframework.datastore.graph.annotation.RelationshipEntity; +import org.springframework.datastore.graph.annotation.StartNode; + +import java.util.Date; + +@RelationshipEntity(useShortNames = false) +public class Friendship { + + public Friendship() { + } + + public Friendship(Person p1, Person p2) { + this.p1 = p1; + this.p2 = p2; + } + + public Friendship(Person p1, Person p2, int years) { + this.p1 = p1; + this.p2 = p2; + this.years = years; + } + + @StartNode + private Person p1; + + @EndNode + private Person p2; + + private int years; + + private Date firstMeetingDate; + + private transient String latestLocation; + + public void setPerson1(Person p) { + p1 = p; + } + + public Person getPerson1() { + return p1; + } + + public void setPerson2(Person p) { + p2 = p; + } + + public Person getPerson2() { + return p2; + } + + public void setYears(int years) { + this.years = years; + } + + public int getYears() { + return years; + } + + public void setFirstMeetingDate(Date firstMeetingDate) { + this.firstMeetingDate = firstMeetingDate; + } + + public Date getFirstMeetingDate() { + return firstMeetingDate; + } + + public void setLatestLocation(String latestLocation) { + this.latestLocation = latestLocation; + } + + public String getLatestLocation() { + return latestLocation; + } +} diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java new file mode 100644 index 000000000..48088ff00 --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Person.java @@ -0,0 +1,158 @@ +package org.springframework.datastore.graph.neo4j; + +import org.springframework.datastore.annotation.Indexed; +import org.springframework.datastore.graph.annotation.*; +import org.springframework.datastore.graph.api.Direction; + +import java.util.Date; + + +@NodeEntity(useShortNames = false) +public class Person { + + @GraphId + private Long graphId; + + @GraphProperty(index = true) + private String name; + + @Indexed + private String nickname; + + private int age; + + private Short height; + + private transient String thought; + + private Personality personality; + + private Date birthdate; + + private Person spouse; + + private Car car; + + @RelatedTo(type = "mother", direction = Direction.OUTGOING) + private Person mother; + + @RelatedTo(type = "boss", direction = Direction.INCOMING) + private Person boss; + + @RelatedToVia(type = "knows", elementClass = Friendship.class) + private Iterable friendships; + + public Person() { + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public Short getHeight() { + return height; + } + + public void setHeight(Short height) { + this.height = height; + } + + + public Person getSpouse() { + return spouse; + } + + public void setSpouse(Person spouse) { + this.spouse = spouse; + } + + public Person getMother() { + return mother; + } + + public void setMother(Person mother) { + this.mother = mother; + } + + public Person getBoss() { + return boss; + } + + public void setBoss(Person boss) { + this.boss = boss; + } + + @Override + public String toString() { + return name; + } + + public Iterable getFriendships() { + return friendships; + } + + public void setFriendships(Iterable f) { + friendships = f; + } + + public Friendship knows(Person p) { + return (Friendship)relateTo(p, Friendship.class,"knows"); + } + + public void setPersonality(Personality personality) { + this.personality = personality; + } + + public Personality getPersonality() { + return personality; + } + + public void setThought(String thought) { + this.thought = thought; + } + + public String getThought() { + return thought; + } + + public Date getBirthdate() { + return birthdate; + } + + public void setBirthdate(Date birthdate) { + this.birthdate = birthdate; + } + + public long getId() { + return graphId; + } + + public void setCar(Car car) { + this.car = car; + } + + public Car getCar() { + return car; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } +} diff --git a/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java new file mode 100644 index 000000000..56aabee1a --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/Personality.java @@ -0,0 +1,5 @@ +package org.springframework.datastore.graph.neo4j; + +public enum Personality { + EXTROVERT, INTROVERT +} diff --git a/spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java b/spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java similarity index 100% rename from spring-datastore-neo4j/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java rename to spring-datastore-neo4j-roo/src/test/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest.java diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml b/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml new file mode 100644 index 000000000..98be20d92 --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml @@ -0,0 +1,13 @@ + + + + + org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider + org.springframework.datastore.graph.neo4j.Person + org.springframework.datastore.graph.neo4j.Group + org.springframework.datastore.graph.neo4j.Friendship + + + + + diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml b/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml new file mode 100644 index 000000000..e4381dc2b --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml @@ -0,0 +1,15 @@ + + + + + org.hibernate.ejb.HibernatePersistence + org.springframework.datastore.graph.neo4j.partial.User + org.springframework.datastore.graph.neo4j.partial.Restaurant + + + + + + diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/database.properties b/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/database.properties new file mode 100644 index 000000000..6dda8e5d5 --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/database.properties @@ -0,0 +1,6 @@ +#Updated at Tue Mar 23 14:26:10 PDT 2010 +#Tue Mar 23 14:26:10 PDT 2010 +database.password= +database.url=jdbc\:hsqldb\:mem\:test +database.username=sa +database.driverClassName=org.hsqldb.jdbcDriver diff --git a/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties b/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties new file mode 100644 index 000000000..f2ca3696a --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties @@ -0,0 +1 @@ +neo4j.databaseDirectory=target/data/test \ No newline at end of file diff --git a/spring-datastore-neo4j-roo/src/test/resources/log4j.properties b/spring-datastore-neo4j-roo/src/test/resources/log4j.properties new file mode 100644 index 000000000..86acbf146 --- /dev/null +++ b/spring-datastore-neo4j-roo/src/test/resources/log4j.properties @@ -0,0 +1,24 @@ +log4j.rootLogger=info, stdout, R + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout + +# Print the date in ISO 8601 format +log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=target/application.log + +log4j.appender.R.MaxFileSize=100KB +# Keep one backup file +log4j.appender.R.MaxBackupIndex=1 + +log4j.appender.R.layout=org.apache.log4j.PatternLayout +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.persistence=TRACE +#log4j.category.org.springframework.datastore.graph.neo4j.spi.Neo4jGraphPersistenceTest=DEBUG +#log4j.category.org.springframework.datastore.graph.neo4j.support=DEBUG diff --git a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml b/spring-datastore-neo4j-roo/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml similarity index 100% rename from spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml rename to spring-datastore-neo4j-roo/src/test/resources/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManagerTest-context.xml diff --git a/spring-datastore-neo4j-roo/template.mf b/spring-datastore-neo4j-roo/template.mf new file mode 100644 index 000000000..1e1acfe2a --- /dev/null +++ b/spring-datastore-neo4j-roo/template.mf @@ -0,0 +1,26 @@ +Bundle-SymbolicName: org.springframework.datastore.neo4j.roo +Bundle-Name: Spring Datastore Neo4J Roo Support +Bundle-Vendor: SpringSource +Bundle-ManifestVersion: 2 +Import-Package: + sun.reflect;version="0";resolution:=optional +Import-Template: + org.springframework.beans.*;version="[3.0.0, 4.0.0)", + org.springframework.core.*;version="[3.0.0, 4.0.0)", + org.springframework.dao.*;version="[3.0.0, 4.0.0)", + org.springframework.jdbc.*;version="[3.0.0, 4.0.0)", + org.springframework.orm.*;version="[3.0.0, 4.0.0)", + 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.persistence.*;version="[1.0.0, 2.0.0)", + org.neo4j.*;version="0", + org.aspectj.*;version="[1.6.5, 2.0.0)", + org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", + javax.annotation.*;version="0";resolution:=optional, + javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, + javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional, + javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional diff --git a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml b/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml index 130a04cf0..626f4f50d 100644 --- a/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml +++ b/spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml @@ -147,15 +147,4 @@ - - - - - - - - - - -