From c7000ce5ca3e171b1720688a15166b6d85bc5a88 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Fri, 28 May 2010 22:05:17 +0200 Subject: [PATCH 1/2] ClassLoader issue --- .../src/main/scala/actor/BootableActorLoaderService.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala index de0d174fc7..0f49a0b6cb 100644 --- a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala +++ b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala @@ -49,9 +49,9 @@ trait BootableActorLoaderService extends Bootable with Logging { val parentClassLoader = classOf[Seq[_]].getClassLoader URLClassLoader.newInstance( allJars.toArray.asInstanceOf[Array[URL]], - ClassLoader.getSystemClassLoader) + Thread.currentThread.getContextClassLoader) //parentClassLoader) - } else getClass.getClassLoader) + } else Thread.currentThread.getContextClassLoader) } abstract override def onLoad = { From 8230e2c5460074eb37bb2cb6641d33653b02bb18 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Fri, 28 May 2010 22:05:44 +0200 Subject: [PATCH 2/2] Fixing sbt run (exclude slf4j 1.5.11) --- project/build/AkkaProject.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 1f7bd27a94..ec55352ed6 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -106,6 +106,9 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { " dist/akka-jta_%s-%s.jar".format(buildScalaVersion, version) ) + //Exclude slf4j1.5.11 from the classpath, it's conflicting... + override def runClasspath = super.runClasspath --- (super.runClasspath ** "slf4j*1.5.11.jar") + // ------------------------------------------------------------ // publishing override def managedStyle = ManagedStyle.Maven