Fixes issue scalatron#39: Server: fails to initialize correctly when run from a directory containing spaces

Author: scalatron

Scalatron/src/scalatron/scalatron/impl/CompileActor.scala

@@ -33,9 +33,9 @@ case class CompileActor(verbose: Boolean) extends Actor {
       * @return a collection of class paths to append to the classPath property of the Scala compiler
       */
     private def detectScalaClassPaths : Iterable[String] = {
-        val scalatronJarFilePath = classOf[CompileActor].getProtectionDomain.getCodeSource.getLocation.getPath
-        val scalaCompilerClassPath = classOf[Global].getProtectionDomain.getCodeSource.getLocation.getPath
-        val scalaLibraryClassPath = classOf[List[_]].getProtectionDomain.getCodeSource.getLocation.getPath
+        val scalatronJarFilePath = ScalatronImpl.getClassPath(classOf[CompileActor])
+        val scalaCompilerClassPath = ScalatronImpl.getClassPath(classOf[Global])
+        val scalaLibraryClassPath = ScalatronImpl.getClassPath(classOf[List[_]])
         if( verbose ) {
             println("  detected class path for Scalatron: " + scalatronJarFilePath)
             println("  detected class path for scala-compiler: " + scalaCompilerClassPath)

Scalatron/src/scalatron/scalatron/impl/ScalatronImpl.scala

@@ -16,6 +16,7 @@ import java.util.concurrent.{ThreadPoolExecutor, ThreadFactory, LinkedBlockingQu
 import akka.dispatch.ExecutionContext
 import java.security.Permission
 import java.io.FilePermission
+import java.net.URLDecoder
 
 
 object ScalatronImpl
@@ -63,7 +64,7 @@ object ScalatronImpl
 
 
         val sandboxUntrustedCode = argMap.get("-sandboxed").getOrElse("no") == "yes"
-        val scalatronJarFilePath = classOf[ScalatronImpl].getProtectionDomain.getCodeSource.getLocation.getPath
+        val scalatronJarFilePath = getClassPath(classOf[ScalatronImpl])
         implicit val executionContextForUntrustedCode = createExecutionContextForUntrustedCode(
             scalatronJarFilePath,
             scalatronInstallationDirectoryPath + "/out/",
@@ -223,6 +224,24 @@ object ScalatronImpl
         sandboxedExecutionContext
     }
 
+
+    /** Given a class, this method determines the file system path of the .jar file the class definition was
+      * loaded from. It handles the URLDecoding that is necessary to e.g. deal with paths that contain spaces.
+      * Example usage: <code>val scalatronJarFilePathAsURL = getClass(classOf[ScalatronImpl])</code>
+      * @param theClass the class whose .jar file path is sought
+      * @tparam T the type of the class (not used)
+      * @return a string representing the file system path to the .jar file
+      */
+    def getClassPath[T](theClass: Class[T]) : String = {
+        // The path returned here is URL encoded, resulting in components like "Documents%20and%20Settings"
+        val jarFilePathAsURL = theClass.getProtectionDomain.getCodeSource.getLocation.getPath
+
+        // so we URL-decode the path before returning it:
+        val characterEncoding = "UTF-8"         // Eight-bit UCS Transformation Format
+        URLDecoder.decode(jarFilePathAsURL, characterEncoding)
+    }
+
+
     // try to locate a base directory for the installation, e.g. '/Scalatron'
     def detectInstallationDirectory(verbose: Boolean) = {
         // Strategy A: use the Java user directory
@@ -231,7 +250,8 @@ object ScalatronImpl
         // val scalatronInstallationDirectoryPath = userDirectoryPath + "/.."
 
         // Strategy B: use the path to the Scalatron.jar file
-        val scalatronJarFilePath = classOf[ScalatronImpl].getProtectionDomain.getCodeSource.getLocation.getPath
+        val scalatronJarFilePath = getClassPath(classOf[ScalatronImpl])
+
         if (verbose) println("Detected Scalatron class path to be: " + scalatronJarFilePath)
 
         val scalatronInstallationDirectoryPath =