- 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

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 + ")";
 		}
     }
 

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();
         }
     }