Updated Branches: refs/heads/master 2ba09d88c -> a6be8c76c
Reverting part of commit ff7c964a6621cf56d555120e9740dc87cf37b9eb (Add ability to do jetty:run in eclipse). This change breaks the ability to upload scripts to XenServer (and possibly other places). Needs some investigation before enabling this again. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a6be8c76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a6be8c76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a6be8c76 Branch: refs/heads/master Commit: a6be8c76c311f47001dfad8205fcdd8f2df774bf Parents: 2ba09d8 Author: Hugo Trippaers <[email protected]> Authored: Thu Aug 30 16:10:28 2012 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Thu Aug 30 16:10:28 2012 +0200 ---------------------------------------------------------------------- utils/src/com/cloud/utils/script/Script.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6be8c76/utils/src/com/cloud/utils/script/Script.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java index 0662e61..feed764 100755 --- a/utils/src/com/cloud/utils/script/Script.java +++ b/utils/src/com/cloud/utils/script/Script.java @@ -340,15 +340,18 @@ public class Script implements Callable<String> { File file = null; if (url != null) { file = new File(url.getFile()); + s_logger.debug("Absolute path = " + file.getAbsolutePath()); return file.getAbsolutePath(); } - url = Script.class.getClassLoader().getResource(path); - if (url != null) { - file = new File(url.getFile()); - return file.getAbsolutePath(); - } - +/* url = Script.class.getClassLoader().getResource(path); + * s_logger.debug("Classpath resource: " + url); + * if (url != null) { + * file = new File(url.getFile()); + * s_logger.debug("Absolute path = " + file.getAbsolutePath()); + * return file.getAbsolutePath(); + * } + */ if (path.endsWith(File.separator)) { path = path.substring(0, path.lastIndexOf(File.separator)); }
