You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/03/14 06:41:43 UTC

directory-kerberos git commit: Using gson library for json backend

Repository: directory-kerberos
Updated Branches:
  refs/heads/master a713921a3 -> f5af336bb


Using gson library for json backend


Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/f5af336b
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/f5af336b
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/f5af336b

Branch: refs/heads/master
Commit: f5af336bb2e34d04e56aa3eec3836f46455a543e
Parents: a713921
Author: Drankye <dr...@gmail.com>
Authored: Sat Mar 14 13:41:28 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sat Mar 14 13:41:28 2015 +0800

----------------------------------------------------------------------
 kdc-backend/json-backend/pom.xml                         | 11 ++++++++---
 .../kdc/identitybackend/JsonIdentityBackend.java         |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f5af336b/kdc-backend/json-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kdc-backend/json-backend/pom.xml b/kdc-backend/json-backend/pom.xml
index d233d9c..db2145f 100644
--- a/kdc-backend/json-backend/pom.xml
+++ b/kdc-backend/json-backend/pom.xml
@@ -26,6 +26,10 @@
   <name>Json identity backend</name>
   <description>Json identity backend</description>
 
+  <properties>
+    <json.version>2.3.1</json.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.kerby</groupId>
@@ -38,9 +42,10 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${json.version}</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/f5af336b/kdc-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kdc-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java b/kdc-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
index 6a2aab1..7a724fb 100644
--- a/kdc-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
+++ b/kdc-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
@@ -28,12 +28,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 
 /**
- * An Json file based backend implementation.
+ * A Json file based backend implementation.
  *
  */
 public class JsonIdentityBackend extends InMemoryIdentityBackend {
-    public static final String JSON_IDENTITY_BACKEND_FILE =
-            "kdc.identitybackend.json.file";
+    public static final String JSON_IDENTITY_BACKEND_FILE = "backend.json.file";
     private Config config;
     private File jsonKdbFile;