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

Merged V2.1 to HEAD

Browse Source 
6447: Office Add-Ins: Files which missed CHK-1041
   6448: Fix for WCM-692 (bug in parsing of port number in filesystem deployment)
   6449: Office Webscripts: Fix for typo when getting task resource nodes
   6450: Fix for WCM-707 (content launch section is shown when there is no workflow defined)
   6451: Removed unused AVM hooks in content stream listener
   6452: Bootstrap processes killed on VM shutdown.
   6453: Fix for WCM-720 - actions in Task Dialog were no longer available after lock checking added to client ui evaluators.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 22:18:29 +00:00
parent f44d8cb56c
commit eda4f77a59
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
View File

@@ -230,7 +230,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
if (fileServerDeployment) if (fileServerDeployment)
{ {
// remove the prefixed \\ // remove the prefixed \\
host = targetServer.substring(FILE_SERVER_PREFIX.length()); host = host.substring(FILE_SERVER_PREFIX.length());
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Performing file server deployment to " + host + ":" + port); logger.debug("Performing file server deployment to " + host + ":" + port);

7
source/java/org/alfresco/repo/content/RoutingContentService.java
View File

@@ -422,7 +422,7 @@ public class RoutingContentService implements ContentService
if (update) if (update)
{ {
// need a listener to update the node when the stream closes // need a listener to update the node when the stream closes
WriteStreamListener listener = new WriteStreamListener(nodeService, avmService, nodeRef, propertyQName, writer); WriteStreamListener listener = new WriteStreamListener(nodeService, nodeRef, propertyQName, writer);
writer.addListener(listener); writer.addListener(listener);
writer.setRetryingTransactionHelper(transactionHelper); writer.setRetryingTransactionHelper(transactionHelper);
} }
@@ -524,20 +524,17 @@ public class RoutingContentService implements ContentService
private static class WriteStreamListener implements ContentStreamListener private static class WriteStreamListener implements ContentStreamListener
{ {
private NodeService nodeService; private NodeService nodeService;
private AVMService avmService;
private NodeRef nodeRef; private NodeRef nodeRef;
private QName propertyQName; private QName propertyQName;
private ContentWriter writer; private ContentWriter writer;
public WriteStreamListener( public WriteStreamListener(
NodeService nodeService, NodeService nodeService,
AVMService avmService,
NodeRef nodeRef, NodeRef nodeRef,
QName propertyQName, QName propertyQName,
ContentWriter writer) ContentWriter writer)
{ {
this.nodeService = nodeService; this.nodeService = nodeService;
this.avmService = avmService;
this.nodeRef = nodeRef; this.nodeRef = nodeRef;
this.propertyQName = propertyQName; this.propertyQName = propertyQName;
this.writer = writer; this.writer = writer;
@@ -553,8 +550,6 @@ public class RoutingContentService implements ContentService
if (nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM)) if (nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
{ {
nodeService.setProperty(nodeRef, ContentModel.PROP_CONTENT, contentData); nodeService.setProperty(nodeRef, ContentModel.PROP_CONTENT, contentData);
// Pair<Integer, String> versionPath = AVMNodeConverter.ToAVMVersionPath(nodeRef);
// avmService.setContentData(versionPath.getSecond(), contentData);
} }
else else
{ {