Merged 5.2.N (5.2.1) to HEAD (5.2)

131775 rneamtu:       Reverse merged 5.2.N (5.2.1)
            131742 rneamtu: SHA-1629 : Creating a link to file in a different location
               - Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.desc.xml

@@ -41,23 +41,12 @@
      			<![CDATA[{ "destinationNodeRef" : string }]]>
      		</type>
      	</request>
-     	<request>
-        	<format>json</format>
-      		<type>
-        	<![CDATA[
-        	{
-          		"destinationNodeRef": string,
-          		"multipleFiles": string
-        	}
-        	]]>
-      		</type>
-    	</request>
    </requests>
    <responses>
      	<response>
      		<format>json</format>
      		<type>
-     			<![CDATA[{ "result" : string }]]>
+     			<![CDATA[{ "linkNodeRef" : string }]]>
      		</type>
      	</response>
    </responses>

config/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.json.ftl

@@ -1,16 +1,5 @@
 <#escape x as jsonUtils.encodeJSONString(x)>
 {
- "linkNodes" : 
+	"linkNodeRef": "${linkNodeRef}"
- [
-	<#list results as result>
-	{
-	 	"nodeRef" : "${result.nodeRef}"
-	}
-		<#if result_has_next>,</#if>
-	</#list>
- ],
- "successCount": "${successCount}",
- "failureCount": "${failureCount}",
- "overallSuccess": "${overallSuccess?c}"
 }
 </#escape>

config/alfresco/web-scripts-application-context.xml

@@ -1846,7 +1846,6 @@
         <property name="nodeService" ref="NodeService" />
         <property name="siteService" ref="SiteService" />
         <property name="documentLinkService" ref="DocumentLinkService" />
-        <property name="activityService" ref="activityService"/>
    </bean>
 
    <bean id="webscript.org.alfresco.repository.doclink.doclinks.delete"
@@ -1855,7 +1854,6 @@
         <property name="nodeService" ref="NodeService" />
         <property name="siteService" ref="SiteService" />
         <property name="documentLinkService" ref="DocumentLinkService" />
-        <property name="activityService" ref="activityService"/>
    </bean>
 
    <!-- CMM - Custom model import API -->

source/java/org/alfresco/repo/web/scripts/doclink/AbstractDocLink.java

@@ -25,14 +25,10 @@
  */
 package org.alfresco.repo.web.scripts.doclink;
 
-import java.io.StringWriter;
 import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.web.scripts.links.AbstractLinksWebScript;
-import org.alfresco.service.cmr.activities.ActivityService;
-import org.alfresco.service.cmr.links.LinkInfo;
 import org.alfresco.service.cmr.repository.DocumentLinkService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -40,15 +36,9 @@ import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.util.ParameterCheck;
 import org.alfresco.util.PropertyCheck;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONStringer;
-import org.json.simple.JSONObject;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptException;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.springframework.extensions.webscripts.json.JSONWriter;
 
 /**
  * This class contains common code for doclink webscripts controllers
@@ -65,14 +55,9 @@ public abstract class AbstractDocLink extends DeclarativeWebScript
     private static String PARAM_CONTAINER = "container";
     private static String PARAM_PATH = "path";
 
-    private static final String ACTIVITY_TOOL = "documentLinkService";
-
     protected NodeService nodeService;
     protected SiteService siteService;
     protected DocumentLinkService documentLinkService;
-    protected ActivityService activityService;
-
-    private static Log logger = LogFactory.getLog(AbstractDocLink.class);
 
     protected NodeRef parseNodeRefFromTemplateArgs(Map<String, String> templateVars)
     {
@@ -142,35 +127,6 @@ public abstract class AbstractDocLink extends DeclarativeWebScript
         return null;
     }
 
-    /**
-     * Generates an activity entry for the link
-     */
-
-    protected void addActivityEntry(String activityType, String title, String nodeRef, String site)
-    {
-       try
-       {
-          StringWriter activityJson = new StringWriter();
-          JSONWriter activity = new JSONWriter(activityJson);
-          activity.startObject();
-          activity.writeValue("title", title);
-          activity.writeValue("nodeRef", nodeRef);
-          activity.writeValue("page", "document-details?nodeRef=" + nodeRef);
-          activity.endObject();
-
-          activityService.postActivity(
-                activityType,
-                site,
-                ACTIVITY_TOOL,
-                activityJson.toString());
-       }
-       catch (Exception e)
-       {
-          // Warn, but carry on
-          logger.warn("Error adding link event to activities feed", e);
-       }
-    }
-
     public void setNodeService(NodeService nodeService)
     {
         this.nodeService = nodeService;
@@ -185,9 +141,4 @@ public abstract class AbstractDocLink extends DeclarativeWebScript
     {
         this.documentLinkService = documentLinkService;
     }
-
-    public void setActivityService(ActivityService activityService)
-    {
-        this.activityService = activityService;
-    }
 }

