raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

=act #15395 update typesafe config API URL

Browse source
This commit is contained in:
xuwei-k 2014-06-12 17:26:26 +09:00 • committed by Konrad 'ktoso' Malawski
parent ac671c2991
commit 45ff77e4f9
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-actor/src/main/scala/akka/actor/ActorSystem.scala
View file

@ -61,14 +61,14 @@ object ActorSystem {
* then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader
* associated with the ActorSystem class. * associated with the ActorSystem class.
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def create(name: String, config: Config): ActorSystem = apply(name, config) def create(name: String, config: Config): ActorSystem = apply(name, config)
/** /**
* Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def create(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, config, classLoader) def create(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, config, classLoader)
@ -85,7 +85,7 @@ object ActorSystem {
* executor = "default-executor", including those that have not defined the executor setting and thereby fallback * executor = "default-executor", including those that have not defined the executor setting and thereby fallback
* to the default of "default-dispatcher.executor". * to the default of "default-dispatcher.executor".
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def create(name: String, config: Config, classLoader: ClassLoader, defaultExecutionContext: ExecutionContext): ActorSystem = apply(name, Option(config), Option(classLoader), Option(defaultExecutionContext)) def create(name: String, config: Config, classLoader: ClassLoader, defaultExecutionContext: ExecutionContext): ActorSystem = apply(name, Option(config), Option(classLoader), Option(defaultExecutionContext))
@ -113,14 +113,14 @@ object ActorSystem {
* then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader
* associated with the ActorSystem class. * associated with the ActorSystem class.
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def apply(name: String, config: Config): ActorSystem = apply(name, Option(config), None, None) def apply(name: String, config: Config): ActorSystem = apply(name, Option(config), None, None)
/** /**
* Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, Option(config), Option(classLoader), None) def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, Option(config), Option(classLoader), None)
@ -133,7 +133,7 @@ object ActorSystem {
* If no ExecutionContext is given, the system will fallback to the executor configured under "akka.actor.default-dispatcher.default-executor.fallback". * If no ExecutionContext is given, the system will fallback to the executor configured under "akka.actor.default-dispatcher.default-executor.fallback".
* The system will use the passed in config, or falls back to the deafult reference configuration using the ClassLoader. * The system will use the passed in config, or falls back to the deafult reference configuration using the ClassLoader.
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def apply(name: String, config: Option[Config] = None, classLoader: Option[ClassLoader] = None, defaultExecutionContext: Option[ExecutionContext] = None): ActorSystem = { def apply(name: String, config: Option[Config] = None, classLoader: Option[ClassLoader] = None, defaultExecutionContext: Option[ExecutionContext] = None): ActorSystem = {
val cl = classLoader.getOrElse(findClassLoader()) val cl = classLoader.getOrElse(findClassLoader())
@ -146,14 +146,14 @@ object ActorSystem {
* *
* For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration" * For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration"
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
class Settings(classLoader: ClassLoader, cfg: Config, final val name: String) { class Settings(classLoader: ClassLoader, cfg: Config, final val name: String) {
/** /**
* The backing Config of this ActorSystem's Settings * The backing Config of this ActorSystem's Settings
* *
* @see <a href="http://typesafehub.github.io/config/v1.2.0/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="http://typesafehub.github.io/config/v1.2.1/" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
final val config: Config = { final val config: Config = {
val config = cfg.withFallback(ConfigFactory.defaultReference(classLoader)) val config = cfg.withFallback(ConfigFactory.defaultReference(classLoader))

1
project/Dependencies.scala
View file

@ -22,6 +22,7 @@ object Dependencies {
// Compile // Compile
val camelCore = "org.apache.camel" % "camel-core" % "2.13.0" exclude("org.slf4j", "slf4j-api") // ApacheV2 val camelCore = "org.apache.camel" % "camel-core" % "2.13.0" exclude("org.slf4j", "slf4j-api") // ApacheV2
// when updating config version, update links ActorSystem ScalaDoc to link to the updated version
val config = "com.typesafe" % "config" % "1.2.1" // ApacheV2 val config = "com.typesafe" % "config" % "1.2.1" // ApacheV2
// mirrored in OSGi sample // mirrored in OSGi sample
val netty = "io.netty" % "netty" % "3.8.0.Final" // ApacheV2 val netty = "io.netty" % "netty" % "3.8.0.Final" // ApacheV2