diff --git a/akka-amqp/src/main/scala/AMQP.scala b/akka-amqp/src/main/scala/AMQP.scala index a03a2cb056..1a431aafc2 100644 --- a/akka-amqp/src/main/scala/AMQP.scala +++ b/akka-amqp/src/main/scala/AMQP.scala @@ -13,7 +13,6 @@ import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.util.{HashCode, Logging} import scala.collection.mutable.HashMap -import scala.collection.JavaConversions._ import java.util.concurrent.ConcurrentHashMap import java.util.{Timer, TimerTask} @@ -78,6 +77,8 @@ object AMQP { * @author Jonas Bonér */ class AMQPSupervisor extends Actor { + import scala.collection.JavaConversions._ + private val connections = new ConcurrentHashMap[FaultTolerantConnectionActor, FaultTolerantConnectionActor] faultHandler = Some(OneForOneStrategy(5, 5000)) @@ -137,7 +138,7 @@ object AMQP { } override def shutdown = { - connections.values.asScala.foreach(_ ! Stop) + asMap(connections).values.foreach(_ ! Stop) exit } @@ -360,8 +361,13 @@ object AMQP { extends FaultTolerantConnectionActor { consumer: Consumer => + import scala.collection.JavaConversions._ + faultHandler = Some(OneForOneStrategy(5, 5000)) trapExit = List(classOf[Throwable]) + + //FIXME use better strategy to convert scala.immutable.Map to java.util.Map + private val jConfigMap = configurationArguments.foldLeft(new java.util.HashMap[String,Object]){ (m,kv) => { m.put(kv._1,kv._2); m } } private val listeners = new HashMap[MessageConsumerListener, MessageConsumerListener] @@ -410,7 +416,7 @@ object AMQP { protected def setupChannel = { connection = connectionFactory.newConnection(hostname, port) channel = connection.createChannel - channel.exchangeDeclare(exchangeName.toString, exchangeType.toString, passive, durable, autoDelete, configurationArguments) + channel.exchangeDeclare(exchangeName.toString, exchangeType.toString, passive, durable, autoDelete, jConfigMap) listeners.elements.toList.map(_._2).foreach(registerListener) if (shutdownListener.isDefined) connection.addShutdownListener(shutdownListener.get) } @@ -425,7 +431,7 @@ object AMQP { listener.queueName, passive, durable, listener.exclusive, listener.autoDelete, - configurationArguments) + jConfigMap) } log.debug("Binding new queue for MessageConsumerListener [%s]", listener.queueName) diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index 4b1d114d45..b553cb7a79 100644 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -41,11 +41,11 @@ ${project.groupId} ${project.version} - + akka-comet ${project.groupId} diff --git a/akka-patterns/src/test/scala/ActorPatternsTest.scala b/akka-patterns/src/test/scala/ActorPatternsTest.scala index 11f2664640..800feda277 100644 --- a/akka-patterns/src/test/scala/ActorPatternsTest.scala +++ b/akka-patterns/src/test/scala/ActorPatternsTest.scala @@ -1,7 +1,7 @@ package se.scalablesolutions.akka.actor -import config.ScalaConfig._ +import se.scalablesolutions.akka.config.ScalaConfig._ import org.scalatest.Suite import patterns.Patterns diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala index 2db1f7a2ba..0bc4d8cc87 100644 --- a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala +++ b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala @@ -90,7 +90,7 @@ trait CassandraSession extends Closeable with Flushable { def ++|(key: String, batch: Map[String, List[ColumnOrSuperColumn]], consistencyLevel: Int): Unit = { val jmap = new java.util.HashMap[String, JList[ColumnOrSuperColumn]] - for (entry <- batch; (key, value) = entry) jmap.put(key, value) + for (entry <- batch; (key, value) = entry) jmap.put(key, new java.util.ArrayList(value)) client.batch_insert(keyspace, key, jmap, consistencyLevel) } diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala index dc55e0eca1..9051a2fdda 100644 --- a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala +++ b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala @@ -95,10 +95,21 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V] removedEntries.clear } - def -=(key: K) = remove(key) + def -=(key: K) = { + remove(key) + this + } - def +=(key: K, value: V) = put(key, value) + override def +=(kv : (K,V)) = { + put(kv._1,kv._2) + this + } + def +=(key: K, value: V) = { + put(key, value) + this + } + override def put(key: K, value: V): Option[V] = { register newAndUpdatedEntries.put(key, value) @@ -109,9 +120,10 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V] newAndUpdatedEntries.update(key, value) } - def remove(key: K) = { + override def remove(key: K) = { register removedEntries.add(key) + newAndUpdatedEntries.get(key) } def slice(start: Option[K], count: Int): List[Tuple2[K, V]] = @@ -144,6 +156,8 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V] } catch { case e: Exception => None } } + def iterator = elements + override def elements: Iterator[Tuple2[K, V]] = { new Iterator[Tuple2[K, V]] { private val originalList: List[Tuple2[K, V]] = try { @@ -386,14 +400,20 @@ trait PersistentQueue[A] extends scala.collection.mutable.Queue[A] override def isEmpty: Boolean = size == 0 - override def +=(elem: A): Unit = enqueue(elem) - override def ++=(elems: Iterator[A]): Unit = enqueue(elems.toList: _*) - override def ++=(elems: Iterable[A]): Unit = this ++= elems.elements + override def +=(elem: A) = { + enqueue(elem) + this + } + override def ++=(elems: Iterator[A]) = { + enqueue(elems.toList: _*) + this + } + def ++=(elems: Iterable[A]): Unit = this ++= elems.elements override def dequeueFirst(p: A => Boolean): Option[A] = throw new UnsupportedOperationException("dequeueFirst not supported") - override def dequeueAll(p: A => Boolean): Seq[A] = + override def dequeueAll(p: A => Boolean): scala.collection.mutable.Seq[A] = throw new UnsupportedOperationException("dequeueAll not supported") private def register = { diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala index 0641b676e5..afc80f5196 100644 --- a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala +++ b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala @@ -9,6 +9,8 @@ import se.scalablesolutions.akka.Config.config import sjson.json.Serializer._ +import java.util.NoSuchElementException + import com.mongodb._ import java.util.{Map=>JMap, List=>JList, ArrayList=>JArrayList} @@ -123,7 +125,7 @@ private[akka] object MongoStorageBackend extends val m = nullSafeFindOne(name) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new NoSuchElementException(name + " not present") case Some(dbo) => dbo.get(VALUE).asInstanceOf[JMap[String, AnyRef]] } @@ -141,7 +143,7 @@ private[akka] object MongoStorageBackend extends val m = nullSafeFindOne(name) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new NoSuchElementException(name + " not present") case Some(dbo) => dbo.get(VALUE).asInstanceOf[JMap[String, AnyRef]] } @@ -179,7 +181,7 @@ private[akka] object MongoStorageBackend extends } } catch { case e => - throw new Predef.NoSuchElementException(e.getMessage) + throw new NoSuchElementException(e.getMessage) } } @@ -219,7 +221,7 @@ private[akka] object MongoStorageBackend extends val o = nullSafeFindOne(name) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new NoSuchElementException(name + " not present") case Some(dbo) => dbo.get(VALUE).asInstanceOf[JList[AnyRef]] @@ -228,7 +230,7 @@ private[akka] object MongoStorageBackend extends o.get(index).asInstanceOf[Array[Byte]]) } catch { case e => - throw new Predef.NoSuchElementException(e.getMessage) + throw new NoSuchElementException(e.getMessage) } } @@ -238,7 +240,7 @@ private[akka] object MongoStorageBackend extends val o = nullSafeFindOne(name) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new NoSuchElementException(name + " not present") case Some(dbo) => dbo.get(VALUE).asInstanceOf[JList[AnyRef]] @@ -252,7 +254,7 @@ private[akka] object MongoStorageBackend extends yield serializer.in[AnyRef](e.asInstanceOf[Array[Byte]]) } catch { case e => - throw new Predef.NoSuchElementException(e.getMessage) + throw new NoSuchElementException(e.getMessage) } } diff --git a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala index fae6d7f00d..711d73c848 100644 --- a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala +++ b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala @@ -6,6 +6,7 @@ import org.junit.{Test, Before} import org.junit.Assert._ import _root_.dispatch.json._ import _root_.dispatch.json.Js._ +import java.util.NoSuchElementException @scala.reflect.BeanInfo case class Foo(no: Int, name: String) class MongoStorageSpec extends TestCase { @@ -111,12 +112,12 @@ class MongoStorageSpec extends TestCase { try { MongoStorageBackend.getVectorStorageEntryFor("U-A1", 1) fail("should throw an exception") - } catch {case e: Predef.NoSuchElementException => {}} + } catch {case e: NoSuchElementException => {}} try { MongoStorageBackend.getVectorStorageRangeFor("U-A1", Some(2), None, 12) fail("should throw an exception") - } catch {case e: Predef.NoSuchElementException => {}} + } catch {case e: NoSuchElementException => {}} } @Test @@ -198,7 +199,7 @@ class MongoStorageSpec extends TestCase { try { MongoStorageBackend.getMapStorageFor("U-M2") fail("should throw an exception") - } catch {case e: Predef.NoSuchElementException => {}} + } catch {case e: NoSuchElementException => {}} changeSetM.clear } diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala index 00a44d0513..0a1a89fd14 100644 --- a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala +++ b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala @@ -107,7 +107,7 @@ private [akka] object RedisStorageBackend extends def removeMapStorageFor(name: String): Unit = { db.keys("%s:*".format(encode(name.getBytes))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(keys) => keys.foreach(db.delete(_)) } @@ -120,7 +120,7 @@ private [akka] object RedisStorageBackend extends def getMapStorageEntryFor(name: String, key: Array[Byte]): Option[Array[Byte]] = db.get(makeRedisKey(name, key)) match { case None => - throw new Predef.NoSuchElementException(new String(key) + " not present") + throw new java.util.NoSuchElementException(new String(key) + " not present") case Some(s) => Some(s.getBytes) } @@ -135,7 +135,7 @@ private [akka] object RedisStorageBackend extends def getMapStorageFor(name: String): List[(Array[Byte], Array[Byte])] = { db.keys("%s:*".format(new String(encode(name.getBytes)))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(keys) => keys.map(key => (makeKeyFromRedisKey(key)._2, db.get(key).get.getBytes)).toList } @@ -203,7 +203,7 @@ private [akka] object RedisStorageBackend extends def getVectorStorageEntryFor(name: String, index: Int): Array[Byte] = { db.listIndex(new String(encode(name.getBytes)), index) match { case None => - throw new Predef.NoSuchElementException(name + " does not have element at " + index) + throw new java.util.NoSuchElementException(name + " does not have element at " + index) case Some(e) => e.getBytes } } @@ -223,7 +223,7 @@ private [akka] object RedisStorageBackend extends else count db.listRange(new String(encode(name.getBytes)), s, s + cnt - 1) match { case None => - throw new Predef.NoSuchElementException(name + " does not have elements in the range specified") + throw new java.util.NoSuchElementException(name + " does not have elements in the range specified") case Some(l) => l map (_.getBytes) } @@ -232,7 +232,7 @@ private [akka] object RedisStorageBackend extends def getVectorStorageSizeFor(name: String): Int = { db.listLength(new String(encode(name.getBytes))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(l) => l } } @@ -244,7 +244,7 @@ private [akka] object RedisStorageBackend extends def getRefStorageFor(name: String): Option[Array[Byte]] = { db.get(new String(encode(name.getBytes))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(s) => Some(s.getBytes) } } @@ -258,7 +258,7 @@ private [akka] object RedisStorageBackend extends def dequeue(name: String): Option[Array[Byte]] = { db.popHead(new String(encode(name.getBytes))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(s) => Some(s.getBytes) } @@ -268,7 +268,7 @@ private [akka] object RedisStorageBackend extends def size(name: String): Int = { db.listLength(new String(encode(name.getBytes))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(l) => l } } @@ -279,14 +279,14 @@ private [akka] object RedisStorageBackend extends case 1 => db.listIndex(new String(encode(name.getBytes)), start) match { case None => - throw new Predef.NoSuchElementException("No element at " + start) + throw new java.util.NoSuchElementException("No element at " + start) case Some(s) => List(s.getBytes) } case n => db.listRange(new String(encode(name.getBytes)), start, start + count - 1) match { case None => - throw new Predef.NoSuchElementException( + throw new java.util.NoSuchElementException( "No element found between " + start + " and " + (start + count - 1)) case Some(es) => es.map(_.getBytes) @@ -312,7 +312,7 @@ private [akka] object RedisStorageBackend extends def zcard(name: String): Int = { db.zCard(new String(encode(name.getBytes))) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(l) => l } } @@ -320,7 +320,7 @@ private [akka] object RedisStorageBackend extends def zscore(name: String, item: Array[Byte]): String = { db.zScore(new String(encode(name.getBytes)), new String(item)) match { case None => - throw new Predef.NoSuchElementException(new String(item) + " not present") + throw new java.util.NoSuchElementException(new String(item) + " not present") case Some(s) => s } } @@ -328,7 +328,7 @@ private [akka] object RedisStorageBackend extends def zrange(name: String, start: Int, end: Int): List[Array[Byte]] = { db.zRange(new String(encode(name.getBytes)), start.toString, end.toString, SocketOperations.ASC, false) match { case None => - throw new Predef.NoSuchElementException(name + " not present") + throw new java.util.NoSuchElementException(name + " not present") case Some(s) => s.map(_.getBytes) } diff --git a/akka-persistence/pom.xml b/akka-persistence/pom.xml index e801cb3398..f529dd162d 100644 --- a/akka-persistence/pom.xml +++ b/akka-persistence/pom.xml @@ -15,7 +15,7 @@ akka-persistence-common - akka-persistence-redis + akka-persistence-mongo akka-persistence-cassandra diff --git a/akka-rest/src/main/scala/ActorComponentProvider.scala b/akka-rest/src/main/scala/ActorComponentProvider.scala index ed9fb225fb..5d9d49bef2 100644 --- a/akka-rest/src/main/scala/ActorComponentProvider.scala +++ b/akka-rest/src/main/scala/ActorComponentProvider.scala @@ -7,8 +7,8 @@ package se.scalablesolutions.akka.rest import com.sun.jersey.core.spi.component.ComponentScope import com.sun.jersey.core.spi.component.ioc.IoCFullyManagedComponentProvider -import config.Configurator -import util.Logging +import se.scalablesolutions.akka.config.Configurator +import se.scalablesolutions.akka.util.Logging class ActorComponentProvider(val clazz: Class[_], val configurators: List[Configurator]) extends IoCFullyManagedComponentProvider with Logging { diff --git a/akka-rest/src/main/scala/AkkaServlet.scala b/akka-rest/src/main/scala/AkkaServlet.scala index c79f4b17d1..c06d5a72b8 100644 --- a/akka-rest/src/main/scala/AkkaServlet.scala +++ b/akka-rest/src/main/scala/AkkaServlet.scala @@ -27,7 +27,7 @@ class AkkaServlet extends ServletContainer { resourceConfig.getClasses.addAll(configurators.flatMap(_.getComponentInterfaces)) resourceConfig.getProperties.put( "com.sun.jersey.spi.container.ResourceFilters", - Config.config.getList("akka.rest.filters").mkString(",")) + se.scalablesolutions.akka.Config.config.getList("akka.rest.filters").mkString(",")) webApplication.initiate(resourceConfig, new ActorComponentProviderFactory(configurators)) } diff --git a/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala index b6098cfb3c..0248a4a503 100644 --- a/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala @@ -5,6 +5,7 @@ import _root_.net.liftweb.http._ import _root_.net.liftweb.sitemap._ import _root_.net.liftweb.sitemap.Loc._ import _root_.net.liftweb.http.auth._ +import _root_.net.liftweb.common._ import Helpers._ import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor} @@ -23,7 +24,7 @@ class Boot { LiftRules.addToPackages("sample.lift") LiftRules.httpAuthProtectedResource.prepend { - case (ParsePath("liftcount" :: Nil, _, _, _)) => Full(AuthRole("admin")) + case (Req("liftcount" :: Nil, _, _)) => Full(AuthRole("admin")) } LiftRules.authentication = HttpBasicAuthentication("lift") { diff --git a/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala b/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala index f8f517e97a..a5aa1698e8 100644 --- a/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala +++ b/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala @@ -1,4 +1,4 @@ -import _root_.bootstrap.liftweb.Boot +/*import _root_.bootstrap.liftweb.Boot import _root_.scala.tools.nsc.MainGenericRunner object LiftConsole { @@ -13,3 +13,4 @@ object LiftConsole { exit(0) } } +*/ \ No newline at end of file diff --git a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala index 2d83607f2d..3e25c029de 100644 --- a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala +++ b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala @@ -86,7 +86,7 @@ class PubSub extends Actor { @Broadcast @Path("/topic/{topic}/{message}/") @Produces(Array("text/plain;charset=ISO-8859-1")) - @Cluster(Array(classOf[AkkaClusterBroadcastFilter])) { val name = "foo" } + //FIXME @Cluster(value = Array(classOf[AkkaClusterBroadcastFilter]),name = "foo") def say(@PathParam("topic") topic: Broadcaster, @PathParam("message") message: String): Broadcastable = new Broadcastable(message, topic) def receive = { case _ => } @@ -147,7 +147,7 @@ class Chat extends Actor { @POST @Broadcast(Array(classOf[XSSHtmlFilter], classOf[JsonpFilter])) - @Cluster(Array(classOf[AkkaClusterBroadcastFilter])) { val name = "bar" } + //FIXME @Cluster(value = Array(classOf[AkkaClusterBroadcastFilter]),name = "bar") @Consumes(Array("application/x-www-form-urlencoded")) @Produces(Array("text/html")) def publishMessage(form: MultivaluedMap[String, String]) = @@ -157,7 +157,7 @@ class Chat extends Actor { } -class JsonpFilter extends BroadcastFilter[String] with Logging { +class JsonpFilter extends BroadcastFilter with Logging { def filter(an: AnyRef) = { val m = an.toString var name = m diff --git a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala index 853d51e7ad..9383b5f3ee 100644 --- a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala +++ b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala @@ -7,7 +7,7 @@ package se.scalablesolutions.akka.security.samples import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor} import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.util.Logging -import se.scalablesolutions.akka.security.{DigestAuthenticationActor, UserInfo} +import se.scalablesolutions.akka.security._ import se.scalablesolutions.akka.state.TransactionalState class Boot { diff --git a/akka-samples/pom.xml b/akka-samples/pom.xml index ad94fc8aab..7738effe56 100644 --- a/akka-samples/pom.xml +++ b/akka-samples/pom.xml @@ -14,7 +14,7 @@ - akka-sample-chat + akka-sample-lift akka-sample-security akka-sample-rest-scala diff --git a/akka-security/pom.xml b/akka-security/pom.xml index a9c672822e..036eeecea0 100644 --- a/akka-security/pom.xml +++ b/akka-security/pom.xml @@ -27,17 +27,22 @@ com.sun.jersey jersey-server - 1.1.3-ea + ${jersey.version} javax.ws.rs jsr311-api 1.0 + + javax.mail + mail + 1.4.3-rc1 + net.liftweb lift-util - 1.1-M6 + ${lift.version} diff --git a/akka-security/src/test/scala/SecuritySpec.scala b/akka-security/src/test/scala/SecuritySpec.scala index 15e84381ea..7b669b407a 100644 --- a/akka-security/src/test/scala/SecuritySpec.scala +++ b/akka-security/src/test/scala/SecuritySpec.scala @@ -4,7 +4,7 @@ package se.scalablesolutions.akka.security -import config.ScalaConfig._ +import se.scalablesolutions.akka.config.ScalaConfig._ import org.scalatest.Suite import org.scalatest.junit.JUnitSuite