Merged V3.3-BUG-FIX to HEAD

22496: Merged V3.3 to V3.3-BUG-FIX
      22383: *Record only* Merged HEAD to V3.3
         22381: Fixes FTL syntax error in Calendar view webscript
      22404: *Record only* Merged HEAD to V3.3
         22403: Fixed ALF-4669: Delete Links (app:filelink) in Share deletes destination
      22409: Fixed ALF-2857: Links broken for updated discussions [Contribution]
      22449: Fix for ALF-3698 - Need to re-enable request-scoped javascript scopes for webscripts
              - Improvements to repo and web-tier JS script processsor config to allow "shared scope" feature to be disabled
              - Sealed shared scopes are used between script executions - processor config can now disabled this feature and ensure that a new scope is created for each executed script. Allows core JS objects to be extended in scripts.
      22454: ALF-3803 Fix for ISO8601 Date Format parser - milliseconds are optional.
      22455: Fix to handle non-200 status code in some Share dashlets.
             Missing I18N string in site profile dashlet.
      22456: SpringSurf contrib of ALF-3803 Fix for ISO8601 Date Format parser - milliseconds are optional.
      22457: SESURF-66 - Remote Client improvements
      22458: Merged BRANCHES/DEV/BELARUS/V3.3-2010_06_08 to BRANCHES/V3.3:
      20585: ALF-1861: Shortcut parent-child association path should align with the actual 'cm:name' property of the shortcut
      22464: ALF-1518 - Added support for Java System property "http.nonProxyHosts" in Remote Client
              - specifies a list of hosts that should *not* be proxied if the associated http.proxyHost property is set
      22475: Fix for SESURF-76 - contributed by Ooi Leng Chye.
      22484: Fix for ALF-4674 - added "max-age=0" to cache-control header for Download servlet to fix issues with content not always being re-requested after an update
              - brings the Download servlet inline with the ContentGet webscript that already does this

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

source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java

@@ -279,7 +279,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
                }
             }
             res.setDateHeader(HEADER_LAST_MODIFIED, modified.getTime());
-            res.setHeader(HEADER_CACHE_CONTROL, "must-revalidate");
+            res.setHeader(HEADER_CACHE_CONTROL, "must-revalidate max-age=0");
             res.setHeader(HEADER_ETAG, "\"" + Long.toString(modified.getTime()) + "\"");
          }
          

source/java/org/alfresco/web/bean/LinkPropertiesDialog.java

@@ -155,6 +155,13 @@ public class LinkPropertiesDialog extends BaseDialogBean
          NodeRef nodeRef = getEditableNode().getNodeRef();
          Map<String, Object> props = getEditableNode().getProperties();
          
+         //get the name and move the node as necessary
+         String name = (String) props.get(ContentModel.PROP_NAME);
+         if (name != null)
+         {
+            getFileFolderService().rename(nodeRef, name);
+         } 
+         
          Map<QName, Serializable> properties = this.getNodeService().getProperties(nodeRef);
          
          // we need to put all the properties from the editable bag back into 

source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java

@@ -160,7 +160,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
                      if (checkExists(name + LINK_NODE_EXTENSION, destRef) == false)
                      {
                         Map<QName, Serializable> props = new HashMap<QName, Serializable>(2, 1.0f);
-                        props.put(ContentModel.PROP_NAME, name + LINK_NODE_EXTENSION);
+                        String newName = name + LINK_NODE_EXTENSION;
+                        props.put(ContentModel.PROP_NAME, newName);
                         props.put(ContentModel.PROP_LINK_DESTINATION, getNodeRef());
                         if (dd.isSubClass(getType(), ContentModel.TYPE_CONTENT))
                         {
@@ -168,7 +169,7 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
                            ChildAssociationRef childRef = nodeService.createNode(
                                  destRef,
                                  ContentModel.ASSOC_CONTAINS,
-                                 assocRef.getQName(),
+                                 QName.createQName(assocRef.getQName().getNamespaceURI(), newName),
                                  ApplicationModel.TYPE_FILELINK,
                                  props);