inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2009-06-17 12:44:32 +00:00
parent 1446ed220d
commit 3a37812a85
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/web/forms/xforms/XFormsBean.java
View File

@@ -574,34 +574,34 @@ public class XFormsBean implements Serializable
request.getContextPath() + "/wcservice"); request.getContextPath() + "/wcservice");
String rewrittenURI = uri; String rewrittenURI = uri;
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); final String storeId = AVMUtil.getStoreName(cwdAvmPath);
rewrittenURI = uri.replace("${storeid}", storeId); rewrittenURI = uri.replace("${storeid}", storeId);
} }
else if (uri.contains("{storeid}"))
{
final String storeId = AVMUtil.getStoreName(cwdAvmPath);
rewrittenURI = uri.replace("{storeid}", storeId);
}
else else
{ {
if (LOGGER.isDebugEnabled()) if (LOGGER.isDebugEnabled())
LOGGER.debug("no store id specified in webscript URI " + uri); LOGGER.debug("no store id specified in webscript URI " + uri);
} }
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(); AuthenticationService authenticationService = Repository.getServiceRegistry(facesContext).getAuthenticationService();
final String ticket = authenticationService.getCurrentTicket(); final String ticket = authenticationService.getCurrentTicket();
rewrittenURI = rewrittenURI.replace("${ticket}", ticket); 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 else
{ {
if (LOGGER.isDebugEnabled()) if (LOGGER.isDebugEnabled())