You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2018/07/11 05:42:35 UTC
[1/2] directory-kerby git commit: Change the default plugin type.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk eb4743f30 -> 2f03407a5
Change the default plugin type.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/cd34b4bd
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/cd34b4bd
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/cd34b4bd
Branch: refs/heads/trunk
Commit: cd34b4bdec107a7bdb502db1f361a1b55e86a98a
Parents: b40f88a
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Jul 11 13:37:39 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Jul 11 13:37:39 2018 +0800
----------------------------------------------------------------------
has-project/has-server/pom.xml | 2 ++
.../src/test/java/org/apache/kerby/has/server/TestConfApi.java | 2 +-
has-project/has-server/src/test/resources/conf/has-server.conf | 2 +-
kerby-dist/has-dist/conf/has-server.conf | 2 +-
.../java/org/apache/kerby/kerberos/tool/init/cmd/SetPluginCmd.java | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cd34b4bd/has-project/has-server/pom.xml
----------------------------------------------------------------------
diff --git a/has-project/has-server/pom.xml b/has-project/has-server/pom.xml
index a336d2d..4de648a 100644
--- a/has-project/has-server/pom.xml
+++ b/has-project/has-server/pom.xml
@@ -93,11 +93,13 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.19</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>RELEASE</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cd34b4bd/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestConfApi.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestConfApi.java b/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestConfApi.java
index ee204a7..4bcc19b 100644
--- a/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestConfApi.java
+++ b/has-project/has-server/src/test/java/org/apache/kerby/has/server/TestConfApi.java
@@ -37,7 +37,7 @@ public class TestConfApi extends TestRestApiBase {
public void testSetPlugin() {
WebResource webResource = getWebResource("conf/setplugin");
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
- params.add("plugin", "RAM");
+ params.add("plugin", "MySQL");
String response = webResource.queryParams(params).put(String.class);
assertEquals("HAS plugin set successfully.", response);
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cd34b4bd/has-project/has-server/src/test/resources/conf/has-server.conf
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/test/resources/conf/has-server.conf b/has-project/has-server/src/test/resources/conf/has-server.conf
index dcea4ad..565bb1f 100644
--- a/has-project/has-server/src/test/resources/conf/has-server.conf
+++ b/has-project/has-server/src/test/resources/conf/has-server.conf
@@ -22,4 +22,4 @@
enable_conf = true
[PLUGIN]
- auth_type = RAM
+ auth_type = MySQL
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cd34b4bd/kerby-dist/has-dist/conf/has-server.conf
----------------------------------------------------------------------
diff --git a/kerby-dist/has-dist/conf/has-server.conf b/kerby-dist/has-dist/conf/has-server.conf
index 70e643b..7b1ea13 100644
--- a/kerby-dist/has-dist/conf/has-server.conf
+++ b/kerby-dist/has-dist/conf/has-server.conf
@@ -23,4 +23,4 @@
enable_conf = true
[PLUGIN]
- auth_type = RAM
+ auth_type = MySQL
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/cd34b4bd/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/SetPluginCmd.java
----------------------------------------------------------------------
diff --git a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/SetPluginCmd.java b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/SetPluginCmd.java
index 9974c43..bf4f13e 100644
--- a/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/SetPluginCmd.java
+++ b/kerby-tool/has-tool/src/main/java/org/apache/kerby/kerberos/tool/init/cmd/SetPluginCmd.java
@@ -29,7 +29,7 @@ public class SetPluginCmd extends InitCmd {
public static final String USAGE = "Usage: set_plugin <plugin>\n"
+ "\tExample:\n"
- + "\t\tset_plugin RAM\n";
+ + "\t\tset_plugin MySQL\n";
public SetPluginCmd(HasInitClient client) {
super(client);
[2/2] directory-kerby git commit: Merge remote-tracking branch
'asf/trunk' into trunk
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/2f03407a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/2f03407a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/2f03407a
Branch: refs/heads/trunk
Commit: 2f03407a50b8b9a9558abab9d3a81a21d99217b7
Parents: cd34b4b eb4743f
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Jul 11 13:39:31 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Jul 11 13:39:31 2018 +0800
----------------------------------------------------------------------
.../test/java/org/apache/kerby/has/server/TestRestApiBase.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------