From 20a6e0cf2b55e078c7739d6c79ff9fdd08c4bfa3 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Wed, 13 Jun 2012 19:48:38 +0000 Subject: [PATCH] Merged V4.0-BUG-FIX to HEAD 37623: ALF-14183: Additional NP check for transition-id when building model 37626: ALF-13888: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (missed merge) 33425: Merged DEV to V3.4-BUG-FIX 33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request. 37630: Process queued responses at the end of the thread request run, before re-enabling socket read events. ALF-14179, ALF-14180. 37636: REVERSE Merge to V4.0-BUG-FIX (4.0.3) << Now that ALF-13933 allows startup of OpenOffice/LibreOffice and JOD transformers from Java (even on Mac), this hack is no longer required. >> << The hack started up OpenOffice from the cmd line so OpenOffice transformer would be working but not JOD. >> << The bitrock alfresco.sh and openoffice.xml fiels are now identical between V3.4-BUG-FIX and V4.0-BUG-FIX >> 32952: ALF-7944: OSX OOo started by script not by subsystem now 37647: RECORD ONLY Merge V4.0 (4.0.2) to V4.0-BUG-FIX (4.0.3) 37646: Merge to V4.0-BUG-FIX (4.0.3) to V4.0 (4.0.2) 37636: REVERSE Merge to V4.0-BUG-FIX (4.0.3) << Now that ALF-13933 allows startup of OpenOffice/LibreOffice and JOD transformers from Java (even on Mac), this hack is no longer required. >> << The hack started up OpenOffice from the cmd line so OpenOffice transformer would be working but not JOD. >> << The bitrock alfresco.sh and openoffice.xml fiels are now identical between V3.4-BUG-FIX and V4.0-BUG-FIX >> 32952: ALF-7944: OSX OOo started by script not by subsystem now 37657: Websphere libraries.xml has regressed due to ALF-12477 37667: ALF-14307: Upgraded Activiti lib, preventing diagram-generation on process-definition query when initial deploy-time generation failed 37676: Fix for ALF-14489 - Link with special charaters (i.e. &) in Site Activities doesn't work properly Note: 4.0 fix is different to 3.4 fix as wiki webscripts have all been converted to Java backed webscripts) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 37673: *Record only* Fix for ALF-14489 - Link with special charaters (i.e. &) in Site Activities doesn't work properly 37708: Increase version to 4.0.4 (4.0.3 being now dedicated to Cloud Sync) 37722: RECORD ONLY Merge V4.0 (4.0.2) to V4.0-BUG-FIX (4.0.3) 37679: ALF-14469: Reversed the reverse merge 37656, therefore reinstating ALF-13013 as it was actually a QA configuration problem! 37664: ALF-14053: Merged V4.0-BUG-FIX (4.0.3) to V4.0 (4.0.2) Missing commits that removed $DYLD_LIBRARY_PATH from the environment. Had thought they were already in V4.0. 37353: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) 37352: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Build test failure 37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations ALF-13452 Open office startup from Java not working on OSX - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and ure-link is a directory rather than a file on mac) - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels (saves N.N.N.N.N.N getting mixed up with text) 37656: Reverse merged 34391 and fix to ALF-13013 because it causes regression ALF-14469 on Websphere 37746: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 37742: ALF-12486: Share - Calendar does not save past events - Fix reviewed by David We 37743: ALF-14340: Merged HEAD to V3.4-BUG-FIX 35582: ALF-8601: Alfresco installs different ImageMagick versions on different stacks - Now 6.5.6 is installed on all platforms 37748: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 37655: ALF-14465: Bitrock installer: Advanced installation (apply AMP) finishes with error - added -force option to installer bundles - added warning (regardless of verbose flag) when files will be overwritten - added -help option (requested by product management) - removed replicated png from RM - reorganised code to differentiate between an install failure and command line parse failure. 37658: ALF-13063: Trailing spaces after the DB2 JDBC class name, causing me hours of puzzlement - Improved the URL so you get error messages out of the database 37663: ALF-13499: Share - Permissions page in the repository shows the groupid instead of displayname 37666: Fixed ALF-10790: DMDeploymentTargetTest consistently failing on SQL Server - Text match for 'fk_alf_cass_' in error message, which covers all FK violations but excludes the unique constraint - This is also a refix for ALF-10581, which should probably be retested 37697: ALF-11911 - Share: unable to externalise the raw role name 37712: Improvements to Forms runtime to handle empty json response when AccessDeniedException is thrown from the repository. Noticed during ALF-9861 investigation. 37744: ALF-14340: Patch from Bitrock to include Ghostscript with Windows-installed ImageMagick (already included with Unix versions) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/slingshot/documentlibrary/permissions.get.js | 6 ++---- .../repo/web/scripts/wiki/AbstractWikiWebScript.java | 3 ++- source/java/org/alfresco/repo/webdav/WebDAV.java | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js index 1cc10c68f4..3db6b1dbf4 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/permissions.get.js @@ -66,7 +66,7 @@ function parsePermissions(p_permissions, p_settable) { var results = [], settable = {}, - tokens, authority, authorityId, nameProperty, role, i, ii; + tokens, authority, authorityId, role, i, ii; // Settable array into object for "x in y" style operations for (i = 0, ii = p_settable.length; i < ii; i++) @@ -90,7 +90,6 @@ function parsePermissions(p_permissions, p_settable) if (authorityId.indexOf("GROUP_") === 0) { authority = Common.getGroup(authorityId); - nameProperty = "shortName"; } else if (authorityId.indexOf("ROLE_") === 0) { @@ -104,7 +103,6 @@ function parsePermissions(p_permissions, p_settable) else { authority = Common.getPerson(authorityId); - nameProperty = "displayName"; } if (authority != null) @@ -115,7 +113,7 @@ function parsePermissions(p_permissions, p_settable) { avatar: authority.avatar || null, name: authorityId, - displayName: authority[nameProperty] + displayName: authority["displayName"] }, role: role }); diff --git a/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java b/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java index 92e2229a18..96ebad322e 100644 --- a/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/wiki/AbstractWikiWebScript.java @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import org.springframework.extensions.surf.util.URLEncoder; import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.Status; @@ -140,7 +141,7 @@ public abstract class AbstractWikiWebScript extends DeclarativeWebScript JSONWriter activity = new JSONWriter(activityJson); activity.startObject(); activity.writeValue("title", wikiPage.getTitle()); - activity.writeValue("page", page + "?title=" + wikiPage.getSystemName()); + activity.writeValue("page", page + "?title=" + URLEncoder.encodeUriComponent(wikiPage.getSystemName())); activity.endObject(); activityService.postActivity( diff --git a/source/java/org/alfresco/repo/webdav/WebDAV.java b/source/java/org/alfresco/repo/webdav/WebDAV.java index 99085310e2..7dcddc789e 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAV.java +++ b/source/java/org/alfresco/repo/webdav/WebDAV.java @@ -19,7 +19,6 @@ package org.alfresco.repo.webdav; import java.io.Serializable; -import java.net.URLDecoder; import java.util.Date; import java.util.Hashtable; import java.util.Locale; @@ -368,7 +367,7 @@ public class WebDAV try { - strPath = URLDecoder.decode( request.getRequestURI(), "UTF-8"); + strPath = WebDAVHelper.decodeURL(request.getRequestURI()); } catch (Exception ex) {} @@ -503,7 +502,7 @@ public class WebDAV try { - strNormalized = URLDecoder.decode(strPath, "UTF-8"); + strNormalized = WebDAVHelper.decodeURL(strPath); } catch (Exception ex) {