tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [3/3] tinkerpop git commit: Merge branch 'tp32'
Date Tue, 19 Sep 2017 15:50:06 GMT
Merge branch 'tp32'

Conflicts:
	gremlin-server/src/test/scripts/test-server-start.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/28e23286
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/28e23286
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/28e23286

Branch: refs/heads/master
Commit: 28e23286740cde935da7b5ba2989cc7d1f8f646c
Parents: 0f6a32c 97aef32
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Tue Sep 19 11:49:52 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Tue Sep 19 11:49:52 2017 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/jsr223/CoreImports.java      |  3 +++
 gremlin-dotnet/test/pom.xml                        |  4 ++++
 gremlin-python/pom.xml                             |  4 ++++
 gremlin-server/src/test/scripts/README.asciidoc    | 17 +++++++++++++++++
 .../src/test/scripts/test-server-start.groovy      |  6 +++---
 5 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-python/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-server/src/test/scripts/test-server-start.groovy
----------------------------------------------------------------------
diff --cc gremlin-server/src/test/scripts/test-server-start.groovy
index 76bd8ff,8ea08a9..c187752
--- a/gremlin-server/src/test/scripts/test-server-start.groovy
+++ b/gremlin-server/src/test/scripts/test-server-start.groovy
@@@ -19,15 -19,14 +19,15 @@@
  
  import org.apache.tinkerpop.gremlin.server.GremlinServer
  import org.apache.tinkerpop.gremlin.server.Settings
- import org.apache.tinkerpop.gremlin.server.Settings.SerializerSettings                 
        
 -import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator
++import org.apache.tinkerpop.gremlin.server.Settings.SerializerSettings
  
  if (Boolean.parseBoolean(skipTests)) return
  
  log.info("Starting Gremlin Server instances for native testing of ${executionName}")
- def settings = Settings.read("${gremlinServerDir}/conf/gremlin-server-modern-py.yaml")
+ def settings = Settings.read("${settingsFile}")
  settings.graphs.graph = gremlinServerDir + "/conf/tinkergraph-empty.properties"
 -settings.scriptEngines["gremlin-groovy"].scripts = [gremlinServerDir + "/scripts/generate-modern.groovy"]
 +settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files
= [gremlinServerDir + "/scripts/generate-modern.groovy"]
 +settings.serializers << new SerializerSettings("org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0",
[:])
  settings.port = 45940
  
  def server = new GremlinServer(settings)
@@@ -36,22 -35,12 +36,22 @@@ server.start().join(
  project.setContextValue("gremlin.server", server)
  log.info("Gremlin Server with no authentication started on port 45940")
  
 +def securePropsFile = new File("${projectBaseDir}/target/tinkergraph-credentials.properties")
 +if (!securePropsFile.exists()) {
 +    securePropsFile.createNewFile()
 +    securePropsFile << "gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph\n"
 +    securePropsFile << "gremlin.tinkergraph.vertexIdManager=LONG\n"
 +    securePropsFile << "gremlin.tinkergraph.graphLocation=${gremlinServerDir}/data/credentials.kryo\n"
 +    securePropsFile << "gremlin.tinkergraph.graphFormat=gryo"
 +}
 +
- def settingsSecure = Settings.read("${gremlinServerDir}/conf/gremlin-server-modern.yaml")
+ def settingsSecure = Settings.read("${settingsFile}")
  settingsSecure.graphs.graph = gremlinServerDir + "/conf/tinkergraph-empty.properties"
 -settingsSecure.scriptEngines["gremlin-groovy"].scripts = [gremlinServerDir + "/scripts/generate-modern.groovy"]
 +settingsSecure.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files
= [gremlinServerDir + "/scripts/generate-modern.groovy"]
 +settingsSecure.serializers << new SerializerSettings("org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0",
[:])
  settingsSecure.port = 45941
 -settingsSecure.authentication.className = SimpleAuthenticator.class.name
 -settingsSecure.authentication.config = [credentialsDb: gremlinServerDir + "/conf/tinkergraph-credentials.properties",
credentialsDbLocation: gremlinServerDir + "/data/credentials.kryo"]
 +settingsSecure.authentication.authenticator = "org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator"
 +settingsSecure.authentication.config = [credentialsDb: projectBaseDir + "/target/tinkergraph-credentials.properties"]
  
  def serverSecure = new GremlinServer(settingsSecure)
  serverSecure.start().join()


Mime
View raw message