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 
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:01:49 +00:00
parent eaff240152
commit 0baa0f74f4
284 changed files with 206 additions and 58844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -85,7 +85,6 @@ import org.alfresco.service.cmr.repository.NoTransformerException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
@@ -2033,19 +2032,9 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
{
ParameterCheck.mandatory("Destination Node", destination);
ScriptNode copy = null;
if (destination.getNodeRef().getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_WORKSPACE))
{
NodeRef copyRef = this.services.getCopyService().copyAndRename(this.nodeRef, destination.getNodeRef(),
ContentModel.ASSOC_CONTAINS, null, deepCopy);
copy = newInstance(copyRef, this.services, this.scope);
}
else
{
// NOTE: the deepCopy flag is not respected for this copy mechanism
copy = getCrossRepositoryCopyHelper().copy(this, destination, getName());
}
NodeRef copyRef = this.services.getCopyService().copyAndRename(this.nodeRef, destination.getNodeRef(),
ContentModel.ASSOC_CONTAINS, null, deepCopy);
ScriptNode copy = newInstance(copyRef, this.services, this.scope);
return copy;
}
@@ -3502,15 +3491,6 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
this.siteNameResolved = false;
}
/**
* @return helper object to perform cross repository copy of JavaScript Node objects
*/
protected CrossRepositoryCopy getCrossRepositoryCopyHelper()
{
return (CrossRepositoryCopy)this.services.getService(
QName.createQName("", CrossRepositoryCopy.BEAN_NAME));
}
/**
* Return a list or a single Node from executing an xpath against the parent Node.
*