closing #28 & some staff for #29

sim51 · Jun 23, 2013 · 7592aaf · 7592aaf
1 parent d8157db
commit 7592aaf
Show file tree

Hide file tree

Showing 64 changed files with 19 additions and 3,739 deletions.
diff --git a/build.properties b/build.properties
@@ -1 +1 @@
-play.path=/usr/local/play/play1
+play.path=/usr/local/play/play1/current
diff --git a/conf/dependencies.yml b/conf/dependencies.yml
@@ -1,27 +1,15 @@
-self: play -> neo4j 1.0.2
+self: play -> neo4j 1.9
 
 require:
     - play
+    - org.neo4j -> neo4j 1.9
+    - org.neo4j.app -> neo4j-server 1.9
+    - org.neo4j.app -> neo4j-server 1.9 static-web
+    - com.sun.jersey -> jersey-core 1.9
 
 repositories:
-    - Neo4j:
+    - neo4j-release:
         type: iBiblio
         root: "http://m2.neo4j.org/content/repositories/releases"
         contains:
-            - org.neo4j -> *   
-    - osgeo:
-        type: iBiblio
-        root: "http://download.osgeo.org/webdav/geotools/"          
-    - opengeo:
-        type: iBiblio
-        root: "http://repo.opengeo.org"
-        contains:
-            - org.opengeo -> *
-    - tinkerpop:
-        type: iBiblio
-        root: "http://tinkerpop.com/maven2"
-        contains:
-            - com.tinkerpop -> *           
-
-
-
+            - org.neo4j -> *
diff --git a/documentation/manual/home.textile b/documentation/manual/home.textile
@@ -109,7 +109,7 @@ With Neo4jRelatedTo annotation, you can also defined some attributes :
 </p> 
 <ul>
     <li><strong>lazy :</strong> like hibernate, you can do lazy loading for relation. By default, it's value is "true" to avoid circular reference and avoid loop that produce "Java Heap Space".</li>
-    <li><strong>direction :</strong>to specified the direction of the relation. By default, it's "OUTGOING", but you can change it to "INCOMING". Direction "BOTH is not implemented !!!</li>
+    <li><strong>direction :</strong>to specified the direction of the relation. By default, it's OUTGOING, but you can change it to INCOMING or BOTH.</li>
 </ul>
 
 

