mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
11469: MT - fix ETHREEOH-227 11470: Added check for request method type so that GET requests are redirected to the web client and PROPFIND/OPTIONS requests are routed to the WebDAV servlet. Fix Vista WebDAV client as it walks the path when connecting using the WebDAV mini redirector. ETHREEOH-554. 11471: Merged V2.2 to V3.0 11317: Fix ETWOTWO-698 and ETWOTWO-743. 11472: Fix for ETHREEOH-505 11473: Added LMv2 support, fallback from NTLMv2 to NTLMv1 and NTLMv2 can be switched off by the implementation. 11474: Removed the Principal configuration parameter, no longer needed as it is picked up after the server side Kerberos logon. 11476: Missing URL encoding for site manager username in Site Profile dashlet. 11477: Fix to padding on User Welcome dashlet now it is scrollable. 11479: Fixed: ETHREEOH-150 Possible to add empty post or empty comment to a post at blog page 11480: Added calculation of the LMv2 HMAC. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -26,10 +26,10 @@ package org.alfresco.repo.avm.wf;
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler;
|
||||
import org.alfresco.sandbox.SandboxConstants;
|
||||
import org.alfresco.service.cmr.avm.AVMService;
|
||||
import org.alfresco.service.cmr.avmsync.AVMDifference;
|
||||
import org.alfresco.service.cmr.avmsync.AVMSyncService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.jbpm.graph.exe.ExecutionContext;
|
||||
@@ -81,9 +81,9 @@ public class AVMSubmitHandler extends JBPMSpringActionHandler
|
||||
return;
|
||||
}
|
||||
String webSiteName =
|
||||
fAVMService.getStoreProperty(storePath[0], QName.createQName(null, ".website.name")).
|
||||
fAVMService.getStoreProperty(storePath[0], SandboxConstants.PROP_WEBSITE_NAME).
|
||||
getStringValue();
|
||||
String avmDest = webSiteName + "-staging:" + storePath[1];
|
||||
String avmDest = webSiteName + ":" + storePath[1]; // note: it is implied that the website name is the same as staging name
|
||||
List<AVMDifference> diffs =
|
||||
fAVMSyncService.compare(-1, avmSource, -1, avmDest, null);
|
||||
// TODO fix update comments if needed.
|
||||
|
Reference in New Issue
Block a user