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

Changed and documented new remoting configuration #2593

Browse source
This commit is contained in:
Endre Sándor Varga 2013-01-17 16:19:31 +01:00
parent 9935337d8e
commit 99adbdfab4
25 changed files with 319 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
View file

@ -34,9 +34,9 @@ object Configuration {
default-timeout = 10s
}
remoting.enabled-transports = ["ssl"]
remote.enabled-transports = ["akka.remote.netty.ssl"]
remoting.transports.ssl {
remote.netty.ssl {
hostname = localhost
port = %d
ssl {
@ -62,7 +62,7 @@ object Configuration {
//if (true) throw new IllegalArgumentException("Ticket1978*Spec isn't enabled")
val config = ConfigFactory.parseString(conf.format(localPort, trustStore, keyStore, cipher, enabled.mkString(", ")))
val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remoting.transports.ssl.ssl")
val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remote.netty.ssl.ssl")
val settings = new SSLSettings(fullConfig)
val rng = NettySSLSupport.initializeCustomSecureRandom(settings.SSLRandomNumberGenerator,
@ -126,7 +126,7 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten
lazy val other: ActorSystem = ActorSystem(
"remote-sys",
ConfigFactory.parseString("akka.remoting.transports.ssl.port = " + cipherConfig.remotePort).withFallback(system.settings.config))
ConfigFactory.parseString("akka.remote.netty.ssl.port = " + cipherConfig.remotePort).withFallback(system.settings.config))
override def afterTermination() {
if (cipherConfig.runTest) {