From 3a37812a85fa777b7f06d0b5cc26e7284c7bb2da Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 17 Jun 2009 12:44:32 +0000 Subject: [PATCH] Merged V3.1 to HEAD 13857: Merged V2.2 to V3.1 7028-13041: (Record only) New merge path 13343: (Record onlY) Merged V3.1 to V2.2: 13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page 13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408 13363: Fix ETWOTWO-1022 (Virtual website not found - Bad host name) 13386: Fix ETWOTWO-1145: WCM Form web script include is not handling ${} token format 13387: (Record only) Removed dev from version label 13621: (Record only) Merged V3.1 to V2.2 13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work Fixes ETWOTWO-1012 13828: ETWOTWO-1171 - checkpoint (alternative patch: resetWCMToGroupBasedPermissions) 13845: ETWOTWO-1171 - alternative patch: resetWCMToGroupBasedPermissions (part 2 of 2 - set layered/shared acls) 13855: Fixed line endings 13856: ETWOTWO-1171 - minor fix: wcmPostPermissionSnapshot patch target schema should be 95 ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.2:r7028-12305,12307-12310,12312-12319,12321,... Merged /alfresco/BRANCHES/V3.1:r13857 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/forms/xforms/XFormsBean.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java index 4f8318cffa..6b07141879 100644 --- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java +++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java @@ -574,34 +574,34 @@ public class XFormsBean implements Serializable request.getContextPath() + "/wcservice"); String rewrittenURI = uri; - if (uri.contains("{storeid}")) - { - final String storeId = AVMUtil.getStoreName(cwdAvmPath); - rewrittenURI = uri.replace("{storeid}", storeId); - } - else if (uri.contains("${storeid}")) + if (uri.contains("${storeid}")) { final String storeId = AVMUtil.getStoreName(cwdAvmPath); rewrittenURI = uri.replace("${storeid}", storeId); } + else if (uri.contains("{storeid}")) + { + final String storeId = AVMUtil.getStoreName(cwdAvmPath); + rewrittenURI = uri.replace("{storeid}", storeId); + } else { if (LOGGER.isDebugEnabled()) LOGGER.debug("no store id specified in webscript URI " + uri); } - if (uri.contains("{ticket}")) - { - AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService(); - final String ticket = authenticationService.getCurrentTicket(); - rewrittenURI = rewrittenURI.replace("{ticket}", ticket); - } - else if (uri.contains("${ticket}")) + if (uri.contains("${ticket}")) { AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService(); final String ticket = authenticationService.getCurrentTicket(); rewrittenURI = rewrittenURI.replace("${ticket}", ticket); } + else if (uri.contains("{ticket}")) + { + AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService(); + final String ticket = authenticationService.getCurrentTicket(); + rewrittenURI = rewrittenURI.replace("{ticket}", ticket); + } else { if (LOGGER.isDebugEnabled())