svn commit: r661208 - /geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java

[jd...@apache.org]

Author: jdillon
Date: Wed May 28 21:33:39 2008
New Revision: 661208

URL: http://svn.apache.org/viewvc?rev=661208&view=rev
Log:
For now assume that URL.getFile() is UTF-8 encoded, not sure if this is correct though... :-\

Modified:
    geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java

Modified: geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java?rev=661208&r1=661207&r2=661208&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java (original)
+++ geronimo/gshell/trunk/gshell-bootstrap/src/main/java/org/apache/geronimo/gshell/bootstrap/Launcher.java Wed May 28 21:33:39 2008
@@ -58,7 +58,7 @@
         setProperty("classworlds.conf", classworldsConf.getCanonicalPath());
 
         File log4jConf = getLog4jConf();
-        setProperty("log4j.configuration", log4jConf.toURI().toURL().toString());
+        setProperty("log4j.configuration", log4jConf.toURI().toURL().toExternalForm());
 
         // Delegate to the Classworlds launcher to finish booting
         org.codehaus.plexus.classworlds.launcher.Launcher.main(args);
@@ -94,7 +94,7 @@
 
         if (path == null) {
             String jarPath = Launcher.class.getProtectionDomain().getCodeSource().getLocation().getFile();
-            jarPath = java.net.URLDecoder.decode(jarPath);
+            jarPath = java.net.URLDecoder.decode(jarPath, "UTF-8");
 
             // The jar containing this class is expected to be in <gshell.home>/lib/boot
             File bootJar = new File(jarPath);