Moved to using 1.4.M04

jimwebber · Jun 15, 2011 · c76729c · c76729c
1 parent bc956d7
commit c76729c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 35 deletions.
diff --git a/settings/ivy.xml b/settings/ivy.xml
@@ -9,10 +9,10 @@
 		</dependency>
 		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
 		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
-		<dependency org="org.neo4j.app" name="neo4j-server" rev="1.3"/>
-		<dependency org="org.neo4j" name="neo4j-community" rev="1.3"/>
-		<dependency org="org.neo4j" name="neo4j-shell" rev="1.3"/>
-		<dependency org="org.neo4j" name="neo4j-graph-matching" rev="0.8"/>
+		<dependency org="org.neo4j.app" name="neo4j-server" rev="1.4.M04"/>
+		<dependency org="org.neo4j" name="neo4j-community" rev="1.4.M04"/>
+		<dependency org="org.neo4j" name="neo4j-shell" rev="1.4.M04"/>
+		<!--<dependency org="org.neo4j" name="neo4j-graph-matching" rev="0.8"/>-->
 		<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.5"/>
 		<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.5"/>
 		<dependency org="com.sun.jersey" name="jersey-client" rev="1.3"/>

diff --git a/settings/ivysettings.xml b/settings/ivysettings.xml
@@ -7,6 +7,7 @@
 	    	<ibiblio name="maven_central" root="http://repo2.maven.org/maven2/" m2compatible="true"/>
 	        <ibiblio name="jboss" root="http://repository.jboss.org/nexus/content/groups/public/" m2compatible="true"/>   
 	        <ibiblio name="springframework" root="http://maven.springframework.org/release" m2compatible="true"/>
+	        <ibiblio name="springframework_milestone" root="http://maven.springframework.org/milestone" m2compatible="true"/>
 	    	<ibiblio name="jacorb" root="http://maven.ow2.org/maven2/" m2compatible="true"/>           
 	    </chain>
 	</resolvers>

diff --git a/src/koan/java/org/neo4j/tutorial/Koan06.java b/src/koan/java/org/neo4j/tutorial/Koan06.java
@@ -34,7 +34,7 @@ public static void closeTheDatabase() {
     }
 
     @Test
