From cbb0747dac8568dd9edc3dbc0f28c984d0445e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Fri, 21 May 2010 20:08:49 +0200 Subject: [PATCH] Removed trailing whitespace --- .../javax.ws.rs.ext.MessageBodyWriter_FIXME | 2 +- .../src/main/scala/ActorComponentProvider.scala | 4 ++-- akka-http/src/main/scala/AkkaBroadcaster.scala | 6 +++--- .../main/scala/AkkaClusterBroadcastFilter.scala | 12 ++++++------ akka-http/src/main/scala/AkkaCometServlet.scala | 4 ++-- akka-http/src/main/scala/AkkaLoader.scala | 4 ++-- akka-http/src/main/scala/AkkaServlet.scala | 2 +- akka-http/src/main/scala/Initializer.scala | 14 +++++++------- akka-http/src/main/scala/Security.scala | 4 ++-- akka-http/src/test/scala/AllTest.scala | 2 +- akka-http/src/test/scala/SecuritySpec.scala | 6 +++--- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME b/akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME index f88c0c8601..51bc8cccd2 100644 --- a/akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME +++ b/akka-http/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter_FIXME @@ -1 +1 @@ -se.scalablesolutions.akka.rest.ListWriter \ No newline at end of file +se.scalablesolutions.akka.rest.ListWriter diff --git a/akka-http/src/main/scala/ActorComponentProvider.scala b/akka-http/src/main/scala/ActorComponentProvider.scala index ed51482604..52512b6929 100644 --- a/akka-http/src/main/scala/ActorComponentProvider.scala +++ b/akka-http/src/main/scala/ActorComponentProvider.scala @@ -13,7 +13,7 @@ import se.scalablesolutions.akka.actor.Actor class ActorComponentProvider(val clazz: Class[_], val configurators: List[Configurator]) extends IoCFullyManagedComponentProvider with Logging { - + override def getScope = ComponentScope.Singleton override def getInstance: AnyRef = { @@ -26,4 +26,4 @@ class ActorComponentProvider(val clazz: Class[_], val configurators: List[Config "No Actor or Active Object for class [" + clazz + "] could be found.\nMake sure you have defined and configured the class as an Active Object or Actor in a supervisor hierarchy.") else instances.head.asInstanceOf[AnyRef] } -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/AkkaBroadcaster.scala b/akka-http/src/main/scala/AkkaBroadcaster.scala index fd0d851c6a..57d8ccd549 100644 --- a/akka-http/src/main/scala/AkkaBroadcaster.scala +++ b/akka-http/src/main/scala/AkkaBroadcaster.scala @@ -9,15 +9,15 @@ import se.scalablesolutions.akka.actor.Actor._ class AkkaBroadcaster extends org.atmosphere.jersey.JerseyBroadcaster { name = classOf[AkkaBroadcaster].getName - + val caster = actor { case f : Function0[_] => f() } override def destroy { super.destroy caster.stop } - + protected override def broadcast(r : AtmosphereResource[_,_], e : AtmosphereResourceEvent[_,_]) = { caster ! (() => super.broadcast(r,e)) } -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala index 210d6e48c4..af5e83e71c 100644 --- a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala +++ b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2010 Scalable Solutions AB */ - + package se.scalablesolutions.akka.comet import se.scalablesolutions.akka.actor.Actor @@ -24,8 +24,8 @@ class AkkaClusterBroadcastFilter extends Actor with ClusterBroadcastFilter[AnyRe @BeanProperty var clusterName = "" @BeanProperty var broadcaster : Broadcaster = null - /** - * Stops the actor + /** + * Stops the actor */ def destroy: Unit = self.stop @@ -36,14 +36,14 @@ class AkkaClusterBroadcastFilter extends Actor with ClusterBroadcastFilter[AnyRe */ def filter(o : AnyRef) = new BroadcastFilter.BroadcastAction(o match { case ClusterCometBroadcast(_,m) => m //Do not re-broadcast, just unbox and pass along - + case m : AnyRef => { //Relay message to the cluster and pass along Cluster.relayMessage(classOf[AkkaClusterBroadcastFilter],ClusterCometBroadcast(clusterName,m)) m } }) - def receive = { + def receive = { //Only handle messages intended for this particular instance case b @ ClusterCometBroadcast(c, _) if (c == clusterName) && (broadcaster ne null) => broadcaster broadcast b case _ => @@ -51,4 +51,4 @@ class AkkaClusterBroadcastFilter extends Actor with ClusterBroadcastFilter[AnyRe //Since this class is instantiated by Atmosphere, we need to make sure it's started self.start -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/AkkaCometServlet.scala b/akka-http/src/main/scala/AkkaCometServlet.scala index cae6dd3000..0ce6f8312a 100644 --- a/akka-http/src/main/scala/AkkaCometServlet.scala +++ b/akka-http/src/main/scala/AkkaCometServlet.scala @@ -60,7 +60,7 @@ class AkkaServlet extends org.atmosphere.cpr.AtmosphereServlet with Logging { */ override def createCometSupportResolver() : CometSupportResolver = { import scala.collection.JavaConversions._ - + new DefaultCometSupportResolver(config) { type CS = CometSupport[_ <: AtmosphereResource[_,_]] override def resolveMultipleNativeSupportConflict(available : JList[Class[_ <: CS]]) : CS = { @@ -70,7 +70,7 @@ class AkkaServlet extends org.atmosphere.cpr.AtmosphereServlet with Logging { case _ => super.resolveMultipleNativeSupportConflict(available) } } - + override def resolve(useNativeIfPossible : Boolean, useBlockingAsDefault : Boolean) : CS = { val predef = config.getInitParameter("cometSupport") if (testClassExists(predef)) newCometSupport(predef) diff --git a/akka-http/src/main/scala/AkkaLoader.scala b/akka-http/src/main/scala/AkkaLoader.scala index 3d9af36dfd..b9633e71ec 100644 --- a/akka-http/src/main/scala/AkkaLoader.scala +++ b/akka-http/src/main/scala/AkkaLoader.scala @@ -14,7 +14,7 @@ class AkkaLoader extends Logging { @volatile private var hasBooted = false @volatile private var _bundles: Option[Bootable] = None - + def bundles = _bundles; /* @@ -58,4 +58,4 @@ class AkkaLoader extends Logging { log.info(" Running version %s", Config.VERSION) log.info("==============================") } -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/AkkaServlet.scala b/akka-http/src/main/scala/AkkaServlet.scala index 32b10b354b..aecdaa9671 100644 --- a/akka-http/src/main/scala/AkkaServlet.scala +++ b/akka-http/src/main/scala/AkkaServlet.scala @@ -30,4 +30,4 @@ class AkkaServlet extends ServletContainer { webApplication.initiate(resourceConfig, new ActorComponentProviderFactory(configurators)) } -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/Initializer.scala b/akka-http/src/main/scala/Initializer.scala index 809d5ec743..d47357c710 100644 --- a/akka-http/src/main/scala/Initializer.scala +++ b/akka-http/src/main/scala/Initializer.scala @@ -11,7 +11,7 @@ import se.scalablesolutions.akka.config.Config import se.scalablesolutions.akka.util.{Logging, Bootable} import javax.servlet.{ServletContextListener, ServletContextEvent} - + /** * This class can be added to web.xml mappings as a listener to start and shutdown Akka. * @@ -22,13 +22,13 @@ import javax.servlet.{ServletContextListener, ServletContextEvent} * * ... * - */ + */ class Initializer extends ServletContextListener { lazy val loader = new AkkaLoader - - def contextDestroyed(e: ServletContextEvent): Unit = + + def contextDestroyed(e: ServletContextEvent): Unit = loader.shutdown - - def contextInitialized(e: ServletContextEvent): Unit = + + def contextInitialized(e: ServletContextEvent): Unit = loader.boot(true, new BootableActorLoaderService with BootableRemoteActorService with CamelService) - } \ No newline at end of file + } diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/Security.scala index a03899f474..72d79db3d9 100644 --- a/akka-http/src/main/scala/Security.scala +++ b/akka-http/src/main/scala/Security.scala @@ -108,7 +108,7 @@ class AkkaSecurityFilterFactory extends ResourceFilterFactory with Logging { if (auth == "N/A") throw new IllegalStateException("The config option 'akka.rest.authenticator' is not defined in 'akka.conf'") auth } - + /** * Currently we always take the first, since there usually should be at most one authentication actor, but a round-robin * strategy could be implemented in the future @@ -410,7 +410,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w /** * keytab location with credentials for the service principal */ - lazy val keyTabLocation = { + lazy val keyTabLocation = { val p = Config.config.getString("akka.rest.kerberos.keyTabLocation", "N/A") if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.keyTabLocation' is not defined in 'akka.conf'") p diff --git a/akka-http/src/test/scala/AllTest.scala b/akka-http/src/test/scala/AllTest.scala index 71708b63b3..8bb7eb7923 100644 --- a/akka-http/src/test/scala/AllTest.scala +++ b/akka-http/src/test/scala/AllTest.scala @@ -12,4 +12,4 @@ object AllTest extends TestCase { } def main(args: Array[String]) = junit.textui.TestRunner.run(suite) -} \ No newline at end of file +} diff --git a/akka-http/src/test/scala/SecuritySpec.scala b/akka-http/src/test/scala/SecuritySpec.scala index 79a3d95805..2ee7596a25 100644 --- a/akka-http/src/test/scala/SecuritySpec.scala +++ b/akka-http/src/test/scala/SecuritySpec.scala @@ -32,7 +32,7 @@ object BasicAuthenticatorSpec { class BasicAuthenticatorSpec extends junit.framework.TestCase with Suite with MockitoSugar with MustMatchers { import BasicAuthenticatorSpec._ - + val authenticator = actorOf[BasicAuthenticator] authenticator.start @@ -57,13 +57,13 @@ class BasicAuthenticatorSpec extends junit.framework.TestCase val result: AnyRef = (authenticator !! (Authenticate(req, List("chef")), 10000)).get result must be(OK) - // the authenticator must have set a security context + // the authenticator must have set a security context verify(req).setSecurityContext(any[SecurityContext]) } @Test def testUnauthorized = { val req = mock[ContainerRequest] - + // fake a basic auth header -> this will authenticate the user when(req.getHeaderValue("Authorization")).thenReturn("Basic " + new String(Base64.encode("foo:bar"))) when(req.isUserInRole("chef")).thenReturn(false) // this will deny access