You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/05/08 23:54:09 UTC
[48/51] [abbrv] incubator-streams git commit: Merge branch
'STREAMS-313' into pp-master
Merge branch 'STREAMS-313' into pp-master
Conflicts:
pom.xml
streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jVertexReader.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/51bac075
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/51bac075
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/51bac075
Branch: refs/heads/pp-master
Commit: 51bac0759d6ea79b82c877c1ada03343989bdcac
Parents: b58aa1f cb1aaea
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Fri May 8 16:20:15 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri May 8 16:20:15 2015 -0500
----------------------------------------------------------------------
pom.xml | 31 ++-
streams-contrib/streams-persist-graph/pom.xml | 97 +++++++++
.../streams/graph/GraphHttpPersistWriter.java | 205 ++++++++++++++++++
.../streams/graph/GraphPersistWriter.java | 216 -------------------
.../apache/streams/graph/GraphVertexReader.java | 4 +-
.../apache/streams/graph/HttpGraphHelper.java | 36 ++++
.../apache/streams/graph/QueryGraphHelper.java | 45 ++++
.../streams/graph/neo4j/BinaryGraphHelper.java | 109 ++++++++++
.../graph/neo4j/CypherQueryGraphHelper.java | 183 ++++++++++++++++
.../neo4j/Neo4jBinaryGraphPersistWriter.java | 200 +++++++++++++++++
.../graph/neo4j/Neo4jBinaryGraphUtil.java | 95 ++++++++
.../graph/neo4j/Neo4jHttpGraphHelper.java | 67 ++++++
.../streams/graph/GraphBinaryConfiguration.json | 28 +++
.../graph/GraphEdgeWriterConfiguration.json | 33 ---
.../streams/graph/GraphHttpConfiguration.json | 22 ++
.../streams/graph/GraphReaderConfiguration.json | 2 +-
.../graph/GraphVertexWriterConfiguration.json | 33 ---
.../streams/graph/GraphWriterConfiguration.json | 21 --
.../graph/test/Neo4jHttpPersistWriterIT.java | 102 +++++++++
.../test/TestNeo4jBinaryPersistWriter.java | 162 ++++++++++++++
.../graph/test/TestNeo4jVertexReader.java | 4 +-
21 files changed, 1385 insertions(+), 310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/51bac075/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index e2fa479,a67e0e0..bf10595
--- a/pom.xml
+++ b/pom.xml
@@@ -115,18 -139,23 +122,38 @@@
</repository>
</repositories>
++<<<<<<< HEAD
+ <distributionManagement>
+ <repository>
+ <id>s3.release</id>
+ <name>AWS S3 Release Repository</name>
+ <url>s3://releases.peoplepattern.com</url>
+ </repository>
+ <snapshotRepository>
+ <id>s3.snapshot</id>
+ <name>AWS S3 Snapshot Repository</name>
+ <url>s3://snapshots.peoplepattern.com</url>
+ </snapshotRepository>
+</distributionManagement>
++=======
+ <distributionManagement>
+ <repository>
+ <id>streams.releases</id>
+ <name>Streams Releases</name>
+ <url>${release.repository.url}</url>
+ </repository>
+ <!-- Snapshots (not-releases) are published to this repository -->
+ <snapshotRepository>
+ <id>streams.snapshots</id>
+ <name>Streams Snapshots</name>
+ <url>${snapshot.repository.url}</url>
+ </snapshotRepository>
+ <site>
+ <id>site.streams.project</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-project</url>
+ </site>
+ </distributionManagement>
++>>>>>>> STREAMS-313
<properties>