usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [08/50] [abbrv] incubator-usergrid git commit: Removed older keyspaces mentions and then added in the two new ones
Date Wed, 27 May 2015 19:34:57 GMT
Removed older keyspaces mentions and then added in the two new ones


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b1a75f06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b1a75f06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b1a75f06

Branch: refs/heads/two-dot-o
Commit: b1a75f065e05c68a1e03cd9f9a15cb8833e6e34b
Parents: 25d0077
Author: GERey <greyes@apigee.com>
Authored: Thu Apr 16 15:57:45 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Thu Apr 16 15:59:09 2015 -0700

----------------------------------------------------------------------
 .../persistence/cassandra/CassandraService.java        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b1a75f06/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
index 854c0ff..cd81912 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
@@ -94,9 +94,12 @@ import static org.apache.usergrid.utils.MapUtils.filter;
 
 public class CassandraService {
 
-    public static String SYSTEM_KEYSPACE = "Usergrid";
+//    public static String SYSTEM_KEYSPACE = "Usergrid";
+//
+//    public static String STATIC_APPLICATION_KEYSPACE = "Usergrid_Applications";
 
-    public static String STATIC_APPLICATION_KEYSPACE = "Usergrid_Applications";
+    public static String SYSTEM_KEYSPACE = System.getProperty( "cassandra.system.keyspace"
);
+    public static String STATIC_APPLICATION_KEYSPACE = System.getProperty( "cassandra.application.keyspace"
);
 
     public static final boolean USE_VIRTUAL_KEYSPACES = true;
 
@@ -162,6 +165,12 @@ public class CassandraService {
                     .setDefaultReadConsistencyLevel( HConsistencyLevel.ONE );
         }
         accessMap = new HashMap<String, String>( 2 );
+        if ( SYSTEM_KEYSPACE == null ) {
+            SYSTEM_KEYSPACE = "Usergrid";
+        }
+        if ( STATIC_APPLICATION_KEYSPACE == null) {
+            STATIC_APPLICATION_KEYSPACE = "Usergrid_Applications";
+        }
         accessMap.put( "username", properties.getProperty( "cassandra.username" ) );
         accessMap.put( "password", properties.getProperty( "cassandra.password" ) );
         systemKeyspace =


Mime
View raw message