antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Make sure we use the absolute path in getInstallDir()

Browse source 
* Fixing indentation in getInstallDir()
* Print stack trace on bootstrap error
This commit is contained in:
hns 2005-02-03 17:56:58 +00:00
parent 3933fbf91b
commit c93316078c
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/helma/main/launcher/Main.java
View file

@ -67,7 +67,7 @@ public class Main {
} catch (Exception x) { } catch (Exception x) {
// unable to get Helma installation dir from launcher jar // unable to get Helma installation dir from launcher jar
System.err.println("Unable to get Helma installation directory: "); System.err.println("Unable to get Helma installation directory: ");
System.err.println(x.getMessage()); x.printStackTrace();
System.exit(2); System.exit(2);
} }
} }
@ -173,29 +173,27 @@ public class Main {
if (installDir == null) { if (installDir == null) {
URL launcherUrl = apploader.findResource("helma/main/launcher/Main.class"); URL launcherUrl = apploader.findResource("helma/main/launcher/Main.class");
// this is a JAR URL of the form // this is a JAR URL of the form
// jar:<url>!/{entry} // jar:<url>!/{entry}
// we strip away the jar: prefix and the !/{entry} suffix // we strip away the jar: prefix and the !/{entry} suffix
// to get the original jar file URL // to get the original jar file URL
String jarUrl = launcherUrl.toString(); String jarUrl = launcherUrl.toString();
if (!jarUrl.startsWith("jar:") || jarUrl.indexOf("!") < 0) { if (!jarUrl.startsWith("jar:") || jarUrl.indexOf("!") < 0) {
throw new RuntimeException(" Unable to get JAR URL from "+jarUrl); throw new RuntimeException(" Unable to get JAR URL from " + jarUrl);
} }
jarUrl = jarUrl.substring(4); jarUrl = jarUrl.substring(4);
int excl = jarUrl.indexOf("!"); int excl = jarUrl.indexOf("!");
jarUrl = jarUrl.substring(0, excl); jarUrl = jarUrl.substring(0, excl);
launcherUrl = new URL(jarUrl); launcherUrl = new URL(jarUrl);
File f = new File(launcherUrl.getPath());
installDir = f.getParentFile().getCanonicalPath();
File f = new File(launcherUrl.getPath()).getAbsoluteFile();
installDir = f.getParentFile().getCanonicalPath();
} }
// set System property // set System property
System.setProperty("helma.home", installDir); System.setProperty("helma.home", installDir);