diff --git a/pom.xml b/pom.xml index 5cecd53b5..ace2579c0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ spring-data-graph-parent spring-data-graph-core spring-data-neo4j - + spring-data-neo4j-rest diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml index 40f0bc552..9ffb0772d 100644 --- a/spring-data-graph-parent/pom.xml +++ b/spring-data-graph-parent/pom.xml @@ -16,7 +16,7 @@ 1.5.10 3.0.5.RELEASE 1.0.0.BUILD-SNAPSHOT - 1.3.M05 + 1.3-SNAPSHOT 1.6.11.RELEASE @@ -219,7 +219,7 @@ org.neo4j - neo4j + neo4j-community ${neo4j.version} diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml index 21b99e3a6..b795d7539 100644 --- a/spring-data-neo4j-rest/pom.xml +++ b/spring-data-neo4j-rest/pom.xml @@ -1,33 +1,17 @@ 4.0.0 + org.springframework.data + spring-data-graph-parent + 1.0.0.BUILD-SNAPSHOT + ../spring-data-graph-parent/pom.xml + spring-data-neo4j-rest jar - 1.0.0.BUILD-SNAPSHOT Spring Data Graph REST Wrapper - UTF-8 - 1.5.10 1.4 - 1.0.0.BUILD-SNAPSHOT - 1.3.M05 - 4.8.1 - UTF-8 - - spring-data-graph-rest - Spring Data - DATAGRAPH - ${project.version} - snapshot - ${dist.id}-${dist.version} - ${dist.finalName}.zip - target/${dist.fileName} - dist.springframework.org - @@ -41,17 +25,18 @@ + org.springframework.data spring-data-neo4j - ${spring-data-neo4j.version} + ${project.version} test test-jar org.springframework.data spring-data-neo4j - ${spring-data-neo4j.version} + ${project.version} org.hibernate @@ -63,13 +48,11 @@ junit junit - ${junit.version} test org.neo4j - neo4j - ${neo4j.version} + neo4j-community org.neo4j.app @@ -153,35 +136,11 @@ org.neo4j neo4j-kernel - ${neo4j.version} tests test - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - maven-compiler-plugin @@ -191,19 +150,6 @@ - com.springsource.bundlor com.springsource.bundlor.maven 1.0.0.RELEASE @@ -219,85 +165,6 @@ - - maven-javadoc-plugin - 2.5 - - true - true -
Spring Data Graph
- 1.5 - true - ${project.basedir}/../src/main/javadoc - ${project.basedir}/../src/main/javadoc/overview.html - ${project.basedir}/../src/main/javadoc/spring-javadoc.css - - true - - http://static.springframework.org/spring/docs/3.0.x/javadoc-api - http://java.sun.com/javase/6/docs/api - http://components.neo4j.org/neo4j/1.3.M05/apidocs - - - - - maven-assembly-plugin - 2.2-beta-5 - false - - - ${project.basedir}/distribution.xml - - false - - - - distribution - - single - - package - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.4 - - - upload-dist - deploy - - - - - - - - - run - - - - - - org.springframework.build - org.springframework.build.aws.ant - 3.0.5.RELEASE - - - net.java.dev.jets3t - jets3t - 0.7.2 - - - - - ${dist.finalName} diff --git a/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java b/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java index 8e9c31f29..08b0ed784 100644 --- a/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java +++ b/spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java @@ -43,7 +43,7 @@ public class RestConfig extends Config { TxIdGenerator txIdGenerator, LastCommittedTxIdSetter lastCommittedTxIdSetter, FileSystemAbstraction fileSystem, LogBufferFactory logBufferFactory) { super(graphDb, storeDir, storeId, - inputParams, kpe, txModule, lockManager, lockReleaser, idGeneratorFactory, txSyncHookFactory, relTypeCreator, txIdGenerator, lastCommittedTxIdSetter, fileSystem, logBufferFactory); + inputParams, kpe, txModule, lockManager, lockReleaser, idGeneratorFactory, txSyncHookFactory, relTypeCreator, txIdGenerator, lastCommittedTxIdSetter, fileSystem); } public RestConfig(AbstractGraphDatabase restGraphDatabase) { @@ -57,7 +57,7 @@ public class RestConfig extends Config { }, null,null, null,null,null,null,null, - null,null); + null); } private static class NullTransactionManager implements TransactionManager { diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java index 08cc70b1b..48da58067 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java @@ -134,16 +134,6 @@ public class RestGraphDatabase extends AbstractGraphDatabase implements GraphDat } - @Override - public boolean enableRemoteShell() { - return false; - } - - @Override - public boolean enableRemoteShell(Map initialProperties) { - return false; - } - @Override public Transaction beginTx() { return new Transaction() { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java index c48ce8734..463163d87 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java @@ -17,17 +17,22 @@ package org.springframework.data.graph.neo4j.rest.support; import org.neo4j.kernel.AbstractGraphDatabase; +import org.neo4j.kernel.ImpermanentGraphDatabase; import org.neo4j.server.AddressResolver; import org.neo4j.server.NeoServerWithEmbeddedWebServer; import org.neo4j.server.database.Database; +import org.neo4j.server.database.GraphDatabaseFactory; import org.neo4j.server.modules.RESTApiModule; import org.neo4j.server.modules.ThirdPartyJAXRSModule; import org.neo4j.server.startup.healthcheck.StartupHealthCheck; import org.neo4j.server.web.Jetty6WebServer; import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URL; +import java.util.Arrays; +import java.util.Map; /** * @author mh @@ -52,17 +57,21 @@ public class LocalTestServer { if (neoServer!=null) throw new IllegalStateException("Server already running"); URL url = getClass().getResource("/" + propertiesFile); if (url==null) throw new IllegalArgumentException("Could not resolve properties file "+propertiesFile); - neoServer = new NeoServerWithEmbeddedWebServer(new AddressResolver() { + neoServer = new NeoServerWithEmbeddedWebServer(new GraphDatabaseFactory() { + @Override + public AbstractGraphDatabase createDatabase(String databaseStoreDirectory, Map databaseProperties) { + try { + return new ImpermanentGraphDatabase(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + },new AddressResolver() { @Override public String getHostname() { return hostname; } - }, new StartupHealthCheck(), new File(url.getPath()), new Jetty6WebServer()) { - protected void registerServerModules() { - registerModule(RESTApiModule.class); - registerModule(ThirdPartyJAXRSModule.class); - } - + }, new StartupHealthCheck(), new File(url.getPath()), new Jetty6WebServer(), Arrays.asList(RESTApiModule.class, ThirdPartyJAXRSModule.class)) { @Override protected int getWebServerPort() { return port; diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index e198c19fd..d12b00b12 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -120,7 +120,7 @@ org.neo4j - neo4j + neo4j-community diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java index a710dd62e..9f9615337 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java @@ -20,7 +20,6 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.kernel.EmbeddedGraphDatabase; import org.springframework.beans.factory.FactoryBean; import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.support.DelegatingGraphDatabase; import javax.annotation.PreDestroy; import java.io.File; diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml index c1f5e91e1..c7c6c6fb4 100644 --- a/src/assembly/distribution.xml +++ b/src/assembly/distribution.xml @@ -44,6 +44,7 @@ org.springframework.data:spring-data-graph-core org.springframework.data:spring-data-neo4j + org.springframework.data:spring-data-neo4j-rest dist @@ -57,6 +58,7 @@ org.springframework.data:spring-data-graph-core org.springframework.data:spring-data-neo4j + org.springframework.data:spring-data-neo4j-rest sources