From 6cadb0d03526ea93d42d1a86b82887606b90b7fb Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sat, 13 Mar 2010 14:06:52 +0100 Subject: [PATCH 1/4] Fixing container detection for SBT console mode --- akka-comet/src/main/scala/BootableCometActorService.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/akka-comet/src/main/scala/BootableCometActorService.scala b/akka-comet/src/main/scala/BootableCometActorService.scala index f6895aeee9..496cc33aed 100644 --- a/akka-comet/src/main/scala/BootableCometActorService.scala +++ b/akka-comet/src/main/scala/BootableCometActorService.scala @@ -43,8 +43,7 @@ trait BootableCometActorService extends Bootable with Logging { adapter.setHandleStaticResources(true) adapter.setServletInstance(new AkkaServlet) adapter.setContextPath(uri.getPath) - //Using autodetection for now - //adapter.addInitParameter("cometSupport", "org.atmosphere.container.GrizzlyCometSupport") + adapter.addInitParameter("cometSupport", "org.atmosphere.container.GrizzlyCometSupport") if (HOME.isDefined) adapter.setRootFolder(HOME.get + "/deploy/root") log.info("REST service root path [%s] and context path [%s]", adapter.getRootFolder, adapter.getContextPath) From 81b35c1f7d122f1e0a7026db52476649a2d470f9 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sat, 13 Mar 2010 14:07:37 +0100 Subject: [PATCH 2/4] Return 408 is authentication times out --- akka-security/src/main/scala/Security.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/akka-security/src/main/scala/Security.scala b/akka-security/src/main/scala/Security.scala index 1f0d8a94aa..8a144f4282 100644 --- a/akka-security/src/main/scala/Security.scala +++ b/akka-security/src/main/scala/Security.scala @@ -87,10 +87,11 @@ class AkkaSecurityFilterFactory extends ResourceFilterFactory with Logging { override def filter(request: ContainerRequest): ContainerRequest = rolesAllowed match { case Some(roles) => { - (authenticator !! (Authenticate(request, roles), 10000)).get.asInstanceOf[AnyRef] match { - case OK => request - case r if r.isInstanceOf[Response] => + (authenticator.!![AnyRef](Authenticate(request, roles), 10000)) match { + case Some(OK) => request + case Some(r) if r.isInstanceOf[Response] => throw new WebApplicationException(r.asInstanceOf[Response]) + case None => throw new WebApplicationException(408) case x => { log.error("Authenticator replied with unexpected result [%s]", x); throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR) From d1a9e4a2861c6ebbf258250a44a38eb7147c961e Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sat, 13 Mar 2010 14:08:02 +0100 Subject: [PATCH 3/4] Fixed deprecation warning --- akka-core/src/test/scala/ThreadBasedDispatcherTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-core/src/test/scala/ThreadBasedDispatcherTest.scala b/akka-core/src/test/scala/ThreadBasedDispatcherTest.scala index b9663352c7..c848c56991 100644 --- a/akka-core/src/test/scala/ThreadBasedDispatcherTest.scala +++ b/akka-core/src/test/scala/ThreadBasedDispatcherTest.scala @@ -78,7 +78,7 @@ class ThreadBasedDispatcherTest extends JUnitSuite { }) dispatcher.start for (i <- 0 until 100) { - dispatcher.dispatch(new MessageInvocation(key1, new Integer(i), None, None, None)) + dispatcher.dispatch(new MessageInvocation(key1, i, None, None, None)) } assert(handleLatch.await(5, TimeUnit.SECONDS)) assert(!threadingIssueDetected.get) From 7e517ede0d6748c510b8c0bbd642ab0b2cd772d1 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sat, 13 Mar 2010 14:08:30 +0100 Subject: [PATCH 4/4] Revert to Atmosphere 0.5.4 because of issue in 0.6-SNAPSHOT --- project/build/AkkaProject.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 2df647a5bd..c3c7211d97 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -42,7 +42,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { // ------------------------------------------------------------ // project versions val JERSEY_VERSION = "1.1.5" - val ATMO_VERSION = "0.6-SNAPSHOT" + val ATMO_VERSION = "0.5.4" val CASSANDRA_VERSION = "0.5.0" // ------------------------------------------------------------