Update mapping to conform actual design

GluuFederation · Jun 18, 2018 · b96d1e2 · b96d1e2
1 parent aaf7953
commit b96d1e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.../src/main/java/org/gluu/persist/couchbase/operation/impl/CouchbaseConnectionProvider.java b/.../src/main/java/org/gluu/persist/couchbase/operation/impl/CouchbaseConnectionProvider.java
@@ -86,8 +86,8 @@ protected void init() {
         openWithWaitImpl();
         LOG.info("Opended: '{}' buket with base names: '{}'", bucketToBaseNameMapping.keySet(), baseNameToBucketMapping.keySet());
 
-        if (props.containsKey("encryption.method")) {
-            this.passwordEncryptionMethod = PasswordEncryptionMethod.getMethod(props.getProperty("encryption.method"));
+        if (props.containsKey("password.encryption.method")) {
+            this.passwordEncryptionMethod = PasswordEncryptionMethod.getMethod(props.getProperty("password.encryption.method"));
         } else {
             this.passwordEncryptionMethod = PasswordEncryptionMethod.HASH_METHOD_SHA256;
         }

diff --git a/oxCouchbaseSample/src/main/java/org/gluu/couchbase/CouchbaseSampleEntryManager.java b/oxCouchbaseSample/src/main/java/org/gluu/couchbase/CouchbaseSampleEntryManager.java
@@ -20,13 +20,15 @@ private Properties getSampleConnectionProperties() {
         connectionProperties.put("servers", "localhost");
         connectionProperties.put("userName", "admin");
         connectionProperties.put("userPassword", "secret");
-        connectionProperties.put("buckets", "gluu, travel-sample");
-        connectionProperties.put("bucket.default", "gluu");
+        connectionProperties.put("buckets", "gluu, gluu_site, gluu_user, gluu_session, gluu_statistic");
 
-        connectionProperties.put("bucket.gluu.mapping", "gluu");
-        connectionProperties.put("bucket.travel-sample.mapping", "travel-sample");
+        connectionProperties.put("bucket.default", "gluu");
+        connectionProperties.put("bucket.gluu_user.mapping", "people, groups");
+        connectionProperties.put("bucket.gluu_session.mapping", "sessions");
+        connectionProperties.put("bucket.gluu_statistic.mapping", "statistic");
+        connectionProperties.put("bucket.gluu_site.mapping", "site");
 
-        connectionProperties.put("encryption.method", "CRYPT-SHA-256");
+        connectionProperties.put("password.encryption.method", "CRYPT-SHA-256");
 
         return connectionProperties;
     }