From b43e186ba667f55c8c4c931072222c1826df9ce1 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 1 Jun 2011 21:10:34 +0000 Subject: TUSCANY-3522: Apply rest-api-1.2.patch from Eranda for the NoSQL GSoC project git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1130304 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/nosqldatastore/cassandra/CassandraSession.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java') diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java index f9cd7a62c5..97bd42caf1 100644 --- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java +++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java @@ -3,23 +3,22 @@ package org.apache.tuscany.nosqldatastore.cassandra; import me.prettyprint.cassandra.service.CassandraHostConfigurator; import me.prettyprint.cassandra.service.ThriftCluster; import me.prettyprint.cassandra.service.ThriftKsDef; +import me.prettyprint.hector.api.Cluster; import me.prettyprint.hector.api.ddl.KeyspaceDefinition; +import me.prettyprint.hector.api.factory.HFactory; import org.apache.tuscany.nosqldatastore.Database; import org.apache.tuscany.nosqldatastore.Session; public class CassandraSession implements Session { private CassandraHostConfigurator cassandraHostConfigurator; - private ThriftCluster cluster; + private Cluster cluster; public CassandraSession(String clusterName) { - cassandraHostConfigurator = new CassandraHostConfigurator("localhost:9160"); - cluster = new ThriftCluster(clusterName, cassandraHostConfigurator); + cluster = HFactory.getOrCreateCluster("Test Cluster", "127.0.0.1:9160"); } public Database createDatabase(String keyspaceName) { - KeyspaceDefinition ksDef = new ThriftKsDef(keyspaceName, "org.apache.cassandra.locator.SimpleStrategy", 1, null); - cluster.addKeyspace(ksDef); Database database = new CassandraDatabase(keyspaceName, cluster); return database; } -- cgit v1.2.3