Remove commented, old Hector configuration from Spring context config.

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

Branch: refs/heads/USERGRID-1047
Commit: d1c1d01fc9ecbfa33493b7c2a8c4c8c155132971
Parents: 8ddc7d9
Author: Michael Russo <michaelaru...@gmail.com>
Authored: Thu Jan 14 13:31:03 2016 -0800
Committer: Michael Russo <michaelaru...@gmail.com>
Committed: Thu Jan 14 13:31:03 2016 -0800

----------------------------------------------------------------------
 .../main/resources/usergrid-core-context.xml    | 22 --------------------
 1 file changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/d1c1d01f/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --git a/stack/core/src/main/resources/usergrid-core-context.xml 
b/stack/core/src/main/resources/usergrid-core-context.xml
index d413816..fb668fa 100644
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@ -72,33 +72,11 @@
 
     <!-- <bean name="lockManager" 
class="org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl" /> -->
 
-       <!--  hector based locks -->
-       <!-- Note that if this is deployed in a production cluster, the RF on 
the keyspace MUST
-            be updated to use an odd number for it's replication Factor. Even 
numbers can potentially
-            case the locks to fail, via "split brain" when read at QUORUM on 
lock verification-->
-
-    <!-- not using hector anymore
-       <bean name="lockManager" 
class="org.apache.usergrid.locking.cassandra.HectorLockManagerImpl">
-               <property name="cluster" ref="cassandraCluster"/>
-               <property name="keyspaceName" 
value="${cassandra.lock.keyspace}"/>
-        <property name="consistencyLevelPolicy" 
ref="hlockConsistencyLevelPolicy" />
-       </bean>
-
-    <bean name="hlockConsistencyLevelPolicy" 
class="me.prettyprint.cassandra.model.ConfigurableConsistencyLevel">
-        <property name="defaultReadConsistencyLevel" 
value="${cassandra.lock.readcl}"/>
-        <property name="defaultWriteConsistencyLevel" 
value="${cassandra.lock.writecl}"/>
-    </bean>
-    -->
 
     <bean id="injector"
                class="org.apache.usergrid.corepersistence.GuiceFactory">
     </bean>
 
-    <!--  <bean id="injector"
-                       
class="org.apache.usergrid.corepersistence.GuiceFactory">
-                       <constructor-arg ref="cassandraHostConfigurator" />
-            <constructor-arg ref="properties" />
-        </bean>-->
 
        <bean id="cassandraService"
                
class="org.apache.usergrid.persistence.cassandra.CassandraService" 
init-method="init" destroy-method="destroy">

Reply via email to