diff --git a/akka-active-object-test/pom.xml b/akka-active-object-test/pom.xml index 2b4183724e..dffacd8db0 100644 --- a/akka-active-object-test/pom.xml +++ b/akka-active-object-test/pom.xml @@ -42,11 +42,11 @@ akka-core_2.8.0.RC3 0.9.1 - - org.multiverse - multiverse-alpha - - + + org.multiverse + multiverse-alpha + + junit diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java index edc26f6695..e61b8ac07d 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java @@ -17,19 +17,19 @@ import junit.framework.TestCase; */ public class MiscActiveObjectTest extends TestCase { - - /** - * Verifies that both preRestart and postRestart methods are invoked when - * an actor is restarted - */ - public void testFailingPostRestartInvocation() throws InterruptedException { - SimpleJavaPojo pojo = newInstance(SimpleJavaPojo.class,500); - SimpleJavaPojo supervisor = newInstance(SimpleJavaPojo.class,500); - link(supervisor,pojo,new OneForOneStrategy(3, 2000),new Class[]{Throwable.class}); - pojo.throwException(); - Thread.sleep(500); - Assert.assertTrue(pojo.pre); - Assert.assertTrue(pojo.post); - } - + + /** + * Verifies that both preRestart and postRestart methods are invoked when + * an actor is restarted + */ + public void testFailingPostRestartInvocation() throws InterruptedException { + SimpleJavaPojo pojo = newInstance(SimpleJavaPojo.class,500); + SimpleJavaPojo supervisor = newInstance(SimpleJavaPojo.class,500); + link(supervisor,pojo,new OneForOneStrategy(3, 2000),new Class[]{Throwable.class}); + pojo.throwException(); + Thread.sleep(500); + Assert.assertTrue(pojo.pre); + Assert.assertTrue(pojo.post); + } + } diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java index c783fd2902..3921fde81f 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java @@ -4,33 +4,33 @@ import se.scalablesolutions.akka.actor.annotation.prerestart; import se.scalablesolutions.akka.actor.annotation.postrestart; public class SimpleJavaPojo { - - public boolean pre = false; - public boolean post = false; - - private String name; - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - @prerestart - public void pre() { - System.out.println("** pre()"); - pre = true; - } - - @postrestart - public void post() { - System.out.println("** post()"); - post = true; - } + + public boolean pre = false; + public boolean post = false; + + private String name; + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + @prerestart + public void pre() { + System.out.println("** pre()"); + pre = true; + } + + @postrestart + public void post() { + System.out.println("** post()"); + post = true; + } - public void throwException() { - throw new RuntimeException(); - } + public void throwException() { + throw new RuntimeException(); + } } diff --git a/akka-core/src/main/scala/actor/ActiveObject.scala b/akka-core/src/main/scala/actor/ActiveObject.scala index ea9172c92f..118c1063ae 100644 --- a/akka-core/src/main/scala/actor/ActiveObject.scala +++ b/akka-core/src/main/scala/actor/ActiveObject.scala @@ -741,33 +741,33 @@ private[akka] class Dispatcher(transactionalRequired: Boolean, var callbacks: Op override def preRestart(reason: Throwable) { try { - // Since preRestart is called we know that this dispatcher - // is about to be restarted. Put the instance in a thread - // local so the new dispatcher can be initialized with the contents of the - // old. - //FIXME - This should be considered as a workaround. - crashedActorTl.set(this) + // Since preRestart is called we know that this dispatcher + // is about to be restarted. Put the instance in a thread + // local so the new dispatcher can be initialized with the contents of the + // old. + //FIXME - This should be considered as a workaround. + crashedActorTl.set(this) if (preRestart.isDefined) preRestart.get.invoke(target.get, ZERO_ITEM_OBJECT_ARRAY: _*) } catch { case e: InvocationTargetException => throw e.getCause } } override def postRestart(reason: Throwable) { try { - + if (postRestart.isDefined) { - postRestart.get.invoke(target.get, ZERO_ITEM_OBJECT_ARRAY: _*) - } + postRestart.get.invoke(target.get, ZERO_ITEM_OBJECT_ARRAY: _*) + } } catch { case e: InvocationTargetException => throw e.getCause } } override def init = { - // Get the crashed dispatcher from thread local and intitialize this actor with the - // contents of the old dispatcher - val oldActor = crashedActorTl.get(); - if(oldActor != null) { - initialize(oldActor.targetClass,oldActor.target.get,oldActor.context) - crashedActorTl.set(null) - } + // Get the crashed dispatcher from thread local and intitialize this actor with the + // contents of the old dispatcher + val oldActor = crashedActorTl.get(); + if(oldActor != null) { + initialize(oldActor.targetClass,oldActor.target.get,oldActor.context) + crashedActorTl.set(null) + } } override def initTransactionalState = { diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala index 47057b24a7..c244af86bd 100644 --- a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala +++ b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala @@ -26,7 +26,7 @@ class AkkaDeployClassLoader(urls : List[URL], parent : ClassLoader) extends URLC } def listClassesInPackage(jar : URL, pkg : String) = { - val f = new File(jar.getFile) + val f = new File(jar.getFile) val jf = new JarFile(f) try { val es = jf.entries diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java index 4cb6abd301..ee549cef23 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojo.java @@ -4,33 +4,33 @@ import se.scalablesolutions.akka.actor.annotation.prerestart; import se.scalablesolutions.akka.actor.annotation.postrestart; public class SimpleJavaPojo { - - public boolean pre = false; - public boolean post = false; - - private String name; - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - @prerestart - public void pre() { - System.out.println("** pre()"); - pre = true; - } - - @postrestart - public void post() { - System.out.println("** post()"); - post = true; - } + + public boolean pre = false; + public boolean post = false; + + private String name; + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + @prerestart + public void pre() { + System.out.println("** pre()"); + pre = true; + } + + @postrestart + public void post() { + System.out.println("** post()"); + post = true; + } - public void throwException() { - throw new RuntimeException(); - } + public void throwException() { + throw new RuntimeException(); + } } diff --git a/akka-core/src/test/scala/Bench.scala b/akka-core/src/test/scala/Bench.scala index 454fc2b7e9..211c6787a8 100644 --- a/akka-core/src/test/scala/Bench.scala +++ b/akka-core/src/test/scala/Bench.scala @@ -36,12 +36,12 @@ object Chameneos { colour = complement(otherColour) meetings = meetings +1 from ! Change(colour) - mall ! Meet(self, colour) + mall ! Meet(self, colour) case Change(newColour) => colour = newColour meetings = meetings +1 - mall ! Meet(self, colour) + mall ! Meet(self, colour) case Exit => colour = FADED diff --git a/akka-core/src/test/scala/RoutingSpec.scala b/akka-core/src/test/scala/RoutingSpec.scala index 52c37215ec..a9d488a5fe 100644 --- a/akka-core/src/test/scala/RoutingSpec.scala +++ b/akka-core/src/test/scala/RoutingSpec.scala @@ -122,9 +122,9 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers } @Test def testIsDefinedAt = { - import se.scalablesolutions.akka.actor.ActorRef - - val (testMsg1,testMsg2,testMsg3,testMsg4) = ("test1","test2","test3","test4") + import se.scalablesolutions.akka.actor.ActorRef + + val (testMsg1,testMsg2,testMsg3,testMsg4) = ("test1","test2","test3","test4") val t1 = actorOf( new Actor() { def receive = { diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/Security.scala index bbc6242bfc..f550177965 100644 --- a/akka-http/src/main/scala/Security.scala +++ b/akka-http/src/main/scala/Security.scala @@ -560,6 +560,6 @@ object LiftUtils { (pair(0), unquote(pair(1))) }) val map: Map[String, String] = Map.empty - (map /: list)((m, next) => m + (next)) + (map /: list)((m, next) => m + (next)) } } diff --git a/akka-spring/akka-spring-test-java/pom.xml b/akka-spring/akka-spring-test-java/pom.xml index ff36202071..2d03b53032 100644 --- a/akka-spring/akka-spring-test-java/pom.xml +++ b/akka-spring/akka-spring-test-java/pom.xml @@ -17,11 +17,11 @@ - - akka - Akka Repo - http://www.scalablesolutions.se/akka/repository/ - + + akka + Akka Repo + http://www.scalablesolutions.se/akka/repository/ + project.embedded.module Project Embedded Repository diff --git a/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala b/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala index b4bc8795fc..f8473f295b 100644 --- a/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala +++ b/akka-spring/src/main/scala/ActiveObjectFactoryBean.scala @@ -57,44 +57,44 @@ class ActiveObjectFactoryBean extends AbstractFactoryBean[AnyRef] with Logging { * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance() */ def createInstance: AnyRef = { - if(scope.equals(VAL_SCOPE_SINGLETON)) { - setSingleton(true) - } else { - setSingleton(false) - } + if(scope.equals(VAL_SCOPE_SINGLETON)) { + setSingleton(true) + } else { + setSingleton(false) + } var argumentList = "" if (isRemote) argumentList += "r" if (hasInterface) argumentList += "i" if (hasDispatcher) argumentList += "d" setProperties( - create(argumentList)) + create(argumentList)) } /** * This method manages element by injecting either - * values () and bean references () + * values () and bean references () */ private def setProperties(ref:AnyRef) : AnyRef = { - log.debug("Processing properties and dependencies for target class %s",target) - val beanWrapper = new BeanWrapperImpl(ref); - for(entry <- property.entryList) { - val propertyDescriptor = BeanUtils.getPropertyDescriptor(ref.getClass,entry.name) - val method = propertyDescriptor.getWriteMethod(); - - if(StringUtils.hasText(entry.ref)) { - log.debug("Setting property %s with bean ref %s using method %s", - entry.name,entry.ref,method.getName) - method.invoke(ref,getBeanFactory().getBean(entry.ref)) - } else if(StringUtils.hasText(entry.value)) { - log.debug("Setting property %s with value %s using method %s", - entry.name,entry.value,method.getName) - beanWrapper.setPropertyValue(entry.name,entry.value) - } else { - throw new AkkaBeansException("Either property@ref or property@value must be set on property element") - } - } - ref + log.debug("Processing properties and dependencies for target class %s",target) + val beanWrapper = new BeanWrapperImpl(ref); + for(entry <- property.entryList) { + val propertyDescriptor = BeanUtils.getPropertyDescriptor(ref.getClass,entry.name) + val method = propertyDescriptor.getWriteMethod(); + + if(StringUtils.hasText(entry.ref)) { + log.debug("Setting property %s with bean ref %s using method %s", + entry.name,entry.ref,method.getName) + method.invoke(ref,getBeanFactory().getBean(entry.ref)) + } else if(StringUtils.hasText(entry.value)) { + log.debug("Setting property %s with value %s using method %s", + entry.name,entry.value,method.getName) + beanWrapper.setPropertyValue(entry.name,entry.value) + } else { + throw new AkkaBeansException("Either property@ref or property@value must be set on property element") + } + } + ref } // TODO: check if this works in 2.8 (type inferred to Nothing instead of AnyRef here) diff --git a/akka-spring/src/main/scala/ActiveObjectParser.scala b/akka-spring/src/main/scala/ActiveObjectParser.scala index d3b25791c6..a1ddc0ae89 100644 --- a/akka-spring/src/main/scala/ActiveObjectParser.scala +++ b/akka-spring/src/main/scala/ActiveObjectParser.scala @@ -46,11 +46,11 @@ trait ActiveObjectParser extends BeanParser with DispatcherParser { } for(element <- propertyEntries) { - val entry = new PropertyEntry() - entry.name = element.getAttribute("name"); + val entry = new PropertyEntry() + entry.name = element.getAttribute("name"); entry.value = element.getAttribute("value") - entry.ref = element.getAttribute("ref") - objectProperties.propertyEntries.add(entry) + entry.ref = element.getAttribute("ref") + objectProperties.propertyEntries.add(entry) } try { diff --git a/akka-spring/src/main/scala/AkkaBeansException.scala b/akka-spring/src/main/scala/AkkaBeansException.scala index 58928cf69e..cdaaaf5bec 100644 --- a/akka-spring/src/main/scala/AkkaBeansException.scala +++ b/akka-spring/src/main/scala/AkkaBeansException.scala @@ -7,8 +7,8 @@ import org.springframework.beans.BeansException @author Johan Rask */ class AkkaBeansException(errorMsg:String,t:Throwable) extends BeansException(errorMsg,t) { - - def this(errorMsg:String) = { - this(errorMsg,null) - } + + def this(errorMsg:String) = { + this(errorMsg,null) + } } \ No newline at end of file diff --git a/akka-spring/src/main/scala/PropertyEntries.scala b/akka-spring/src/main/scala/PropertyEntries.scala index 935baac4f4..60f1dc3b77 100644 --- a/akka-spring/src/main/scala/PropertyEntries.scala +++ b/akka-spring/src/main/scala/PropertyEntries.scala @@ -13,6 +13,6 @@ class PropertyEntries { var entryList:ListBuffer[PropertyEntry] = ListBuffer[PropertyEntry]() def add(entry:PropertyEntry) = { - entryList.append(entry) + entryList.append(entry) } } \ No newline at end of file diff --git a/akka-spring/src/main/scala/PropertyEntry.scala b/akka-spring/src/main/scala/PropertyEntry.scala index a01241635b..eb19479f79 100644 --- a/akka-spring/src/main/scala/PropertyEntry.scala +++ b/akka-spring/src/main/scala/PropertyEntry.scala @@ -6,12 +6,12 @@ package se.scalablesolutions.akka.spring */ class PropertyEntry { - var name:String = _ - var value:String = null - var ref:String = null - - - override def toString(): String = { - format("name = %s,value = %s, ref = %s", name,value,ref) - } + var name:String = _ + var value:String = null + var ref:String = null + + + override def toString(): String = { + format("name = %s,value = %s, ref = %s", name,value,ref) + } } \ No newline at end of file diff --git a/akka-spring/src/test/resources/appContext.xml b/akka-spring/src/test/resources/appContext.xml index 3dc4d63794..5648fa2fdf 100644 --- a/akka-spring/src/test/resources/appContext.xml +++ b/akka-spring/src/test/resources/appContext.xml @@ -12,10 +12,10 @@ transactional="true" timeout="1000" scope="prototype"> - + - - - - + + + + \ No newline at end of file diff --git a/akka-spring/src/test/resources/failing-appContext.xml b/akka-spring/src/test/resources/failing-appContext.xml index 3ea9f552e0..1acab0e830 100644 --- a/akka-spring/src/test/resources/failing-appContext.xml +++ b/akka-spring/src/test/resources/failing-appContext.xml @@ -12,10 +12,10 @@ transactional="true" timeout="1000" scope="prototype"> - + - - - - + + + + \ No newline at end of file diff --git a/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala b/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala index 23972e8f2e..d8bb29ed3e 100644 --- a/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala +++ b/akka-spring/src/test/scala/ActiveObjectBeanDefinitionParserTest.scala @@ -26,9 +26,9 @@ class ActiveObjectBeanDefinitionParserTest extends Spec with ShouldMatchers { target="foo.bar.MyPojo" timeout="1000" transactional="true" - scope="prototype"> - - + scope="prototype"> + + val props = parser.parseActiveObject(dom(xml).getDocumentElement); assert(props != null) diff --git a/akka-spring/src/test/scala/ActiveObjectFactoryBeanTest.scala b/akka-spring/src/test/scala/ActiveObjectFactoryBeanTest.scala index 3543cba530..bfa6a27443 100644 --- a/akka-spring/src/test/scala/ActiveObjectFactoryBeanTest.scala +++ b/akka-spring/src/test/scala/ActiveObjectFactoryBeanTest.scala @@ -66,7 +66,7 @@ class ActiveObjectFactoryBeanTest extends Spec with ShouldMatchers { } it("should create an application context and inject a string dependency") { - var ctx = new ClassPathXmlApplicationContext("appContext.xml"); + var ctx = new ClassPathXmlApplicationContext("appContext.xml"); val target:ResourceEditor = ctx.getBean("bean").asInstanceOf[ResourceEditor] assert(target.getSource === "someString") }