Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dependency updates, minor API changes, REST submodule reintegration

Browse Source
This commit is contained in:
Michael Hunger
2011-04-08 17:34:08 +02:00
parent e865b6f267
commit a342a477cd
9 changed files with 33 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -11,7 +11,7 @@
<module>spring-data-graph-parent</module>
<module>spring-data-graph-core</module>
<module>spring-data-neo4j</module>
<!-- <module>spring-data-neo4j-rest</module> -->
<module>spring-data-neo4j-rest</module>
</modules>
<developers>

4
spring-data-graph-parent/pom.xml
View File

@@ -16,7 +16,7 @@
<org.slf4j.version>1.5.10</org.slf4j.version>
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
<data.commons.version>1.0.0.BUILD-SNAPSHOT</data.commons.version>
<neo4j.version>1.3.M05</neo4j.version>
<neo4j.version>1.3-SNAPSHOT</neo4j.version>
<aspectj.version>1.6.11.RELEASE</aspectj.version>
</properties>
<profiles>
@@ -219,7 +219,7 @@
<!-- Neo4J -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<artifactId>neo4j-community</artifactId>
<version>${neo4j.version}</version>
</dependency>
<dependency>

151
spring-data-neo4j-rest/pom.xml
View File

@@ -1,33 +1,17 @@
<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-data-graph-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-data-graph-parent/pom.xml</relativePath>
</parent>
<artifactId>spring-data-neo4j-rest</artifactId>
<packaging>jar</packaging>
<version>1.0.0.BUILD-SNAPSHOT</version>
<name>Spring Data Graph REST Wrapper</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.slf4j.version>1.5.10</org.slf4j.version>
<jersey.version>1.4</jersey.version>
<spring-data-neo4j.version>1.0.0.BUILD-SNAPSHOT</spring-data-neo4j.version>
<neo4j.version>1.3.M05</neo4j.version>
<junit.version>4.8.1</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dist.* properties are used by the antrun tasks below -->
<dist.id>spring-data-graph-rest</dist.id>
<dist.name>Spring Data</dist.name>
<dist.key>DATAGRAPH</dist.key>
<dist.version>${project.version}</dist.version>
<dist.releaseType>snapshot</dist.releaseType>
<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
<dist.fileName>${dist.finalName}.zip</dist.fileName>
<dist.filePath>target/${dist.fileName}</dist.filePath>
<dist.bucketName>dist.springframework.org</dist.bucketName>
<!-- these properties should be in ~/.m2/settings.xml
<dist.accessKey>s3 access key</dist.accessKey>
<dist.secretKey>s3 secret key</dist.secretKey>
-->
</properties>
<repositories>
@@ -41,17 +25,18 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
<version>${spring-data-neo4j.version}</version>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
<version>${spring-data-neo4j.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -63,13 +48,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<version>${neo4j.version}</version>
<artifactId>neo4j-community</artifactId>
</dependency>
<dependency>
<groupId>org.neo4j.app</groupId>
@@ -153,35 +136,11 @@
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-kernel</artifactId>
<version>${neo4j.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>spring-milestone</id>
<name>Spring Milestone Repository</name>
<url>s3://maven.springframework.org/milestone</url>
</repository>
<snapshotRepository>
<id>spring-snapshot</id>
<name>Spring Snapshot Repository</name>
<url>s3://maven.springframework.org/snapshot</url>
</snapshotRepository>
</distributionManagement>
<build>
<extensions>
<extension>
<!--
available only in the springframework maven repository. see
<repositories> section below
-->
<groupId>org.springframework.build.aws</groupId>
<artifactId>org.springframework.build.aws.maven</artifactId>
<version>3.1.0.RELEASE</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -191,19 +150,6 @@
</configuration>
</plugin>
<plugin>
<!--
configures the springsource bundlor plugin, which generates
OSGI-compatible MANIFEST.MF files during the 'compile' phase of
the maven build. this plugin is declared within the
pluginManagement section because not every module that inherits
from this pom needs bundlor's services, e.g.:
spring-integration-samples and all its children. for this reason,
all modules that wish to use bundlor must declare it explicitly.
it is not necessary to specify the <version> or <configuration>
sections, but groupId and artifactId are required. see
http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
for more info
-->
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>1.0.0.RELEASE</version>
@@ -219,85 +165,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<configuration>
<javadoc:aggregate>true</javadoc:aggregate>
<breakiterator>true</breakiterator>
<header>Spring Data Graph</header>
<source>1.5</source>
<quiet>true</quiet>
<javadocDirectory>${project.basedir}/../src/main/javadoc</javadocDirectory>
<overview>${project.basedir}/../src/main/javadoc/overview.html</overview>
<stylesheetfile>${project.basedir}/../src/main/javadoc/spring-javadoc.css</stylesheetfile>
<!-- copies doc-files subdirectory which contains image resources -->
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
<link>http://java.sun.com/javase/6/docs/api</link>
<link>http://components.neo4j.org/neo4j/1.3.M05/apidocs</link>
</links>
</configuration>
</plugin>
<plugin><!--
run `mvn package assembly:assembly` to trigger assembly creation.
see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<inherited>false</inherited>
<configuration>
<descriptors>
<descriptor>${project.basedir}/distribution.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>distribution</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>upload-dist</id>
<phase>deploy</phase>
<configuration>
<tasks>
<ant antfile="${basedir}/../src/ant/upload-dist.xml">
<target name="upload-dist"/>
</ant>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.0.5.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.7.2</version>
</dependency>
</dependencies>
</plugin>
</plugins>
<!-- the name of this project is 'spring-data-graph-rest';
make sure the zip file is just 'spring-data-rest'. -->
<finalName>${dist.finalName}</finalName>
</build>
</project>

4
spring-data-neo4j-rest/src/main/java/org/neo4j/kernel/RestConfig.java
View File

@@ -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 {

10
spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java
View File

@@ -134,16 +134,6 @@ public class RestGraphDatabase extends AbstractGraphDatabase implements GraphDat
}
@Override
public boolean enableRemoteShell() {
return false;
}
@Override
public boolean enableRemoteShell(Map<String, Serializable> initialProperties) {
return false;
}
@Override
public Transaction beginTx() {
return new Transaction() {

23
spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java
View File

@@ -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<String, String> 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;

2
spring-data-neo4j/pom.xml
View File

@@ -120,7 +120,7 @@
<!-- Neo4J -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<artifactId>neo4j-community</artifactId>
</dependency>
<dependency>

1
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java
View File

@@ -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;

2
src/assembly/distribution.xml
View File

@@ -44,6 +44,7 @@
<includes>
<include>org.springframework.data:spring-data-graph-core</include>
<include>org.springframework.data:spring-data-neo4j</include>
<include>org.springframework.data:spring-data-neo4j-rest</include>
</includes>
<binaries>
<outputDirectory>dist</outputDirectory>
@@ -57,6 +58,7 @@
<includes>
<include>org.springframework.data:spring-data-graph-core</include>
<include>org.springframework.data:spring-data-neo4j</include>
<include>org.springframework.data:spring-data-neo4j-rest</include>
</includes>
<binaries>
<attachmentClassifier>sources</attachmentClassifier>