From 2cf35a27a3a314fa00b02dc4ea6b51c539d23cd1 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Wed, 18 Aug 2010 19:02:48 +0200 Subject: [PATCH] Hard-off-switching SSL Remote Actors due to not production ready for 0.10 --- akka-core/src/main/scala/remote/RemoteServer.scala | 4 ++-- config/akka-reference.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala index 131201d402..1bc443eab9 100644 --- a/akka-core/src/main/scala/remote/RemoteServer.scala +++ b/akka-core/src/main/scala/remote/RemoteServer.scala @@ -77,7 +77,7 @@ object RemoteServer { } val SECURE = { - if (config.getBool("akka.remote.ssl.service",false)) { + /*if (config.getBool("akka.remote.ssl.service",false)) { val properties = List( ("key-store-type" , "keyStoreType"), ("key-store" , "keyStore"), @@ -95,7 +95,7 @@ object RemoteServer { if (config.getBool("akka.remote.ssl.debug", false)) System.setProperty("javax.net.debug","ssl") true - } else false + } else */false } object Address { diff --git a/config/akka-reference.conf b/config/akka-reference.conf index d79383dcf6..827ec7b5ad 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -80,8 +80,8 @@ akka { compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6 - ssl { - service = off #on / off + ssl { #This feature is not deemed production ready and is not possible to turn on yet + service = off #You can either use java command-line options or use the settings below