From 58e6787a16ff666f852e884f3ae7fd49f094b649 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Fri, 28 Nov 2008 12:32:27 +0000 Subject: [PATCH] WCM Services - "sandbox service" - cleanup (for consistency) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java | 2 +- .../org/alfresco/web/bean/wcm/RevertSelectedDialog.java | 2 +- .../org/alfresco/web/ui/wcm/component/UIUserSandboxes.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java b/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java index 372529aa24..bad6d04864 100644 --- a/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java @@ -79,7 +79,7 @@ public class RevertAllDialog extends BaseDialogBean String webApp = this.avmBrowseBean.getWebapp(); String userSandboxId = this.avmBrowseBean.getSandbox(); - getSandboxService().revertAllWebApp(userSandboxId, webApp); + getSandboxService().revertWebApp(userSandboxId, webApp); String msg = MessageFormat.format(Application.getMessage( context, MSG_REVERTALL_SUCCESS), this.avmBrowseBean.getUsername()); diff --git a/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java b/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java index f8e2a3350a..309b7c7f29 100644 --- a/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java @@ -79,7 +79,7 @@ public class RevertSelectedDialog extends BaseDialogBean String webApp = this.avmBrowseBean.getWebapp(); String userSandboxId = this.avmBrowseBean.getSandbox(); - getSandboxService().revertAllWebApp(userSandboxId, webApp); + getSandboxService().revertWebApp(userSandboxId, webApp); String msg = MessageFormat.format(Application.getMessage( context, MSG_REVERTSELECTED_SUCCESS), this.avmBrowseBean.getUsername()); diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java index 165f87b6b1..bf37718ec1 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java @@ -456,7 +456,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa out.write(""); // Preview Website - String websiteUrl = AVMUtil.getPreviewURI(mainStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + '/' + getWebapp()); + String websiteUrl = AVMUtil.getPreviewURI(mainStore, JNDIConstants.DIR_DEFAULT_WWW_APPBASE + '/' + getWebapp()); Map requestMap = context.getExternalContext().getRequestMap(); requestMap.put(REQUEST_PREVIEW_REF, websiteUrl); Utils.encodeRecursive(context, aquireAction( @@ -720,7 +720,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa // compare user sandbox to staging sandbox - filter by current webapp, include deleted items String userStore = AVMUtil.buildUserMainStoreName(storeRoot, username); - List nodes = sandboxService.listChangedItemsWebApp(userStore, getWebapp(), true); + List nodes = sandboxService.listChangedWebApp(userStore, getWebapp(), true); if (nodes.size() != 0) { @@ -840,7 +840,7 @@ public class UIUserSandboxes extends SelfRenderingComponent implements Serializa // build node context required for actions AVMNode avmNode = new AVMNode(node); String assetPath = sourcePath.substring(rootPathIndex); - String previewUrl = AVMUtil.getPreviewURI(userStore, '/' + JNDIConstants.DIR_DEFAULT_WWW + '/' + JNDIConstants.DIR_DEFAULT_APPBASE + assetPath); + String previewUrl = AVMUtil.getPreviewURI(userStore, JNDIConstants.DIR_DEFAULT_WWW_APPBASE + assetPath); avmNode.getProperties().put("previewUrl", previewUrl); // size of files