source/java/org/alfresco/repo/web/scripts/doclink/DocLinkPost.java

@@ -26,19 +26,13 @@
 package org.alfresco.repo.web.scripts.doclink;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.activities.ActivityType;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.ParameterCheck;
-import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
@@ -56,8 +50,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
  */
 public class DocLinkPost extends AbstractDocLink
 {
-    private static final String PARAM_DESTINATION_NODE = "destinationNodeRef";
+    private static String PARAM_DESTINATION_NODE = "destinationNodeRef";
-    private static final String PARAM_MULTIPLE_FILES = "multipleFiles";
 
     @Override
     protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
@@ -101,82 +94,7 @@ public class DocLinkPost extends AbstractDocLink
         ParameterCheck.mandatoryString("destinationNodeParam", destinationNodeParam);
         destinationNodeRef = new NodeRef(destinationNodeParam);
 
-        List<NodeRef> nodeRefs = new ArrayList<NodeRef>();
+        /* Create link */
-        if (json.containsKey(PARAM_MULTIPLE_FILES))
-        {
-            JSONArray multipleFiles = (JSONArray) json.get(PARAM_MULTIPLE_FILES);
-            for (int i = 0; i < multipleFiles.size(); i++)
-            {
-                String nodeRefString = (String) multipleFiles.get(i);
-                if (nodeRefString != null)
-                {
-                    try
-                    {
-                        NodeRef nodeRefToCreateLink = new NodeRef(nodeRefString);
-                        nodeRefs.add(nodeRefToCreateLink);
-                    }
-                    catch (AlfrescoRuntimeException ex)
-                    {
-                        throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid Arguments: " + ex.getMessage());
-                    }
-                   
-                }
-            }
-        }
-        else
-        {
-            nodeRefs.add(sourceNodeRef);
-        }
-
-        // getSite for destination folder
-        String siteName = siteService.getSiteShortName(destinationNodeRef);
-        
-        ArrayList<Object> linksResults = new ArrayList<Object>();
-        Map<String, Object> linkResult = new HashMap<String, Object>();
-        NodeRef linkNodeRef = null;
-        int successCount = 0;
-        int failureCount = 0;
-
-        if (nodeRefs != null && nodeRefs.size() > 0)
-        {
-            for (NodeRef sourceNode : nodeRefs)
-            {
-                /* Create link */
-                linkNodeRef = createLink(destinationNodeRef, sourceNode);
-
-                if (linkNodeRef != null)
-                {
-                    String sourceName = (String) nodeService.getProperty(sourceNode, ContentModel.PROP_NAME);
-                    if (siteName != null)
-                    {
-                        addActivityEntry(ActivityType.DOCLINK_CREATED, sourceName, sourceNode.toString(), siteName);
-                    }
-
-                    linkResult.put("nodeRef", linkNodeRef.toString());
-                    linksResults.add(linkResult);
-                    successCount++;
-                }
-            }
-        }
-
-        failureCount = nodeRefs.size() - successCount;
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("results", linksResults);
-        model.put("successCount", successCount);
-        model.put("failureCount", failureCount);
-        model.put("overallSuccess", failureCount == 0);
-        return model;
-    }
-
-    /**
-     * Create link for sourceNodeRef in destinationNodeRef location
-     * 
-     * @param destinationNodeRef
-     * @param sourceNodeRef
-     * @return
-     */
-    private NodeRef createLink(NodeRef destinationNodeRef, NodeRef sourceNodeRef)
-    {
         NodeRef linkNodeRef = null;
         try
         {
@@ -184,16 +102,16 @@ public class DocLinkPost extends AbstractDocLink
         }
         catch (IllegalArgumentException ex)
         {
-            if (ex.getMessage().contains("filelink") || ex.getMessage().contains("folderLink"))
-            {
-                return null;
-            }
             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid Arguments: " + ex.getMessage());
         }
         catch (AccessDeniedException e)
         {
             throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to perform this operation");
         }
-        return linkNodeRef;
+
+        /* Build response */
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("linkNodeRef", linkNodeRef.toString());
+        return model;
     }
 }