From 7dded41d6a381b62ebbc640bf29d210ec7032d91 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 19 Jul 2011 16:14:29 +0200 Subject: [PATCH] waiting for jetty startup via listener --- .../data/neo4j/rest/support/LocalTestServer.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java index f82714b09..d34e7c2f0 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java @@ -33,11 +33,7 @@ import org.neo4j.server.modules.ThirdPartyJAXRSModule; import org.neo4j.server.startup.healthcheck.StartupHealthCheck; import org.neo4j.server.startup.healthcheck.StartupHealthCheckRule; import org.neo4j.server.web.Jetty6WebServer; -<<<<<<< HEAD -import org.springframework.dao.DataAccessResourceFailureException; -======= import org.neo4j.test.ImpermanentGraphDatabase; ->>>>>>> waiting for jetty startup via listener import java.io.File; import java.io.IOException;