You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/07/09 14:23:42 UTC
[tinkerpop] branch master updated (06c5a90 -> c982841)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 06c5a90 Merge branch 'tp34'
new 582b20b Bumped to latest kerby for kerberos testing CTR
new 4862624 Merge branch 'tp33' into tp34
new c982841 Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gremlin-server/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/server/KdcFixture.java | 2 +-
.../apache/tinkerpop/gremlin/server/backend.conf | 19 -------------------
.../gremlin/server/gremlin-console-jaas.conf | 4 ++--
.../org/apache/tinkerpop/gremlin/server/kdc.conf | 21 ---------------------
5 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644 gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf
delete mode 100644 gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c98284133858df026bf32f98d44df1217e7ff0e5
Merge: 06c5a90 4862624
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 9 10:23:28 2019 -0400
Merge branch 'tp34'
gremlin-server/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/server/KdcFixture.java | 2 +-
.../apache/tinkerpop/gremlin/server/backend.conf | 19 -------------------
.../gremlin/server/gremlin-console-jaas.conf | 4 ++--
.../org/apache/tinkerpop/gremlin/server/kdc.conf | 21 ---------------------
5 files changed, 4 insertions(+), 44 deletions(-)
[tinkerpop] 01/03: Bumped to latest kerby for kerberos testing CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 582b20b6869136c32bee8ad9bdf95bef71c89247
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 9 10:22:22 2019 -0400
Bumped to latest kerby for kerberos testing CTR
---
gremlin-server/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/server/KdcFixture.java | 2 +-
.../apache/tinkerpop/gremlin/server/backend.conf | 19 -------------------
.../gremlin/server/gremlin-console-jaas.conf | 4 ++--
.../org/apache/tinkerpop/gremlin/server/kdc.conf | 21 ---------------------
5 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0218a68..4ab6a15 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -103,7 +103,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java
index 29eaf8d..0234e24 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/KdcFixture.java
@@ -93,7 +93,7 @@ public class KdcFixture {
private File createTestDir() {
final String basedir = System.getProperty("basedir");
final File targetdir = new File(basedir, "target");
- final File testDir = new File(targetdir, "tmp");
+ final File testDir = new File(targetdir, "kdc");
testDir.mkdirs();
return testDir;
}
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf
deleted file mode 100644
index db1e075..0000000
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/backend.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-kdc_identity_backend = org.apache.kerby.kerberos.kerb.identity.backend.MemoryIdentityBackend
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf
index b467ab7..ec852b6 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf
@@ -21,7 +21,7 @@ GremlinConsole {
com.sun.security.auth.module.Krb5LoginModule required
doNotPrompt=true
useTicketCache=true
- ticketCache="target/tmp/test-tkt.cc";
+ ticketCache="target/kdc/test-tkt.cc";
};
@@ -37,5 +37,5 @@ GremlinConsole2 {
com.sun.security.auth.module.Krb5LoginModule required
doNotPrompt=true
useTicketCache=true
- ticketCache="target/tmp/test-tkt2.cc";
+ ticketCache="target/kdc/test-tkt2.cc";
};
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf
deleted file mode 100644
index 313cda7..0000000
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/kdc.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-[kdcdefaults]
- kdc_tcp_port = 34455
- kdc_realm = EXAMPLE.COM
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 4862624715df1e2b62e7482b4875170c74b60ef1
Merge: b2967ed 582b20b
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Jul 9 10:23:05 2019 -0400
Merge branch 'tp33' into tp34
gremlin-server/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/server/KdcFixture.java | 2 +-
.../apache/tinkerpop/gremlin/server/backend.conf | 19 -------------------
.../gremlin/server/gremlin-console-jaas.conf | 4 ++--
.../org/apache/tinkerpop/gremlin/server/kdc.conf | 21 ---------------------
5 files changed, 4 insertions(+), 44 deletions(-)