From 413df657330b85ab9cce5ecdb24711a317b7bfe7 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Mon, 21 Jan 2008 15:55:01 +0000 Subject: [PATCH] - Manual merge of ClassPathStore refactor from 2.x branch - Tidy up (confusing) script paths in exception messages (as an outcome of AR-1921) - Fix bug in inspect web script (null pointer when missing optional web script description) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/web/scripts/RepoStore.java | 10 +++++++++- .../repo/web/scripts/RepositoryScriptProcessor.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/RepoStore.java b/source/java/org/alfresco/repo/web/scripts/RepoStore.java index c4fb9d73a2..97b0543fdc 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepoStore.java +++ b/source/java/org/alfresco/repo/web/scripts/RepoStore.java @@ -673,7 +673,15 @@ public class RepoStore implements Store */ public String getPath() { - return repoStore + "/" + baseDir + "/" + path; + return repoStore + baseDir + "/" + path; + } + + /* (non-Javadoc) + * @see org.alfresco.web.scripts.ScriptContent#getPathDescription() + */ + public String getPathDescription() + { + return "/" + path + " (in repository store " + repoStore.toString() + baseDir + ")"; } } diff --git a/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java b/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java index f3dfeac9d6..eae4e29745 100644 --- a/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java @@ -174,7 +174,7 @@ public class RepositoryScriptProcessor implements ScriptProcessor @Override public String toString() { - return content.getPath(); + return content.getPathDescription(); } }