Merge branch 'S2GRAPH-248' of https://github.com/daewon/incubator-s2graph into daewon-S2GRAPH-248
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/53ff5cd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/53ff5cd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/53ff5cd8 Branch: refs/heads/master Commit: 53ff5cd89d6df64f44656c662768d8598806e268 Parents: f77a152 8c3f4a2 Author: DO YUNG YOON <steams...@apache.org> Authored: Thu Jan 24 21:14:49 2019 +0900 Committer: DO YUNG YOON <steams...@apache.org> Committed: Thu Jan 24 21:14:49 2019 +0900 ---------------------------------------------------------------------- README.md | 193 ++-- bin/s2graph-daemon.sh | 9 +- bin/s2graph.sh | 2 +- bin/start-s2graph.sh | 2 +- bin/stop-s2graph.sh | 2 +- build.sbt | 20 +- dev_support/README.md | 40 +- doc/source/_static/css/s2graph_style.css | 1 + doc/source/api/index.rst | 13 + doc/source/api/management/index.rst | 444 +++++++++ doc/source/api/mutate/index.rst | 10 + doc/source/api/mutate/mutate_edge.rst | 328 +++++++ doc/source/api/mutate/mutate_vertex.rst | 139 +++ doc/source/api/query/index.rst | 15 + doc/source/api/query/query_edge.rst | 954 +++++++++++++++++++ doc/source/api/query/query_options.rst | 27 + doc/source/api/query/query_vertex.rst | 17 + doc/source/conf.py | 2 + doc/source/getting_started/your_first_graph.rst | 14 +- doc/source/index.rst | 7 +- s2core/src/main/resources/reference.conf | 10 +- .../org/apache/s2graph/core/Management.scala | 44 + .../org/apache/s2graph/core/schema/Label.scala | 38 +- s2graphql/build.sbt | 12 +- s2graphql/src/main/resources/application.conf | 11 +- s2graphql/src/main/resources/assets/.gitignore | 1 - .../src/main/resources/assets/graphiql.html | 151 +++ .../apache/s2graph/graphql/GraphQLServer.scala | 81 +- .../org/apache/s2graph/graphql/HttpServer.scala | 154 --- s2graphql/src/test/resources/application.conf | 11 +- .../org/apache/s2graph/graphql/TestGraph.scala | 2 +- s2http/README.md | 47 + s2http/build.sbt | 41 + s2http/src/main/resources/application.conf | 27 + s2http/src/main/resources/log4j.properties | 26 + .../apache/s2graph/http/PlayJsonSupport.scala | 74 ++ .../apache/s2graph/http/S2GraphAdminRoute.scala | 281 ++++++ .../s2graph/http/S2GraphMutateRoute.scala | 97 ++ .../apache/s2graph/http/S2GraphQLRoute.scala | 105 ++ .../s2graph/http/S2GraphTraversalRoute.scala | 62 ++ .../s2graph/http/SangriaGraphQLSupport.scala | 38 + .../scala/org/apache/s2graph/http/Server.scala | 86 ++ .../apache/s2graph/http/AdminRouteSpec.scala | 94 ++ .../apache/s2graph/http/MutateRouteSpec.scala | 63 ++ .../rest/play/controllers/AdminController.scala | 32 +- 45 files changed, 3393 insertions(+), 434 deletions(-) ----------------------------------------------------------------------
