Moving daemon files, renaming namespaces, modules and jar

compiler/daemon/daemon-client/daemon-client.iml

@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="rmi-interface" />
+    <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="native-platform-uberjar" level="project" />

compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt

@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.kotlinr
+package org.jetbrains.kotlin.daemon.client
 
+import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
+import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
+import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
 import org.jetbrains.kotlin.incremental.components.LookupInfo
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto
 import org.jetbrains.kotlin.modules.TargetId
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
-import org.jetbrains.kotlin.rmi.CompilerCallbackServicesFacade
-import org.jetbrains.kotlin.rmi.LoopbackNetworkInterface
-import org.jetbrains.kotlin.rmi.SOCKET_ANY_FREE_PORT
+import java.rmi.server.UnicastRemoteObject
 
 
 class CompilerCallbackServicesFacadeServer(
@@ -32,7 +33,7 @@ class CompilerCallbackServicesFacadeServer(
         val compilationCancelledStatus: CompilationCanceledStatus? = null,
         port: Int = SOCKET_ANY_FREE_PORT
 ) : CompilerCallbackServicesFacade,
-    java.rmi.server.UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory)
+    UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory)
 {
     override fun hasIncrementalCaches(): Boolean = incrementalCompilationComponents != null
 

compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt

@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.kotlinr
+package org.jetbrains.kotlin.daemon.client
 
+import net.rubygrapefruit.platform.Native
 import net.rubygrapefruit.platform.ProcessLauncher
+import org.jetbrains.kotlin.daemon.common.*
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
-import org.jetbrains.kotlin.rmi.*
 import org.jetbrains.kotlin.utils.addToStdlib.check
 import java.io.File
 import java.io.OutputStream
 import java.io.PrintStream
+import java.rmi.server.UnicastRemoteObject
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
@@ -44,11 +46,11 @@ object KotlinCompilerClient {
 
 
     fun connectToCompileService(compilerId: CompilerId,
-                                       daemonJVMOptions: DaemonJVMOptions,
-                                       daemonOptions: DaemonOptions,
-                                       reportingTargets: DaemonReportingTargets,
-                                       autostart: Boolean = true,
-                                       checkId: Boolean = true
+                                daemonJVMOptions: DaemonJVMOptions,
+                                daemonOptions: DaemonOptions,
+                                reportingTargets: DaemonReportingTargets,
+                                autostart: Boolean = true,
+                                checkId: Boolean = true
     ): CompileService? {
         fun newFlagFile(): File {
             val flagFile = File.createTempFile("kotlin-compiler-client-", "-is-running")
@@ -66,11 +68,11 @@ object KotlinCompilerClient {
     }
 
     fun connectToCompileService(compilerId: CompilerId,
-                                       clientAliveFlagFile: File,
-                                       daemonJVMOptions: DaemonJVMOptions,
-                                       daemonOptions: DaemonOptions,
-                                       reportingTargets: DaemonReportingTargets,
-                                       autostart: Boolean = true
+                                clientAliveFlagFile: File,
+                                daemonJVMOptions: DaemonJVMOptions,
+                                daemonOptions: DaemonOptions,
+                                reportingTargets: DaemonReportingTargets,
+                                autostart: Boolean = true
     ): CompileService? {
 
         var attempts = 0
@@ -98,7 +100,7 @@ object KotlinCompilerClient {
 
 
     fun shutdownCompileService(compilerId: CompilerId, daemonOptions: DaemonOptions): Unit {
-        KotlinCompilerClient.connectToCompileService(compilerId, DaemonJVMOptions(), daemonOptions, DaemonReportingTargets(out = System.out), autostart = false, checkId = false)
+        connectToCompileService(compilerId, DaemonJVMOptions(), daemonOptions, DaemonReportingTargets(out = System.out), autostart = false, checkId = false)
                 ?.shutdown()
     }
 
@@ -109,12 +111,12 @@ object KotlinCompilerClient {
 
 
     fun compile(compilerService: CompileService,
-                       sessionId: Int,
-                       targetPlatform: CompileService.TargetPlatform,
-                       args: Array<out String>,
-                       out: OutputStream,
-                       port: Int = SOCKET_ANY_FREE_PORT,
-                       operationsTracer: RemoteOperationsTracer? = null
+                sessionId: Int,
+                targetPlatform: CompileService.TargetPlatform,
+                args: Array<out String>,
+                out: OutputStream,
+                port: Int = SOCKET_ANY_FREE_PORT,
+                operationsTracer: RemoteOperationsTracer? = null
     ): Int {
         val outStrm = RemoteOutputStreamServer(out, port = port)
         return compilerService.remoteCompile(sessionId, targetPlatform, args, CompilerCallbackServicesFacadeServer(port = port), outStrm, CompileService.OutputFormat.PLAIN, outStrm, operationsTracer).get()
@@ -122,15 +124,15 @@ object KotlinCompilerClient {
 
 
     fun incrementalCompile(compileService: CompileService,
-                                  sessionId: Int,
-                                  targetPlatform: CompileService.TargetPlatform,
-                                  args: Array<out String>,
-                                  callbackServices: CompilationServices,
-                                  compilerOut: OutputStream,
-                                  daemonOut: OutputStream,
-                                  port: Int = SOCKET_ANY_FREE_PORT,
-                                  profiler: Profiler = DummyProfiler(),
-                                  operationsTracer: RemoteOperationsTracer? = null
+                           sessionId: Int,
+                           targetPlatform: CompileService.TargetPlatform,
+                           args: Array<out String>,
+                           callbackServices: CompilationServices,
+                           compilerOut: OutputStream,
+                           daemonOut: OutputStream,
+                           port: Int = SOCKET_ANY_FREE_PORT,
+                           profiler: Profiler = DummyProfiler(),
+                           operationsTracer: RemoteOperationsTracer? = null
     ): Int = profiler.withMeasure(this) {
             compileService.remoteIncrementalCompile(
                     sessionId,
@@ -158,7 +160,7 @@ object KotlinCompilerClient {
             val unrecognized = it.trimQuotes().split(",").filterExtractProps(opts.mappers, "")
             if (unrecognized.any())
                 throw IllegalArgumentException(
-                        "Unrecognized client options passed via property $COMPILE_DAEMON_OPTIONS_PROPERTY: " + unrecognized.joinToString(" ") +
+                        "Unrecognized client options passed via property ${COMPILE_DAEMON_OPTIONS_PROPERTY}: " + unrecognized.joinToString(" ") +
                         "\nSupported options: " + opts.mappers.joinToString(", ", transform = { it.names.first() }))
         }
         return opts
@@ -224,8 +226,8 @@ object KotlinCompilerClient {
                 }
                 finally {
                     // forcing RMI to unregister all objects and stop
-                    java.rmi.server.UnicastRemoteObject.unexportObject(servicesFacade, true)
-                    java.rmi.server.UnicastRemoteObject.unexportObject(outStrm, true)
+                    UnicastRemoteObject.unexportObject(servicesFacade, true)
+                    UnicastRemoteObject.unexportObject(outStrm, true)
                 }
             }
         }
@@ -281,7 +283,7 @@ object KotlinCompilerClient {
         val processBuilder = ProcessBuilder(args)
         processBuilder.redirectErrorStream(true)
         // assuming daemon process is deaf and (mostly) silent, so do not handle streams
-        val daemonLauncher = net.rubygrapefruit.platform.Native.get(ProcessLauncher::class.java)
+        val daemonLauncher = Native.get(ProcessLauncher::class.java)
         val daemon = daemonLauncher.start(processBuilder)
 
         var isEchoRead = Semaphore(1)
@@ -313,7 +315,7 @@ object KotlinCompilerClient {
                     it.toLong()
                 }
                 catch (e: Exception) {
-                    reportingTargets.report(DaemonReportCategory.INFO, "unable to interpret $COMPILE_DAEMON_STARTUP_TIMEOUT_PROPERTY property ('$it'); using default timeout $DAEMON_DEFAULT_STARTUP_TIMEOUT_MS ms")
+                    reportingTargets.report(DaemonReportCategory.INFO, "unable to interpret ${COMPILE_DAEMON_STARTUP_TIMEOUT_PROPERTY} property ('$it'); using default timeout $DAEMON_DEFAULT_STARTUP_TIMEOUT_MS ms")
                     null
                 }
             } ?: DAEMON_DEFAULT_STARTUP_TIMEOUT_MS

compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteOutputStreamServer.kt

@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.kotlinr
+package org.jetbrains.kotlin.daemon.client
 
-import org.jetbrains.kotlin.rmi.LoopbackNetworkInterface
-import org.jetbrains.kotlin.rmi.RemoteOutputStream
-import org.jetbrains.kotlin.rmi.SOCKET_ANY_FREE_PORT
+import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
+import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
+import org.jetbrains.kotlin.daemon.common.RemoteOutputStream
+import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
 import java.io.OutputStream
+import java.rmi.server.UnicastRemoteObject
 
 
 class RemoteOutputStreamServer(val out: OutputStream, port: Int = SOCKET_ANY_FREE_PORT)
 : RemoteOutputStream,
-  java.rmi.server.UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory)
+  UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory)
 {
     override fun close() {
         out.close()

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.io.File
 import java.rmi.ConnectException
@@ -30,7 +30,7 @@ enum class DaemonReportCategory {
 
 
 fun makeRunFilenameString(timestamp: String, digest: String, port: String, escapeSequence: String = ""): String =
-        "$COMPILE_DAEMON_DEFAULT_FILES_PREFIX$escapeSequence.$timestamp$escapeSequence.$digest$escapeSequence.$port$escapeSequence.run"
+        "${COMPILE_DAEMON_DEFAULT_FILES_PREFIX}$escapeSequence.$timestamp$escapeSequence.$digest$escapeSequence.$port$escapeSequence.run"
 
 
 fun makePortFromRunFilenameExtractor(digest: String): (String) -> Int? {

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.io.Serializable
 import java.rmi.Remote

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import org.jetbrains.kotlin.incremental.components.LookupInfo
 import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY
 import java.io.File
@@ -27,7 +27,7 @@ import kotlin.reflect.KMutableProperty1
 
 val COMPILER_JAR_NAME: String = "kotlin-compiler.jar"
 val COMPILER_SERVICE_RMI_NAME: String = "KotlinJvmCompilerService"
-val COMPILER_DAEMON_CLASS_FQN: String = "org.jetbrains.kotlin.rmi.service.CompileDaemon"
+val COMPILER_DAEMON_CLASS_FQN: String = "org.jetbrains.kotlin.daemon.CompileDaemon"
 val COMPILE_DAEMON_FIND_PORT_ATTEMPTS: Int = 10
 val COMPILE_DAEMON_PORTS_RANGE_START: Int = 17001
 val COMPILE_DAEMON_PORTS_RANGE_END: Int = 18000
@@ -258,9 +258,9 @@ fun isDaemonEnabled(): Boolean = System.getProperty(COMPILE_DAEMON_ENABLED_PROPE
 
 
 fun configureDaemonJVMOptions(opts: DaemonJVMOptions,
-                                     vararg additionalParams: String,
-                                     inheritMemoryLimits: Boolean,
-                                     inheritAdditionalProperties: Boolean
+                              vararg additionalParams: String,
+                              inheritMemoryLimits: Boolean,
+                              inheritAdditionalProperties: Boolean
 ): DaemonJVMOptions {
     // note: sequence matters, explicit override in COMPILE_DAEMON_JVM_OPTIONS_PROPERTY should be done after inputArguments processing
     if (inheritMemoryLimits) {
@@ -276,8 +276,8 @@ fun configureDaemonJVMOptions(opts: DaemonJVMOptions,
 
     opts.jvmParams.addAll(additionalParams)
     if (inheritAdditionalProperties) {
-        System.getProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY)?.let { opts.jvmParams.add("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"$it\"") }
-        System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY)?.let { opts.jvmParams.add("D$KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY") }
+        System.getProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY)?.let { opts.jvmParams.add("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"$it\"") }
+        System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY)?.let { opts.jvmParams.add("D${KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY}") }
     }
     return opts
 }
@@ -298,7 +298,7 @@ fun configureDaemonOptions(opts: DaemonOptions): DaemonOptions {
         val unrecognized = it.trimQuotes().split(",").filterExtractProps(opts.mappers, "")
         if (unrecognized.any())
             throw IllegalArgumentException(
-                    "Unrecognized daemon options passed via property $COMPILE_DAEMON_OPTIONS_PROPERTY: " + unrecognized.joinToString(" ") +
+                    "Unrecognized daemon options passed via property ${COMPILE_DAEMON_OPTIONS_PROPERTY}: " + unrecognized.joinToString(" ") +
                     "\nSupported options: " + opts.mappers.joinToString(", ", transform = { it.names.first() }))
     }
     System.getProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY)?.let { opts.verbose = true }

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/FileSystemUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.io.File
 
@@ -28,19 +28,19 @@ enum class OSKind {
         val current: OSKind = System.getProperty("os.name").toLowerCase().let {
             when {
                 // partly taken from http://www.code4copy.com/java/post/detecting-os-type-in-java
-                it.startsWith("windows") -> OSKind.Windows
-                it.startsWith("mac os") -> OSKind.OSX
-                it.contains("unix") -> OSKind.Unix
-                it.startsWith("linux") -> OSKind.Unix
-                it.contains("bsd") -> OSKind.Unix
-                it.startsWith("irix") -> OSKind.Unix
-                it.startsWith("mpe/ix") -> OSKind.Unix
-                it.startsWith("aix") -> OSKind.Unix
-                it.startsWith("hp-ux") -> OSKind.Unix
-                it.startsWith("sunos") -> OSKind.Unix
-                it.startsWith("sun os") -> OSKind.Unix
-                it.startsWith("solaris") -> OSKind.Unix
-                else -> OSKind.Unknown
+                it.startsWith("windows") -> Windows
+                it.startsWith("mac os") -> OSX
+                it.contains("unix") -> Unix
+                it.startsWith("linux") -> Unix
+                it.contains("bsd") -> Unix
+                it.startsWith("irix") -> Unix
+                it.startsWith("mpe/ix") -> Unix
+                it.startsWith("aix") -> Unix
+                it.startsWith("hp-ux") -> Unix
+                it.startsWith("sunos") -> Unix
+                it.startsWith("sun os") -> Unix
+                it.startsWith("solaris") -> Unix
+                else -> Unknown
             }
         }
     }
@@ -76,7 +76,7 @@ object FileSystem {
         val dir = if (base.exists() && base.isDirectory) names.fold(base, { r, v -> File(r, v) })
                   else names.drop(1)
                             .fold(File(userHomePath, names.first().let { if (it.startsWith(".")) it else ".$it" }),
-                                  { r, v -> File(r, v)})
+                                  { r, v -> File(r, v) })
         return if ((dir.exists() && dir.isDirectory) || dir.mkdirs()) dir.absolutePath
                else tempPath
     }

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/NetworkUtils.kt

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.io.IOException
 import java.io.Serializable
+import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.ServerSocket
 import java.net.Socket
@@ -45,7 +46,7 @@ object LoopbackNetworkInterface {
     // TODO switch to InetAddress.getLoopbackAddress on java 7+
     val loopbackInetAddressName by lazy {
         try {
-            if (java.net.InetAddress.getLocalHost() is java.net.Inet6Address) IPV6_LOOPBACK_INET_ADDRESS else IPV4_LOOPBACK_INET_ADDRESS
+            if (InetAddress.getLocalHost() is Inet6Address) IPV6_LOOPBACK_INET_ADDRESS else IPV4_LOOPBACK_INET_ADDRESS
         }
         catch (e: IOException) {
             // getLocalHost may fail for unknown reasons in some situations, the fallback is to assume IPv4 for now

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/PerfUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.lang.management.ManagementFactory
 import java.lang.management.ThreadMXBean
@@ -131,7 +131,7 @@ inline fun<R> withMeasureWallAndThreadTimesAndMemory(perfCounters: PerfCounters,
 
 
 class DummyProfiler : Profiler {
-    override fun getCounters(): Map<Any?,PerfCounters> = mapOf(null to SimplePerfCounters())
+    override fun getCounters(): Map<Any?, PerfCounters> = mapOf(null to SimplePerfCounters())
     override fun getTotalCounters(): PerfCounters = SimplePerfCounters()
 
     override final inline fun <R> withMeasure(obj: Any?, body: () -> R): R = body()
@@ -167,8 +167,8 @@ class WallAndThreadByClassProfiler() : TotalProfiler() {
 
     val counters = hashMapOf<Any?, SimplePerfCountersWithTotal>()
 
-    override fun getCounters(): Map<Any?,PerfCounters> = counters
+    override fun getCounters(): Map<Any?, PerfCounters> = counters
 
     override final inline fun <R> withMeasure(obj: Any?, body: () -> R): R =
-            withMeasureWallAndThreadTimes(counters.getOrPut(obj?.javaClass?.name, { SimplePerfCountersWithTotal(total) } ), threadMXBean, body)
+            withMeasureWallAndThreadTimes(counters.getOrPut(obj?.javaClass?.name, { SimplePerfCountersWithTotal(total) }), threadMXBean, body)
 }

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOperationsTracer.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.rmi.Remote
 import java.rmi.RemoteException

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteOutputStream.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi
+package org.jetbrains.kotlin.daemon.common
 
 import java.rmi.Remote
 import java.rmi.RemoteException

compiler/daemon/daemon.iml

@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="rmi-interface" />
+    <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="module" module-name="util" />

compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileDaemon.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
 import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.js.K2JSCompiler
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
-import org.jetbrains.kotlin.rmi.*
+import org.jetbrains.kotlin.daemon.common.*
 import java.io.File
 import java.io.IOException
 import java.io.OutputStream
@@ -69,7 +69,7 @@ object CompileDaemon {
                 "java.util.logging.FileHandler.limit     = ${if (fileIsGiven) 0 else (1 shl 20)}\n" + // if file is provided - disabled, else - 1Mb
                 "java.util.logging.FileHandler.count     = ${if (fileIsGiven) 1 else 3}\n" +
                 "java.util.logging.FileHandler.append    = $fileIsGiven\n" +
-                "java.util.logging.FileHandler.pattern   = ${if (fileIsGiven) logPath else (logPath + File.separator + "$COMPILE_DAEMON_DEFAULT_FILES_PREFIX.$logTime.%u%g.log")}\n" +
+                "java.util.logging.FileHandler.pattern   = ${if (fileIsGiven) logPath else (logPath + File.separator + "${COMPILE_DAEMON_DEFAULT_FILES_PREFIX}.$logTime.%u%g.log")}\n" +
                 "java.util.logging.SimpleFormatter.format = %1\$tF %1\$tT.%1\$tL [%3\$s] %4\$s: %5\$s\\n\n"
 
         LogManager.getLogManager().readConfiguration(cfg.byteInputStream())

compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
+import com.intellij.openapi.vfs.impl.ZipHandler
 import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.Services
+import org.jetbrains.kotlin.daemon.common.*
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
-import org.jetbrains.kotlin.rmi.*
 import org.jetbrains.kotlin.utils.addToStdlib.check
 import java.io.BufferedOutputStream
 import java.io.File
@@ -116,9 +117,9 @@ class CompileServiceImpl(
         val runFileDir = File(daemonOptions.runFilesPathOrDefault)
         runFileDir.mkdirs()
         runFile = File(runFileDir,
-                           makeRunFilenameString(timestamp = "%tFT%<tH-%<tM-%<tS.%<tLZ".format(Calendar.getInstance(TimeZone.getTimeZone("Z"))),
-                                                 digest = compilerId.compilerClasspath.map { File(it).absolutePath }.distinctStringsDigest().toHexString(),
-                                                 port = port.toString()))
+                       makeRunFilenameString(timestamp = "%tFT%<tH-%<tM-%<tS.%<tLZ".format(Calendar.getInstance(TimeZone.getTimeZone("Z"))),
+                                             digest = compilerId.compilerClasspath.map { File(it).absolutePath }.distinctStringsDigest().toHexString(),
+                                             port = port.toString()))
         try {
             if (!runFile.createNewFile()) throw Exception("createNewFile returned false")
         } catch (e: Exception) {
@@ -187,7 +188,7 @@ class CompileServiceImpl(
 
     override fun getUsedMemory(): CompileService.CallResult<Long> = ifAlive { usedMemory(withGC = true) }
 
-    override fun shutdown(): CompileService.CallResult<Nothing>  = ifAliveExclusive_Nothing(minAliveness = Aliveness.LastSession, ignoreCompilerChanged = true) {
+    override fun shutdown(): CompileService.CallResult<Nothing> = ifAliveExclusive_Nothing(minAliveness = Aliveness.LastSession, ignoreCompilerChanged = true) {
         shutdownImpl()
     }
 
@@ -301,7 +302,7 @@ class CompileServiceImpl(
                 }.forEach { releaseCompileSession(it) }
 
                 // 3. check if in graceful shutdown state and all sessions are closed
-                if (shutdownCondition({state.alive.get() == Aliveness.LastSession.ordinal && state.sessions.none()}, "All sessions finished, shutting down")) {
+                if (shutdownCondition({ state.alive.get() == Aliveness.LastSession.ordinal && state.sessions.none()}, "All sessions finished, shutting down")) {
                     shutdown()
                 }
 
@@ -478,7 +479,7 @@ class CompileServiceImpl(
     }
 
     private fun clearJarCache() {
-        com.intellij.openapi.vfs.impl.ZipHandler.clearFileAccessorCache()
+        ZipHandler.clearFileAccessorCache()
         val classloader = javaClass.classLoader
         // TODO: replace the following code with direct call to CoreJarFileSystem.<clearCache> as soon as it will be available (hopefully in 15.02)
         try {

compiler/daemon/src/org/jetbrains/kotlin/daemon/LazyClasspathWatcher.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
 import java.io.File
 import java.io.IOException

compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteCompilationCanceledStatusClient.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
-import org.jetbrains.kotlin.rmi.CompilerCallbackServicesFacade
-import org.jetbrains.kotlin.rmi.DummyProfiler
-import org.jetbrains.kotlin.rmi.Profiler
+import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
+import org.jetbrains.kotlin.daemon.common.DummyProfiler
+import org.jetbrains.kotlin.daemon.common.Profiler
 import java.util.concurrent.TimeUnit
 
 val CANCELED_STATUS_CHECK_THRESHOLD_NS = TimeUnit.MILLISECONDS.toNanos(100)

compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCacheClient.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
 import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto
 import org.jetbrains.kotlin.modules.TargetId
-import org.jetbrains.kotlin.rmi.CompilerCallbackServicesFacade
-import org.jetbrains.kotlin.rmi.DummyProfiler
-import org.jetbrains.kotlin.rmi.Profiler
+import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
+import org.jetbrains.kotlin.daemon.common.DummyProfiler
+import org.jetbrains.kotlin.daemon.common.Profiler
 
 class RemoteIncrementalCacheClient(val facade: CompilerCallbackServicesFacade, val target: TargetId, val profiler: Profiler = DummyProfiler()): IncrementalCache {
 

compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalCompilationComponentsClient.kt

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
 import org.jetbrains.kotlin.modules.TargetId
-import org.jetbrains.kotlin.rmi.CompilerCallbackServicesFacade
-import org.jetbrains.kotlin.rmi.DummyProfiler
-import org.jetbrains.kotlin.rmi.Profiler
+import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
+import org.jetbrains.kotlin.daemon.common.DummyProfiler
+import org.jetbrains.kotlin.daemon.common.Profiler
 
 
 class RemoteIncrementalCompilationComponentsClient(val facade: CompilerCallbackServicesFacade, eventManger: EventManger, val profiler: Profiler = DummyProfiler()) : IncrementalCompilationComponents {

compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteLookupTrackerClient.kt

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
 import org.jetbrains.kotlin.incremental.components.LookupInfo
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.Position
 import org.jetbrains.kotlin.incremental.components.ScopeKind
-import org.jetbrains.kotlin.rmi.CompilerCallbackServicesFacade
-import org.jetbrains.kotlin.rmi.DummyProfiler
-import org.jetbrains.kotlin.rmi.Profiler
+import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
+import org.jetbrains.kotlin.daemon.common.DummyProfiler
+import org.jetbrains.kotlin.daemon.common.Profiler
 
 
 class RemoteLookupTrackerClient(val facade: CompilerCallbackServicesFacade, val eventManger: EventManger, val profiler: Profiler = DummyProfiler()) : LookupTracker {

compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteOutputStreamClient.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.rmi.service
+package org.jetbrains.kotlin.daemon
 
-import org.jetbrains.kotlin.rmi.DummyProfiler
-import org.jetbrains.kotlin.rmi.Profiler
-import org.jetbrains.kotlin.rmi.RemoteOutputStream
+import org.jetbrains.kotlin.daemon.common.DummyProfiler
+import org.jetbrains.kotlin.daemon.common.Profiler
+import org.jetbrains.kotlin.daemon.common.RemoteOutputStream
 import java.io.OutputStream
 
 class RemoteOutputStreamClient(val remote: RemoteOutputStream, val profiler: Profiler = DummyProfiler()): OutputStream() {

compiler/tests/compiler-tests.iml

@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.translator" scope="TEST" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="kotlinr" />
-    <orderEntry type="module" module-name="rmi-interface" />
+    <orderEntry type="module" module-name="daemon-client" />
+    <orderEntry type="module" module-name="daemon-common" />
   </component>
 </module>

compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt

@@ -16,12 +16,11 @@
 
 package org.jetbrains.kotlin.daemon
 
-import junit.framework.TestCase
 import org.jetbrains.kotlin.cli.CliBaseTest
 import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
-import org.jetbrains.kotlin.rmi.*
-import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportingTargets
-import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient
+import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets
+import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient
+import org.jetbrains.kotlin.daemon.common.*
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -39,7 +38,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
     val compilerClassPath = listOf(
             File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"))
-    val daemonClientClassPath = listOf( File(KotlinIntegrationTestBase.getCompilerLib(), "kotlinr.jar"),
+    val daemonClientClassPath = listOf( File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"),
                                         File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"))
     val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
 
@@ -76,7 +75,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
             val logFile = createTempFile("kotlin-daemon-test.", ".log")
 
-            val daemonJVMOptions = configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"",
+            val daemonJVMOptions = configureDaemonJVMOptions("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"${logFile.loggerCompatiblePath}\"",
                                                              inheritMemoryLimits = false, inheritAdditionalProperties = false)
             var daemonShotDown = false
 
@@ -154,11 +153,11 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
             val logFile1 = createTempFile("kotlin-daemon1-test", ".log")
             val logFile2 = createTempFile("kotlin-daemon2-test", ".log")
             val daemonJVMOptions1 =
-                    configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile1.loggerCompatiblePath}\"",
+                    configureDaemonJVMOptions("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"${logFile1.loggerCompatiblePath}\"",
                                               inheritMemoryLimits = false, inheritAdditionalProperties = false)
 
             val daemonJVMOptions2 =
-                    configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile2.loggerCompatiblePath}\"",
+                    configureDaemonJVMOptions("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"${logFile2.loggerCompatiblePath}\"",
                                               inheritMemoryLimits = false, inheritAdditionalProperties = false)
 
             assertTrue(logFile1.length() == 0L && logFile2.length() == 0L)
@@ -193,7 +192,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
             val logFile = createTempFile("kotlin-daemon-test", ".log")
             val daemonJVMOptions =
-                    configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"",
+                    configureDaemonJVMOptions("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"${logFile.loggerCompatiblePath}\"",
                                               inheritMemoryLimits = false, inheritAdditionalProperties = false)
 
             val daemon = KotlinCompilerClient.connectToCompileService(compilerId, flagFile, daemonJVMOptions, daemonOptions, DaemonReportingTargets(out = System.err), autostart = true)
@@ -220,7 +219,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
             val logFile = createTempFile("kotlin-daemon-test", ".log")
             val daemonJVMOptions =
-                    configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"",
+                    configureDaemonJVMOptions("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"${logFile.loggerCompatiblePath}\"",
                                               inheritMemoryLimits = false, inheritAdditionalProperties = false)
 
             val daemon = KotlinCompilerClient.connectToCompileService(compilerId, flagFile, daemonJVMOptions, daemonOptions, DaemonReportingTargets(out = System.err), autostart = true)
@@ -252,7 +251,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
             val logFile = createTempFile("kotlin-daemon-test", ".log")
             val daemonJVMOptions =
-                    configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"",
+                    configureDaemonJVMOptions("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"${logFile.loggerCompatiblePath}\"",
                                               inheritMemoryLimits = false, inheritAdditionalProperties = false)
 
             val daemon = KotlinCompilerClient.connectToCompileService(compilerId, flagFile, daemonJVMOptions, daemonOptions, DaemonReportingTargets(out = System.err), autostart = true)
@@ -298,11 +297,11 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
         val daemonOptions = DaemonOptions(runFilesPath = runFilesPath)
         val jar = tmpdir.absolutePath + File.separator + "hello.jar"
         val args = listOf(
-                        File(File(System.getProperty("java.home"), "bin"), "java").absolutePath,
-                        "-D$COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY",
-                        "-cp",
-                        daemonClientClassPath.joinToString(File.pathSeparator) { it.absolutePath },
-                        KotlinCompilerClient::class.qualifiedName!!) +
+                File(File(System.getProperty("java.home"), "bin"), "java").absolutePath,
+                "-D${COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY}",
+                "-cp",
+                daemonClientClassPath.joinToString(File.pathSeparator) { it.absolutePath },
+                KotlinCompilerClient::class.qualifiedName!!) +
                    daemonOptions.mappers.flatMap { it.toArgs(COMPILE_DAEMON_CMDLINE_OPTIONS_PREFIX) } +
                    compilerId.mappers.flatMap { it.toArgs(COMPILE_DAEMON_CMDLINE_OPTIONS_PREFIX) } +
                    File(getHelloAppBaseDir(), "hello.kt").absolutePath +