mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +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:
@@ -37,7 +37,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.bean.wcm.WebProject;
|
||||
import org.alfresco.web.bean.wizard.IWizardBean;
|
||||
|
||||
@@ -64,10 +64,10 @@ public class CopyToWebProjectHandler extends BaseActionHandler
|
||||
if (destNodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_WORKSPACE))
|
||||
{
|
||||
WebProject webProject = new WebProject(destNodeRef);
|
||||
String storeName = AVMConstants.buildUserMainStoreName(webProject.getStoreId(),
|
||||
String storeName = AVMUtil.buildUserMainStoreName(webProject.getStoreId(),
|
||||
Application.getCurrentUser(FacesContext.getCurrentInstance()).getUserName());
|
||||
|
||||
String rootPath = AVMConstants.buildStoreWebappPath(storeName, AVMConstants.DIR_ROOT);
|
||||
String rootPath = AVMUtil.buildStoreWebappPath(storeName, AVMUtil.DIR_ROOT);
|
||||
destNodeRef = AVMNodeConverter.ToNodeRef(-1, rootPath);
|
||||
}
|
||||
|
||||
@@ -95,10 +95,10 @@ public class CopyToWebProjectHandler extends BaseActionHandler
|
||||
// get the destination path
|
||||
Pair<Integer, String> avmNode = AVMNodeConverter.ToAVMVersionPath(dest);
|
||||
String avmPath = avmNode.getSecond();
|
||||
folder = avmPath.substring(avmPath.indexOf(AVMConstants.DIR_ROOT)+4);
|
||||
folder = avmPath.substring(avmPath.indexOf(AVMUtil.DIR_ROOT)+4);
|
||||
|
||||
// get the destination web project name
|
||||
NodeRef webProjectNode = AVMConstants.getWebProjectNodeFromPath(avmPath);
|
||||
NodeRef webProjectNode = AVMUtil.getWebProjectNodeFromPath(avmPath);
|
||||
webProject = Repository.getNameForNode(
|
||||
Repository.getServiceRegistry(context).getNodeService(), webProjectNode);
|
||||
}
|
||||
|
Reference in New Issue
Block a user