inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleaning up of the AVMService and derived interfaces.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-16 18:17:18 +00:00
parent 1fb34e8cd1
commit 68a5004c3e
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
View File

@@ -311,7 +311,7 @@ public class AVMBrowseBean implements IContextListener
ResourceBundle msg = Application.getBundle(fc); ResourceBundle msg = Application.getBundle(fc);
String storeRoot = (String)getWebsite().getProperties().get(WCMAppModel.PROP_AVMSTORE); String storeRoot = (String)getWebsite().getProperties().get(WCMAppModel.PROP_AVMSTORE);
String stagingStore = getStagingStore(); String stagingStore = getStagingStore();
AVMStoreDescriptor store = this.avmService.getAVMStore(stagingStore); AVMStoreDescriptor store = this.avmService.getStore(stagingStore);
if (store != null) if (store != null)
{ {
// count user stores // count user stores

2
source/java/org/alfresco/web/bean/wcm/AVMWorkflowUtil.java
View File

@@ -68,7 +68,7 @@ public class AVMWorkflowUtil extends WorkflowUtil
AVMNodeDescriptor packagesDesc = avmService.lookup(-1, packagesRoot); AVMNodeDescriptor packagesDesc = avmService.lookup(-1, packagesRoot);
if (packagesDesc == null) if (packagesDesc == null)
{ {
avmService.createAVMStore(STORE_WORKFLOW_SYSTEM); avmService.createStore(STORE_WORKFLOW_SYSTEM);
avmService.createDirectory(STORE_WORKFLOW_SYSTEM + ":/", FOLDER_PACKAGES); avmService.createDirectory(STORE_WORKFLOW_SYSTEM + ":/", FOLDER_PACKAGES);
} }
return packagesRoot; return packagesRoot;

4
source/java/org/alfresco/web/bean/wcm/DeleteSandboxDialog.java
View File

@@ -79,11 +79,11 @@ public class DeleteSandboxDialog extends BaseDialogBean
// purge the user main sandbox store from the system // purge the user main sandbox store from the system
String sandbox = AVMConstants.buildAVMUserMainStoreName(storeRoot, username); String sandbox = AVMConstants.buildAVMUserMainStoreName(storeRoot, username);
this.avmService.purgeAVMStore(sandbox); this.avmService.purgeStore(sandbox);
// purge the user preview sandbox store from the system // purge the user preview sandbox store from the system
sandbox = AVMConstants.buildAVMUserPreviewStoreName(storeRoot, username); sandbox = AVMConstants.buildAVMUserPreviewStoreName(storeRoot, username);
this.avmService.purgeAVMStore(sandbox); this.avmService.purgeStore(sandbox);
// remove the association to this web project user meta-data // remove the association to this web project user meta-data
this.nodeService.removeChild(website.getNodeRef(), ref.getChildRef()); this.nodeService.removeChild(website.getNodeRef(), ref.getChildRef());

4
source/java/org/alfresco/web/bean/wcm/DeleteWebsiteDialog.java
View File

@@ -79,9 +79,9 @@ public class DeleteWebsiteDialog extends DeleteSpaceDialog
private void deleteStore(String store) private void deleteStore(String store)
{ {
// check it exists before we try to remove it // 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);
} }
} }

2
source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
View File

@@ -216,7 +216,7 @@ public class ImportWebsiteDialog
if (storeRoot != null && webapp != null) if (storeRoot != null && webapp != null)
{ {
String store = AVMConstants.buildAVMStagingStoreName(storeRoot); 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 // get the path to the root webapp import area of the store
String rootPath = AVMConstants.buildAVMStoreWebappPath(store, webapp); String rootPath = AVMConstants.buildAVMStoreWebappPath(store, webapp);

10
source/java/org/alfresco/web/bean/wcm/SandboxFactory.java
View File

@@ -75,7 +75,7 @@ public final class SandboxFactory
// create the 'staging' store for the website // create the 'staging' store for the website
String stagingStore = AVMConstants.buildAVMStagingStoreName(name); String stagingStore = AVMConstants.buildAVMStagingStoreName(name);
avmService.createAVMStore(stagingStore); avmService.createStore(stagingStore);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Created staging sandbox store: " + stagingStore); logger.debug("Created staging sandbox store: " + stagingStore);
@@ -106,7 +106,7 @@ public final class SandboxFactory
// create the 'preview' store for the website // create the 'preview' store for the website
String previewStore = AVMConstants.buildAVMStagingPreviewStoreName(name); String previewStore = AVMConstants.buildAVMStagingPreviewStoreName(name);
avmService.createAVMStore(previewStore); avmService.createStore(previewStore);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Created staging sandbox store: " + previewStore); logger.debug("Created staging sandbox store: " + previewStore);
@@ -175,9 +175,9 @@ public final class SandboxFactory
// create the user 'main' store // create the user 'main' store
String userStore = AVMConstants.buildAVMUserMainStoreName(name, username); 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()) if (logger.isDebugEnabled())
logger.debug("Created user sandbox store: " + userStore); logger.debug("Created user sandbox store: " + userStore);
@@ -218,7 +218,7 @@ public final class SandboxFactory
// create the user 'preview' store // create the user 'preview' store
String previewStore = AVMConstants.buildAVMUserPreviewStoreName(name, username); String previewStore = AVMConstants.buildAVMUserPreviewStoreName(name, username);
avmService.createAVMStore(previewStore); avmService.createStore(previewStore);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Created user sandbox store: " + previewStore); logger.debug("Created user sandbox store: " + previewStore);

4
source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java
View File

@@ -174,7 +174,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent
String dateFilter = getDateFilter(); String dateFilter = getDateFilter();
if (dateFilter == null || dateFilter.equals(FILTER_DATE_ALL)) if (dateFilter == null || dateFilter.equals(FILTER_DATE_ALL))
{ {
versions = avmService.getAVMStoreVersions(sandbox); versions = avmService.getStoreVersions(sandbox);
} }
else else
{ {
@@ -201,7 +201,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent
{ {
throw new IllegalArgumentException("Unknown date filter mode: " + dateFilter); 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(); Map requestMap = context.getExternalContext().getRequestMap();
for (VersionDescriptor item : versions) for (VersionDescriptor item : versions)

2
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -296,7 +296,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
String mainStore = AVMConstants.buildAVMUserMainStoreName(storeRoot, username); String mainStore = AVMConstants.buildAVMUserMainStoreName(storeRoot, username);
// check it exists before we render the view // 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 // check the permissions on this store for the current user
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())