Permalink
Browse files

updating to scala 2.8.0, activemq 5.3.2

  • Loading branch information...
1 parent 2accda6 commit 1f073b4ab6de9503e05d7b3172118d9ca20003a6 @ticktock committed Aug 16, 2010
Showing with 12 additions and 12 deletions.
  1. +5 −5 pom.xml
  2. +7 −7 src/main/scala/org/apache/activemq/store/cassandra/CassandraClient.scala
View
10 pom.xml
@@ -9,7 +9,7 @@
<version>1.2-SNAPSHOT</version>
<properties>
- <activemq.version>5.3.1</activemq.version>
+ <activemq.version>5.3.2</activemq.version>
<cassandra.version>0.6.1</cassandra.version>
<thrift.version>917130</thrift.version>
<antlr.version>3.1.3</antlr.version>
@@ -19,7 +19,7 @@
<hadoop.version>0.20.1</hadoop.version>
<google.collections.version>1.0</google.collections.version>
<highscale.version>1.0</highscale.version>
- <scala.version>2.7.7</scala.version>
+ <scala.version>2.8.0</scala.version>
<ivy.version>2.1.0</ivy.version>
<jackson.version>1.4.0</jackson.version>
<jline.version>0.9.94</jline.version>
@@ -237,13 +237,13 @@
<dependency>
<groupId>com.shorrockin</groupId>
<artifactId>cascal</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.clapper</groupId>
- <artifactId>grizzled-slf4j_2.7.7</artifactId>
- <version>0.2.2</version>
+ <artifactId>grizzled-slf4j_2.8.0</artifactId>
+ <version>0.2.4</version>
</dependency>
@@ -2,18 +2,18 @@ package org.apache.activemq.store.cassandra
import com.shorrockin.cascal.session._
import com.shorrockin.cascal.utils.Conversions._
-import collection.jcl.Conversions._
+import collection.JavaConversions._
import reflect.BeanProperty
import CassandraClient._
import org.apache.cassandra.utils.BloomFilter
import grizzled.slf4j.Logger
import org.apache.activemq.store.cassandra.{DestinationMaxIds => Max}
import java.util.concurrent.atomic.{AtomicLong, AtomicInteger}
import org.apache.activemq.command.{SubscriptionInfo, MessageId, ActiveMQDestination}
-import collection.jcl.{ArrayList, HashSet, Set}
import org.apache.cassandra.thrift.{NotFoundException}
import java.lang.String
import collection.mutable.{HashMap, ListBuffer}
+import java.util.{HashSet, ArrayList}
class CassandraClient() {
@BeanProperty var cassandraHost: String = _
@@ -313,10 +313,10 @@ class CassandraClient() {
val supercolumn = KEYSPACE \\ SUBSCRIPTIONS_FAMILY \ destination \ supercolumnName
val subdest = supercolumn \ (SUBSCRIPTIONS_SUB_DESTINATION_SUBCOLUMN, subscriptionInfo.getSubscribedDestination)
val ackcol = supercolumn \ (SUBSCRIPTIONS_LAST_ACK_SUBCOLUMN, ack)
- var list = Insert(subdest) :: Insert(ackcol)
+ var list:List[Operation] = Insert(subdest) :: Insert(ackcol)
if (subscriptionInfo.getSelector != null) {
val selcolopt = supercolumn \ (SUBSCRIPTIONS_SELECTOR_SUBCOLUMN, subscriptionInfo.getSelector)
- list.add(Insert(selcolopt))
+ list = Insert(selcolopt) :: list
}
session.batch(list)
}
@@ -435,7 +435,7 @@ class CassandraClient() {
withSession {
session =>
- val keyspace = convertMap(session.client.describe_keyspace(KEYSPACE))
+ val keyspace = asMap(session.client.describe_keyspace(KEYSPACE))
val stdCols: List[String] = MESSAGES_FAMILY :: STORE_IDS_IN_USE_FAMILY :: DESTINATIONS_FAMILY :: BROKER_FAMILY :: MESSAGE_TO_STORE_ID_FAMILY :: Nil
val superCols: List[String] = SUBSCRIPTIONS_FAMILY :: Nil
@@ -453,7 +453,7 @@ class CassandraClient() {
stdCols.foreach {
family =>
(keyspace.get(family): @unchecked) match {
- case Some(map) => convertMap(map).get(DESCRIBE_CF_TYPE) match {
+ case Some(map) => asMap(map).get(DESCRIBE_CF_TYPE) match {
case Some(colType) => colType match {
case DESCRIBE_CF_TYPE_STANDARD => None
case _ => throw new RuntimeException("Type of the ColumnFamily was not expected to be:%s".format(colType))
@@ -466,7 +466,7 @@ class CassandraClient() {
superCols.foreach {
family =>
(keyspace.get(family): @unchecked) match {
- case Some(map) => convertMap(map).get(DESCRIBE_CF_TYPE) match {
+ case Some(map) => asMap(map).get(DESCRIBE_CF_TYPE) match {
case Some(colType) => colType match {
case DESCRIBE_CF_TYPE_SUPER => None
case _ => throw new RuntimeException("Type of the ColumnFamily was not expected to be:%s".format(colType))

0 comments on commit 1f073b4

Please sign in to comment.