diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java index ff5c0dc117..add4244a38 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java @@ -311,7 +311,7 @@ public class AVMBrowseBean implements IContextListener ResourceBundle msg = Application.getBundle(fc); String storeRoot = (String)getWebsite().getProperties().get(WCMAppModel.PROP_AVMSTORE); String stagingStore = getStagingStore(); - AVMStoreDescriptor store = this.avmService.getAVMStore(stagingStore); + AVMStoreDescriptor store = this.avmService.getStore(stagingStore); if (store != null) { // count user stores diff --git a/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java b/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java index de56a142bc..33460aed2e 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java @@ -68,7 +68,7 @@ public class AVMWorkflowUtil extends WorkflowUtil AVMNodeDescriptor packagesDesc = avmService.lookup(-1, packagesRoot); if (packagesDesc == null) { - avmService.createAVMStore(STORE_WORKFLOW_SYSTEM); + avmService.createStore(STORE_WORKFLOW_SYSTEM); avmService.createDirectory(STORE_WORKFLOW_SYSTEM + ":/", FOLDER_PACKAGES); } return packagesRoot; diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteSandboxDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteSandboxDialog.java index 31efbc8ddf..cac226e2ec 100644 --- a/source/java/org/alfresco/web/bean/wcm/DeleteSandboxDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/DeleteSandboxDialog.java @@ -79,11 +79,11 @@ public class DeleteSandboxDialog extends BaseDialogBean // purge the user main sandbox store from the system String sandbox = AVMConstants.buildAVMUserMainStoreName(storeRoot, username); - this.avmService.purgeAVMStore(sandbox); + this.avmService.purgeStore(sandbox); // purge the user preview sandbox store from the system sandbox = AVMConstants.buildAVMUserPreviewStoreName(storeRoot, username); - this.avmService.purgeAVMStore(sandbox); + this.avmService.purgeStore(sandbox); // remove the association to this web project user meta-data this.nodeService.removeChild(website.getNodeRef(), ref.getChildRef()); diff --git a/source/java/org/alfresco/web/bean/wcm/DeleteWebsiteDialog.java b/source/java/org/alfresco/web/bean/wcm/DeleteWebsiteDialog.java index 4332c8b73a..19d21cfe00 100644 --- a/source/java/org/alfresco/web/bean/wcm/DeleteWebsiteDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/DeleteWebsiteDialog.java @@ -79,9 +79,9 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog private void deleteStore(String store) { // check it exists before we try to remove it - if (this.avmService.getAVMStore(store) != null) + if (this.avmService.getStore(store) != null) { - this.avmService.purgeAVMStore(store); + this.avmService.purgeStore(store); } } diff --git a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java index 8bba851db2..2f80c2d6a0 100644 --- a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java @@ -216,7 +216,7 @@ public class ImportWebsiteDialog if (storeRoot != null && webapp != null) { String store = AVMConstants.buildAVMStagingStoreName(storeRoot); - if (this.avmService.getAVMStore(store) != null) + if (this.avmService.getStore(store) != null) { // get the path to the root webapp import area of the store String rootPath = AVMConstants.buildAVMStoreWebappPath(store, webapp); diff --git a/source/java/org/alfresco/web/bean/wcm/SandboxFactory.java b/source/java/org/alfresco/web/bean/wcm/SandboxFactory.java index ec9c6a83a8..90ce110c22 100644 --- a/source/java/org/alfresco/web/bean/wcm/SandboxFactory.java +++ b/source/java/org/alfresco/web/bean/wcm/SandboxFactory.java @@ -75,7 +75,7 @@ public final class SandboxFactory // create the 'staging' store for the website String stagingStore = AVMConstants.buildAVMStagingStoreName(name); - avmService.createAVMStore(stagingStore); + avmService.createStore(stagingStore); if (logger.isDebugEnabled()) logger.debug("Created staging sandbox store: " + stagingStore); @@ -106,7 +106,7 @@ public final class SandboxFactory // create the 'preview' store for the website String previewStore = AVMConstants.buildAVMStagingPreviewStoreName(name); - avmService.createAVMStore(previewStore); + avmService.createStore(previewStore); if (logger.isDebugEnabled()) logger.debug("Created staging sandbox store: " + previewStore); @@ -175,9 +175,9 @@ public final class SandboxFactory // create the user 'main' store String userStore = AVMConstants.buildAVMUserMainStoreName(name, username); - if (avmService.getAVMStore(userStore) == null) + if (avmService.getStore(userStore) == null) { - avmService.createAVMStore(userStore); + avmService.createStore(userStore); if (logger.isDebugEnabled()) logger.debug("Created user sandbox store: " + userStore); @@ -218,7 +218,7 @@ public final class SandboxFactory // create the user 'preview' store String previewStore = AVMConstants.buildAVMUserPreviewStoreName(name, username); - avmService.createAVMStore(previewStore); + avmService.createStore(previewStore); if (logger.isDebugEnabled()) logger.debug("Created user sandbox store: " + previewStore); diff --git a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java index df89cc604c..73403f82f5 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java @@ -174,7 +174,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent String dateFilter = getDateFilter(); if (dateFilter == null || dateFilter.equals(FILTER_DATE_ALL)) { - versions = avmService.getAVMStoreVersions(sandbox); + versions = avmService.getStoreVersions(sandbox); } else { @@ -201,7 +201,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent { throw new IllegalArgumentException("Unknown date filter mode: " + dateFilter); } - versions = avmService.getAVMStoreVersions(sandbox, fromDate, toDate); + versions = avmService.getStoreVersions(sandbox, fromDate, toDate); } Map requestMap = context.getExternalContext().getRequestMap(); for (VersionDescriptor item : versions) 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 f63d7b131d..2fc17bb43b 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java @@ -296,7 +296,7 @@ public class UIUserSandboxes extends SelfRenderingComponent String mainStore = AVMConstants.buildAVMUserMainStoreName(storeRoot, username); // check it exists before we render the view - if (avmService.getAVMStore(mainStore) != null) + if (avmService.getStore(mainStore) != null) { // check the permissions on this store for the current user if (logger.isDebugEnabled())