mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Point checkin.
Reorg to allow sandbox-related constants to be accessed more easily from other compilation units. AVMConstants had become a dumping ground for things that had nothing to do with const values. Therefore, this is now AVMUtil, and sandbox-related constants have been moved to org.alfresco.sandbox.SandboxConstants, which builds in repository. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -49,7 +49,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.util.Pair;
|
||||
import org.alfresco.web.app.Application;
|
||||
import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.bean.wcm.AVMConstants;
|
||||
import org.alfresco.web.bean.wcm.AVMUtil;
|
||||
import org.alfresco.web.ui.common.Utils;
|
||||
import org.alfresco.web.ui.common.WebResources;
|
||||
import org.springframework.web.jsf.FacesContextUtils;
|
||||
@@ -382,7 +382,7 @@ public abstract class AbstractItemSelector extends UIInput
|
||||
{
|
||||
Pair<Integer, String> avmNode = AVMNodeConverter.ToAVMVersionPath(value);
|
||||
String avmPath = avmNode.getSecond();
|
||||
label = avmPath.substring(avmPath.indexOf(AVMConstants.DIR_ROOT)+4);
|
||||
label = avmPath.substring(avmPath.indexOf(AVMUtil.DIR_ROOT)+4);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.web.app.Application;
|
||||
import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.bean.wcm.AVMConstants;
|
||||
import org.alfresco.web.bean.wcm.AVMUtil;
|
||||
import org.alfresco.web.bean.wcm.WebProject;
|
||||
import org.alfresco.web.ui.repo.WebResources;
|
||||
import org.apache.commons.logging.Log;
|
||||
@@ -79,7 +79,7 @@ public class UIWebProjectFolderSelector extends AbstractItemSelector
|
||||
if (this.navigationId != null && this.navigationId.startsWith("-1;"))
|
||||
{
|
||||
String rootPath = "-1;" + JNDIConstants.DIR_DEFAULT_WWW + ";" + JNDIConstants.DIR_DEFAULT_APPBASE +
|
||||
";" + AVMConstants.DIR_ROOT;
|
||||
";" + AVMUtil.DIR_ROOT;
|
||||
|
||||
if (this.navigationId.equals(rootPath) == false)
|
||||
{
|
||||
@@ -123,13 +123,13 @@ public class UIWebProjectFolderSelector extends AbstractItemSelector
|
||||
{
|
||||
// get the root children for the sandbox of the current user
|
||||
WebProject webProject = new WebProject(new NodeRef(Repository.getStoreRef(), this.navigationId));
|
||||
this.avmStore = AVMConstants.buildUserMainStoreName(webProject.getStoreId(),
|
||||
this.avmStore = AVMUtil.buildUserMainStoreName(webProject.getStoreId(),
|
||||
Application.getCurrentUser(context).getUserName());
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Getting children for store: " + this.avmStore);
|
||||
|
||||
String rootPath = AVMConstants.buildStoreWebappPath(this.avmStore, AVMConstants.DIR_ROOT);
|
||||
String rootPath = AVMUtil.buildStoreWebappPath(this.avmStore, AVMUtil.DIR_ROOT);
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Root path for store: "+ rootPath);
|
||||
@@ -163,7 +163,7 @@ public class UIWebProjectFolderSelector extends AbstractItemSelector
|
||||
// if they have AddChildren there is probably a sandbox but check to make
|
||||
// sure as it could have been deleted
|
||||
WebProject webProject = new WebProject(node);
|
||||
String storeName = AVMConstants.buildUserMainStoreName(webProject.getStoreId(),
|
||||
String storeName = AVMUtil.buildUserMainStoreName(webProject.getStoreId(),
|
||||
currentUserName);
|
||||
AVMStoreDescriptor storeDesc = avmService.getStore(storeName);
|
||||
if (storeDesc != null)
|
||||
|
Reference in New Issue
Block a user