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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
View File

@@ -59,9 +59,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
private QName type;
private String icon;
// // WCM
// transient protected AVMService avmService;
//
private List<String> customPasteViewIds;
@@ -93,21 +90,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
this.customPasteViewIds = customPasteViewIds;
}
// // WCM
// public void setAvmService(AVMService avmService)
// {
// this.avmService = avmService;
// }
//
// protected AVMService getAvmService()
// {
// if (avmService == null)
// {
// avmService = getServiceRegistry().getAVMLockingAwareService();
// }
// return avmService;
// }
//
public ClipboardStatus getMode()
{
return this.mode;
@@ -226,29 +208,4 @@ abstract class AbstractClipboardItem implements ClipboardItem
return (nodeRefs.size() != 0);
}
//
// // WCM
// protected void recursiveFormCheck(AVMNodeDescriptor desc)
// {
// if (desc.isFile())
// {
// String filePath = desc.getPath();
// if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
// {
// avmService.removeAspect(filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
// }
// if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_RENDITION))
// {
// avmService.removeAspect(filePath, WCMAppModel.ASPECT_RENDITION);
// }
// }
// else
// {
// Map<String, AVMNodeDescriptor> listing = getAvmService().getDirectoryListing(desc);
// for (Map.Entry<String, AVMNodeDescriptor> entry : listing.entrySet())
// {
// recursiveFormCheck(entry.getValue());
// }
// }
// }
}

12
source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
View File

@@ -330,16 +330,6 @@ public class ClipboardBean implements Serializable
{
item = new WorkspaceClipboardItem(ref, parent, mode, customPasteViewIds);
}
// // WCM
// else if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()))
// {
// item = new AVMClipboardItem(ref, mode, customPasteViewIds);
// }
// else
// {
// logger.warn("Unable to add item to clipboard - unknown store protocol: " + ref.getStoreRef().getProtocol());
// }
//
if (item != null)
{
// check for duplicates first
@@ -364,8 +354,6 @@ public class ClipboardBean implements Serializable
FacesContext context = FacesContext.getCurrentInstance();
if (Application.getClientConfig(context).isClipboardStatusVisible())
{
// // WCM
// String pattern = Application.getMessage(context, StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()) ? "node_added_clipboard_avm" : "node_added_clipboard");
String pattern = Application.getMessage(context, "node_added_clipboard");
String msg = MessageFormat.format(pattern, items.size());
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);

94
source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
View File

@@ -55,7 +55,6 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
private static final long serialVersionUID = -1686557602737846009L;
private static final String WORKSPACE_PASTE_VIEW_ID = "/jsp/browse/browse.jsp";
// private static final String AVM_PASTE_VIEW_ID = "/jsp/wcm/browse-sandbox.jsp"; // WCM
private static final String FORUMS_PASTE_VIEW_ID = "/jsp/forums/forums.jsp";
private static final String FORUM_PASTE_VIEW_ID = "/jsp/forums/forum.jsp";
@@ -96,24 +95,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
*/
public boolean canCopyToViewId(String viewId)
{
// // WCM
// if (AVM_PASTE_VIEW_ID.equals(viewId))
// {
// AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), AVMBrowseBean.BEAN_NAME);
// String destPath = avmBrowseBean.getCurrentPath();
//
// if (WCMUtil.isStagingStore(WCMUtil.getStoreName(destPath)))
// {
// return false;
// }
//
// return true;
// }
// else
{
return super.canCopyToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || /*AVM_PASTE_VIEW_ID.equals(viewId) || WCM */
FORUMS_PASTE_VIEW_ID.equals(viewId) || FORUM_PASTE_VIEW_ID.equals(viewId));
}
return super.canCopyToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) ||
FORUMS_PASTE_VIEW_ID.equals(viewId) || FORUM_PASTE_VIEW_ID.equals(viewId));
}
/**
@@ -121,8 +104,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
*/
public boolean canMoveToViewId(String viewId)
{
return super.canMoveToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
FORUM_PASTE_VIEW_ID.equals(viewId));
return super.canMoveToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
FORUM_PASTE_VIEW_ID.equals(viewId));
}
/**
@@ -346,75 +329,6 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
}
return true;
}
// // WCM
// else if (AVM_PASTE_VIEW_ID.equals(viewId))
// {
// AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME);
//
// final String destPath = avmBrowseBean.getCurrentPath();
// final NodeRef destRef = AVMNodeConverter.ToNodeRef(-1, destPath);
//
// final CrossRepositoryCopyService crossRepoCopyService = getServiceRegistry().getCrossRepositoryCopyService();
//
// // initial name to attempt the copy of the item with
// String name = getName();
//
// for(;;)
// {
// try
// {
// final String currentName = name;
//
// // attempt each copy/paste in its own transaction
// retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
// {
// public Void execute() throws Throwable
// {
// if (getMode() == ClipboardStatus.COPY)
// {
// // COPY operation
// if (logger.isDebugEnabled())
// logger.debug("Attempting to copy node: " + getNodeRef() + " into node ID: " + destRef.toString());
//
// // inter-store copy operation
// crossRepoCopyService.copy(getNodeRef(), destRef, currentName);
//
// if (destRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
// {
// // ETHREEOH-2110
// AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + currentName);
// recursiveFormCheck(desc);
// }
// }
// else
// {
// // this should not occur as the canMoveToViewId() will return false
// throw new Exception("Move operation not supported between stores.");
// }
// return null;
// }
// });
//
// // We got here without error, so no need to loop with a new name
// break;
// }
// catch (FileExistsException fileExistsErr)
// {
// // If mode is COPY, have another go around the loop with a new name
// if (getMode() == ClipboardStatus.COPY)
// {
// String copyOf = Application.getMessage(fc, MSG_COPY_OF);
// name = copyOf + ' ' + name;
// }
// else
// {
// // we should not rename an item when it is being moved - so exit
// throw fileExistsErr;
// }
// }
// }
// return true;
// }
else
{
return false;