-    public void shouldDiscoverHowManyTimesTheDoctorHasRegenerated() throws Exception {
+    public void shouldDiscoverHowManyIncarnationsOfTheDoctorThereHaveBeen() throws Exception {
         Node theDoctor = universe.theDoctor();
         Traverser traverser = null;
 

diff --git a/src/main/java/org/neo4j/tutorial/server/ServerBuilder.java b/src/main/java/org/neo4j/tutorial/server/ServerBuilder.java
@@ -1,13 +1,11 @@
 package org.neo4j.tutorial.server;
 
-import org.neo4j.server.AddressResolver;
-import org.neo4j.server.NeoServerBootstrapper;
-import org.neo4j.server.NeoServerWithEmbeddedWebServer;
-import org.neo4j.server.configuration.Configurator;
-import org.neo4j.server.modules.ServerModule;
-import org.neo4j.server.startup.healthcheck.StartupHealthCheck;
-import org.neo4j.server.startup.healthcheck.StartupHealthCheckRule;
-import org.neo4j.server.web.Jetty6WebServer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.neo4j.tutorial.server.ServerTestUtils.createTempDir;
+import static org.neo4j.tutorial.server.ServerTestUtils.createTempPropertyFile;
+import static org.neo4j.tutorial.server.ServerTestUtils.writePropertiesToFile;
+import static org.neo4j.tutorial.server.ServerTestUtils.writePropertyToFile;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -21,9 +19,17 @@
 import java.util.List;
 import java.util.Properties;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.neo4j.tutorial.server.ServerTestUtils.*;
+import org.neo4j.server.AddressResolver;
+import org.neo4j.server.NeoServerBootstrapper;
+import org.neo4j.server.NeoServerWithEmbeddedWebServer;
+import org.neo4j.server.configuration.Configurator;
+import org.neo4j.server.configuration.PropertyFileConfigurator;
+import org.neo4j.server.configuration.validation.DatabaseLocationMustBeSpecifiedRule;
+import org.neo4j.server.configuration.validation.Validator;
+import org.neo4j.server.modules.ServerModule;
+import org.neo4j.server.startup.healthcheck.StartupHealthCheck;
+import org.neo4j.server.startup.healthcheck.StartupHealthCheckRule;
+import org.neo4j.server.web.Jetty6WebServer;
 
 public class ServerBuilder {
 
@@ -53,7 +59,7 @@ public NeoServerWithEmbeddedWebServer build() throws IOException {
         }
         File f = createPropertiesFiles();
 
-        return new NeoServerWithEmbeddedWebServer(new NeoServerBootstrapper(), addressResolver, startupHealthCheck, f, new Jetty6WebServer(), serverModules);
+        return new NeoServerWithEmbeddedWebServer(new NeoServerBootstrapper(), addressResolver, startupHealthCheck, new PropertyFileConfigurator( new Validator( new DatabaseLocationMustBeSpecifiedRule() ), f ), new Jetty6WebServer(), serverModules);
     }
 
 
@@ -72,7 +78,7 @@ private void createPropertiesFile(File temporaryConfigFile) {
             writePropertyToFile(Configurator.WEBSERVER_PORT_PROPERTY_KEY, portNo, temporaryConfigFile);
         }
         writePropertyToFile(Configurator.MANAGEMENT_PATH_PROPERTY_KEY, webAdminUri, temporaryConfigFile);
-        writePropertyToFile(Configurator.DATA_API_PATH_PROPERTY_KEY, webAdminDataUri, temporaryConfigFile);
+        writePropertyToFile(Configurator.REST_API_PATH_PROPERTY_KEY, webAdminDataUri, temporaryConfigFile);
 
         if (thirdPartyPackages.keySet().size() > 0) {
             writePropertiesToFile(Configurator.THIRD_PARTY_PACKAGES_KEY, thirdPartyPackages, temporaryConfigFile);

diff --git a/src/main/java/org/neo4j/tutorial/spring/SpeciesEntity.java b/src/main/java/org/neo4j/tutorial/spring/SpeciesEntity.java
@@ -1,14 +1,14 @@
 package org.neo4j.tutorial.spring;
 
-import org.springframework.data.graph.annotation.NodeEntity;
-import org.springframework.data.graph.neo4j.annotation.Indexed;
-
-@NodeEntity
-public class SpeciesEntity{
-	@Indexed
-    String species;
-
-	public String getName(){
-		return species;
-	}
-}
+//import org.springframework.data.graph.annotation.NodeEntity;
+//import org.springframework.data.graph.neo4j.annotation.Indexed;
+//
+//@NodeEntity
+//public class SpeciesEntity{
+//	@Indexed
+//    String species;
+//	
+//	public String getName(){
+//		return species;
+//	}
+//}
diff --git a/src/test/java/org/neo4j/tutorial/DoctorWhoUniverseTest.java b/src/test/java/org/neo4j/tutorial/DoctorWhoUniverseTest.java
@@ -75,12 +75,12 @@ public void shouldHaveCorrectNumberOfHumans() {
     }
 
     @Test
-    public void shouldBe6Timelords() {
+    public void shouldBe8Timelords() {
         Node timelordSpeciesNode = universe.getDatabase().index().forNodes("species").get("species", "Timelord").getSingle();
 
         int numberOfTimelordsInTheDb = databaseHelper.countRelationships(timelordSpeciesNode.getRelationships(DoctorWhoUniverse.IS_A, Direction.INCOMING));
 
-        int knownNumberOfTimelords = 6;
+        int knownNumberOfTimelords = 8;
         assertEquals(knownNumberOfTimelords, numberOfTimelordsInTheDb);
     }
 
@@ -180,7 +180,7 @@ public void shortestPathBetweenDoctorAndMasterShouldBeLengthOneTypeEnemyOf() {
 
         Path shortestPath = shortestPathFinder.findSinglePath(theDoctor, theMaster);
         assertEquals(1, shortestPath.length());
-        assertEquals(DoctorWhoUniverse.ENEMY_OF, shortestPath.lastRelationship().getType());
+        assertTrue(shortestPath.lastRelationship().isType(DoctorWhoUniverse.ENEMY_OF));
     }
 
     @Test
@@ -240,7 +240,7 @@ public Evaluation evaluate(Path path) {
 
         List<Node> enemiesOfEnemies = databaseHelper.toListOfNodes(nodes);
 
-        int numberOfIndividualAndSpeciesEnemiesInTheDatabase = 138;
+        int numberOfIndividualAndSpeciesEnemiesInTheDatabase = 139;
         assertEquals(numberOfIndividualAndSpeciesEnemiesInTheDatabase, enemiesOfEnemies.size());
         assertTrue(isInList(dalek, enemiesOfEnemies));
         assertTrue(isInList(cyberman, enemiesOfEnemies));
@@ -285,7 +285,7 @@ public void shouldHaveCorrectNumberOfCompanionsInTotal() {
 
     @Test
     public void shouldHaveCorrectNumberofIndividualEnemyCharactersInTotal() {
-        int numberOfEnemies = 98;
+        int numberOfEnemies = 99;
 
         Node theDoctor = universe.getDatabase().index().forNodes("characters").get("name", "Doctor").getSingle();
         assertNotNull(theDoctor);