diff --git a/lib/antlr-2.7.7.jar b/lib/antlr-2.7.7.jar
diff --git a/lib/asm-analysis-3.2.jar b/lib/asm-analysis-3.2.jar
diff --git a/lib/asm-commons-3.2.jar b/lib/asm-commons-3.2.jar
diff --git a/lib/asm-tree-3.2.jar b/lib/asm-tree-3.2.jar
diff --git a/lib/asm-util-3.2.jar b/lib/asm-util-3.2.jar
diff --git a/lib/blueprints-core-1.2.jar b/lib/blueprints-core-1.2.jar
diff --git a/lib/blueprints-neo4j-graph-1.2.jar b/lib/blueprints-neo4j-graph-1.2.jar
diff --git a/lib/commons-beanutils-1.8.0.jar b/lib/commons-beanutils-1.8.0.jar
diff --git a/lib/commons-collections-3.2.1.jar b/lib/commons-collections-3.2.1.jar
diff --git a/lib/commons-io-1.4.jar b/lib/commons-io-1.4.jar
diff --git a/lib/commons-lang-2.4.jar b/lib/commons-lang-2.4.jar
diff --git a/lib/commons-logging-1.1.1.jar b/lib/commons-logging-1.1.1.jar
diff --git a/lib/geronimo-jta_1.1_spec-1.1.1.jar b/lib/geronimo-jta_1.1_spec-1.1.1.jar
diff --git a/lib/gremlin-groovy-1.5.jar b/lib/gremlin-groovy-1.5.jar
diff --git a/lib/gremlin-java-1.5.jar b/lib/gremlin-java-1.5.jar
diff --git a/lib/groovy-1.8.5.jar b/lib/groovy-1.8.5.jar
diff --git a/lib/jackson-core-asl-1.8.3.jar b/lib/jackson-core-asl-1.8.3.jar
diff --git a/lib/jackson-jaxrs-1.8.3.jar b/lib/jackson-jaxrs-1.8.3.jar
diff --git a/lib/jackson-mapper-asl-1.8.3.jar b/lib/jackson-mapper-asl-1.8.3.jar
diff --git a/lib/jansi-1.5.jar b/lib/jansi-1.5.jar
diff --git a/lib/jcl-over-slf4j-1.6.1.jar b/lib/jcl-over-slf4j-1.6.1.jar
diff --git a/lib/jettison-1.3.jar b/lib/jettison-1.3.jar
diff --git a/lib/lucene-core-3.5.0.jar b/lib/lucene-core-3.5.0.jar
diff --git a/lib/neo4j-cypher-1.7.jar b/lib/neo4j-cypher-1.7.jar
diff --git a/lib/neo4j-cypher-plugin-1.7.jar b/lib/neo4j-cypher-plugin-1.7.jar
diff --git a/lib/neo4j-graph-algo-1.7.jar b/lib/neo4j-graph-algo-1.7.jar
diff --git a/lib/neo4j-graph-matching-1.7.jar b/lib/neo4j-graph-matching-1.7.jar
diff --git a/lib/neo4j-gremlin-plugin-1.7.jar b/lib/neo4j-gremlin-plugin-1.7.jar
diff --git a/lib/neo4j-jmx-1.7.jar b/lib/neo4j-jmx-1.7.jar
diff --git a/lib/neo4j-kernel-1.7.jar b/lib/neo4j-kernel-1.7.jar
diff --git a/lib/neo4j-lucene-index-1.7.jar b/lib/neo4j-lucene-index-1.7.jar
diff --git a/lib/neo4j-server-1.7-static-web.jar b/lib/neo4j-server-1.7-static-web.jar
diff --git a/lib/neo4j-server-1.7.jar b/lib/neo4j-server-1.7.jar
diff --git a/lib/neo4j-shell-1.7.jar b/lib/neo4j-shell-1.7.jar
diff --git a/lib/neo4j-udc-1.7.jar b/lib/neo4j-udc-1.7.jar
diff --git a/lib/org.apache.servicemix.bundles.jline-0.9.94_1.jar b/lib/org.apache.servicemix.bundles.jline-0.9.94_1.jar
diff --git a/lib/pipes-1.0.jar b/lib/pipes-1.0.jar
diff --git a/lib/scala-library-2.9.0-1.jar b/lib/scala-library-2.9.0-1.jar
diff --git a/lib/server-api-1.7.jar b/lib/server-api-1.7.jar
diff --git a/lib/slf4j-api-1.6.1.jar b/lib/slf4j-api-1.6.1.jar
diff --git a/lib/slf4j-jdk14-1.6.1.jar b/lib/slf4j-jdk14-1.6.1.jar
diff --git a/lib/stax-api-1.0.1.jar b/lib/stax-api-1.0.1.jar
diff --git a/samples-and-tests/logisima-play-neo4j-test/app/models/User.java b/samples-and-tests/logisima-play-neo4j-test/app/models/User.java
@@ -3,6 +3,8 @@
 import java.util.Date;
 import java.util.List;
 
+import org.neo4j.graphdb.Direction;
+
 import play.db.jpa.Blob;
 import play.modules.neo4j.annotation.Neo4jIndex;
 import play.modules.neo4j.annotation.Neo4jRelatedTo;
@@ -33,10 +35,10 @@ public class User extends Neo4jModel {
 
     public Boolean    isActive;
 
-    @Neo4jRelatedTo(value = "IS_FRIEND", lazy = false)
+    @Neo4jRelatedTo(value = "IS_FRIEND", lazy = true)
     public List<User> friends;
 
-    @Neo4jRelatedTo(value = "IS_FRIEND", direction = "INCOMING")
+    @Neo4jRelatedTo(value = "IS_FRIEND", direction = Direction.INCOMING, lazy = true)
     public List<User> reversefriends;
 
     @Neo4jRelatedTo("IS_FAMILLY")
@@ -48,7 +50,7 @@ public class User extends Neo4jModel {
     @Neo4jRelatedTo(value = "IS_A_CLASSMATE")
     public List<User> classmates;
 
-    @Neo4jUniqueRelation(value = "NEXT_JOB", line = true)
+    @Neo4jUniqueRelation(value = "NEXT_JOB", line = false)
     public Job        job;
 
     @Neo4jUniqueRelation(value = "ADDRESS", line = false)

diff --git a/samples-and-tests/logisima-play-neo4j-touiteur/logs/system.out b/samples-and-tests/logisima-play-neo4j-touiteur/logs/system.out
diff --git a/...nd-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.DatabaseTest.xml b/...nd-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.DatabaseTest.xml
diff --git a/...nd-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.FixturesTest.xml b/...nd-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.FixturesTest.xml
diff --git a/...s-and-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.ModelTest.xml b/...s-and-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.ModelTest.xml
diff --git a/...nd-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.RelationTest.xml b/...nd-tests/logisima-play-neo4j-touiteur/test-result/TEST-play.module.neo4j.RelationTest.xml