From abb8366eb4be934035634b3ca6ca12f3d1da89f4 Mon Sep 17 00:00:00 2001 From: Crossing-Tech Date: Fri, 4 Jan 2013 10:48:38 +0100 Subject: [PATCH] rkuhn comments applied: no more extension --- .../src/main/scala/akka/osgi/OsgiActorSystemFactory.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala index 9069e5d06d..620e4bfc5a 100644 --- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala +++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala @@ -44,10 +44,8 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader def actorSystemConfig(context: BundleContext): Config = { val bundleSymbolicName = context.getBundle.getSymbolicName val bundleId = context.getBundle.getBundleId - val acceptedFileExtension = List("conf", "properties", "json") - val acceptedFileName = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka") - val configurationFiles = acceptedFileName.flatMap(x => acceptedFileExtension.map(y => s"etc/$x.$y")) - val applicationConfiguration = configurationFiles.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y)))) + val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x => s"etc/$x") + val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y)))) applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader))) }