Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX *RECORD ONLY*
             41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
   44003: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to BRANCHES/DEV/V4.1-BUG-FIX:
            ALF-15210: Inconsistency in the '?' icon over the dashlets projects\slingshot\source\web\js\share.js DashletTitleBarActions_onReady() function was updated. Fix initialize the style for actionsNode elements into the DOM for IE.
   44004: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX:
            ALF-15793: edit offline hides version history projects\slingshot\source\web\components\document-details\document-actions.js onActionUploadNewVersion function was updated. Fix sets version variable correctly now using asset.workingCopy property instead asset.custom property, which is undefined.
   44018: ALF-16540 : CMIS: createDocument with VersioningState.CHECKEDOUT causes NodeLockedException for types with mandatory versionable aspect
            The ckeck for lock was disabled when beforeCreateVersion policy is handled.
            Version could be created for a locked node. 
   44054: Fix for ALF-16337. Datalist assignee not searchable by full name.
   44056: Trivial change. Fixing some compiler warnings under org.alfresco.repo.content.metadata including a noisy Tika one.
   44143: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
            42989: ALF-16331: Wrong user for "completed by" information provided in Group Review And Approve workflow
   44147: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
   44146: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_05_22 to BRANCHES/DEV/V3.4-BUG-FIX:
            37733: ALF-12051: Webdav - Cannot open files containing "?" character in the filename in WinXP
   44152: ALF-17009 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44151: ALF-14035 Tiny HTML file that causes Jodconverter to launch a 100% CPU soffice instance
               - HTML to PDF is now done via ODT as the direct transform hangs if there are <sub> tags in the HTML.
               - Added in 'unsupportedTransformations' to stop a bare transformer.JodConverter from doing HTML to PDF 
               - TransformerDebug test file debugTransformers.txt no longer needs to be 18 bytes, as it made it too fiddly.
               - Modified debug from RuntimeExec so less editing is required to running from the command line
            - Removed tabs that had been added to enterprise/content-services-context.xml in 4.1-BUG-FIX
   44192: ALF-16560 - CIFS: Word document version history lost after saving content in Word:mac 2011 on Mac Mountain Lion
   44224: ALF-16896 Exception with TIKA meta data extractor.
            - Patch POI to handle parsing of Unicode properties that starts on a 4 byte boundary
              rather than the specified offset. Example file was created using http://www.aspose.com/
   44241: Merged DEV to V4.1-BUG-FIX
            44208: ALF-14591 : Ordering not supported for IMAP properties defining IMAP sort fields in Share
                   Make properties from imap:imapContent aspect indexable for SOLR. 
   44253: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX:
            38927: CLOUD-128 - Update rules works incorrectly
          This is a partial fix for ALF-14568. The rest is coming in a separate check-in.
          I made some minor adjustments to this change - trivial spelling fix and whitespace changes.
   44257: ALF-16563 - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
   44260: Fix for ALF-16430 - List of values shown in alphabetical order in Share Forms. Values now only sorted if the Forms config 'field' element has the sorted='true' attribute.
   44269: Completion of fix for ALF-14568 - Update rule works incorrectly.
   44318: Fix for ALF-17055 - remoteadm webscript set a Last-Modified HTTP header whose date format does not conform to RFC 2616 hence breaking proxy caching
   44320: Fix for ALF-16463 - documentLibrary RSS feed does not pass the w3c validator, in particular pubDate breaks RFC-822, date not displayed when using non English locale
   44352: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX
            43860: ALF-16263: Search using a "Stop Word" not displaying any result

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

config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<channel rdf:about="http://www.alfresco.com/">
+<channel>
    <title>Alfresco - Wiki Page</title>
+   <link>${shareUrl}/proxy/alfresco-feed/slingshot/wiki/pages/${siteId}?format=rss</link>
    <description>Alfresco Wiki Page - Recent Changes</description>
-   <lastBuildDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</lastBuildDate>
+   <lastBuildDate><#assign locale_original=.locale><#setting locale="en_US">${date?string("EEE, dd MMM yyyy HH:mm:ss Z")}<#setting locale=locale_original></lastBuildDate>
-   <pubDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
+   <pubDate><#assign locale_original=.locale><#setting locale="en_US">${date?string("EEE, dd MMM yyyy HH:mm:ss Z")}<#setting locale=locale_original></pubDate>
    <generator>Alfresco ${server.edition} v${server.version}</generator>
    <image>
       <title>Alfresco - Wiki Page Recent Changes</title>
+      <link>${shareUrl}/proxy/alfresco-feed/slingshot/wiki/pages/${siteId}?format=rss</link>
       <url>${shareUrl}/proxy/alfresco/images/logo/AlfrescoLogo200.png</url>
    </image>
    <#list wiki.pages?sort_by(['modified'])?reverse as p>
@@ -16,7 +18,7 @@
    <item>
       <title>${(page.title!"")?html}</title>
       <link>${shareUrl}/page/site/${siteId}/wiki-page?title=${page.systemName?url('UTF-8')}</link>
-      <pubDate>${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
+      <pubDate><#assign locale_original=.locale><#setting locale="en_US">${page.modifiedAt?string("EEE, dd MMM yyyy HH:mm:ss Z")}<#setting locale=locale_original></pubDate>
       <guid isPermaLink="false">${node.id}</guid>
    </item>
 </#list>

source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java

@@ -24,11 +24,14 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.io.Writer;
 import java.net.SocketException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -110,6 +113,12 @@ public class ADMRemoteStore extends BaseRemoteStore
     private ContentService contentService;
     private HiddenAspect hiddenAspect;
     
+    /**
+     * Date format pattern used to parse HTTP date headers in RFC 1123 format.
+     */
+    private static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
+    private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
+    
     
     /**
      * @param nodeService       the NodeService to set
@@ -249,7 +258,9 @@ public class ADMRemoteStore extends BaseRemoteStore
                     // set mimetype for the content and the character encoding + length for the stream
                     res.setContentType(mimetype);
                     res.setContentEncoding(reader.getEncoding());
-                    res.setHeader("Last-Modified", Long.toString(fileInfo.getModifiedDate().getTime()));
+                    SimpleDateFormat formatter = new SimpleDateFormat(PATTERN_RFC1123, Locale.US);
+                    formatter.setTimeZone(GMT);
+                    res.setHeader("Last-Modified", formatter.format(fileInfo.getModifiedDate()));
                     res.setHeader("Content-Length", Long.toString(reader.getSize()));
                     
                     if (logger.isDebugEnabled())

source/java/org/alfresco/repo/webdav/WebDAVHelper.java

@@ -639,24 +639,9 @@ public class WebDAVHelper
     }
     
     public final static String encodeURL(String s, String userAgent)
-    {
-        try
-        {
-            if (userAgent != null && (userAgent.startsWith(WebDAV.AGENT_MICROSOFT_DATA_ACCESS_INTERNET_PUBLISHING_PROVIDER_DAV) 
-                    || userAgent.contains(WebDAV.AGENT_INTERNET_EXPLORER)))
-            {
-                return encodeUrlReservedSymbols(s);
-            }
-            else
     {
           return URLEncoder.encode(s);
     }
-        }
-        catch (UnsupportedEncodingException err)
-        {
-            throw new RuntimeException(err);
-        }
-    }
     
     public final static String decodeURL(String s)
     {