split out the temporary jpa em to a separate neo4j-roo module

pom.xml

@@ -11,6 +11,7 @@
 		<module>spring-datastore-graph-parent</module>
 		<module>spring-datastore-graph-core</module>
 		<module>spring-datastore-neo4j</module>
+		<module>spring-datastore-neo4j-roo</module>
 	</modules>
 
 	<developers>

spring-datastore-neo4j-roo/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<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"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

spring-datastore-neo4j-roo/.project

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>spring-datastore-neo4j-roo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.ajdt.core.ajbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.ajdt.ui.ajnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

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

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

spring-datastore-neo4j-roo/pom.xml

@@ -0,0 +1,220 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-datastore-graph-parent</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-datastore-graph-parent/pom.xml</relativePath>
+	</parent>
+	<artifactId>spring-datastore-neo4j-roo</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Datastore Neo4J Roo Support</name>
+	<properties>
+		<aspectj.version>1.6.10.BUILD-SNAPSHOT</aspectj.version>
+	</properties>
+	<dependencies>
+
+		<!--  Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${org.springframework.version}</version>
+		</dependency>
+
+		<!--  Spring Data -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons-aspects</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-datastore-neo4j</artifactId>
+		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.mail</groupId>
+					<artifactId>mail</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.jms</groupId>
+					<artifactId>jms</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jdmk</groupId>
+					<artifactId>jmxtools</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jmx</groupId>
+					<artifactId>jmxri</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>runtime</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>jsr250-api</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj.version}</version>
+		</dependency>
+
+		<!-- Neo4J -->
+		<dependency>
+			<groupId>org.neo4j</groupId>
+			<artifactId>neo4j-kernel</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.neo4j</groupId>
+			<artifactId>neo4j-remote-graphdb</artifactId>
+			<version>0.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.neo4j</groupId>
+			<artifactId>neo4j-utils</artifactId>
+			<version>1.1</version>
+		</dependency>
+
+		<!-- JPA -->
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <version>1.0.0.Final</version>
+        </dependency>
+
+		<!-- For Tests -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.5.5-Final</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.10</version>
+            <scope>test</scope>
+        </dependency>
+
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>neo4j-public-repository</id>
+			<name>Neo4J Public Repository</name>
+			<url>http://m2.neo4j.org</url>
+		</repository>
+		<repository>
+			<id>jboss-repository</id>
+			<name>JBoss Public Repository</name>
+			<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
+		</repository>
+		<repository>
+			<id>spring-maven-snapshot</id>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<name>Springframework Maven SNAPSHOT Repository</name>
+			<url>http://maven.springframework.org/snapshot</url>
+        </repository>
+	</repositories>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>aspectj-maven-plugin</artifactId>
+				<version>1.2</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjrt</artifactId>
+						<version>${aspectj.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjtools</artifactId>
+						<version>${aspectj.version}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>test-compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outxml>true</outxml>
+					<aspectLibraries>
+						<aspectLibrary>
+							<groupId>org.springframework</groupId>
+							<artifactId>spring-aspects</artifactId>
+						</aspectLibrary>
+						<aspectLibrary>
+							<groupId>org.springframework.data</groupId>
+							<artifactId>spring-data-commons-aspects</artifactId>
+						</aspectLibrary>
+						<aspectLibrary>
+							<groupId>org.springframework.data</groupId>
+							<artifactId>spring-datastore-neo4j</artifactId>
+						</aspectLibrary>
+					</aspectLibraries>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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);
+	}
+}

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;
+	}
+}

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<Friendship> 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<Friendship> getFriendships() {
+		return friendships;
+	}
+
+	public void setFriendships(Iterable<Friendship> 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;
+	}
+}

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
+}

spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence-neo4j.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+        <properties>
+            <property name="neo4j.path" value="test/data"/> <!-- TODO handle this -->
+        </properties>
+    </persistence-unit>
+</persistence>

spring-datastore-neo4j-roo/src/test/resources/META-INF/persistence.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="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>
+        <properties>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+        </properties>
+    </persistence-unit>
+</persistence>

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

spring-datastore-neo4j-roo/src/test/resources/META-INF/spring/neo4j.properties

@@ -0,0 +1 @@
+neo4j.databaseDirectory=target/data/test

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

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

spring-datastore-neo4j/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml

@@ -147,15 +147,4 @@
  
     <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
 
-    <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
-        <property name="jpaDialect">
-            <bean class="org.springframework.datastore.graph.neo4j.jpa.Neo4jJpaDialect"/>
-        </property>
-        <property name="persistenceProvider">
-            <bean class="org.springframework.datastore.graph.neo4j.jpa.Neo4jPersistenceProvider"/>
-        </property>
-        <property name="persistenceXmlLocation" value="classpath:META-INF/persistence-neo4j.xml"/>
-    </bean>
-
-    <!--bean id="neoEntityManager"  class="org.springframework.persistence.graph.neo4j.Neo4jEntityManager" scope="prototype"/-->
 </beans>