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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59886: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59621: Merged DEV to V4.2-BUG-FIX
         58258: MNT-10038 : CIFS and FTP accessing repo without transactions for MNT-9806
         58307: MNT-10038 - MNT-9806 Corrected transaction test error in ContentDiskDriverTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 08:15:52 +00:00
parent 3288e9dc06
commit dbcef62a9c
5 changed files with 146 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
source/java/org/alfresco/filesys/repo/CifsHelper.java
View File

@@ -18,6 +18,7 @@
package org.alfresco.filesys.repo;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,6 +31,7 @@ import java.util.Stack;
import java.util.StringTokenizer;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.filesys.repo.CommandExecutorImpl.PropagatingException;
import org.alfresco.jlan.server.filesys.FileAttribute;
import org.alfresco.jlan.server.filesys.FileExistsException;
import org.alfresco.jlan.server.filesys.FileName;
@@ -38,6 +40,8 @@ import org.alfresco.jlan.util.WildCard;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.filefolder.HiddenAspect;
import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.LockStatus;
@@ -79,6 +83,7 @@ public class CifsHelper
private PermissionService permissionService;
private LockService lockService;
private HiddenAspect hiddenAspect;
private RetryingTransactionHelper retryingTransactionHelper;
private Set<QName> excludedTypes = new HashSet<QName>();
@@ -99,6 +104,7 @@ public class CifsHelper
PropertyCheck.mandatory(this, "permissionService",permissionService);
PropertyCheck.mandatory(this, "lockService",lockService);
PropertyCheck.mandatory(this, "mimetypeService",mimetypeService);
PropertyCheck.mandatory(this, "transactionHelper",getRetryingTransactionHelper());
}
public void setDictionaryService(DictionaryService dictionaryService)
@@ -184,6 +190,89 @@ public class CifsHelper
return false;
}
}
/**
* Extract a single node's file info, where the node is reference by
* a path relative to an ancestor node.
*
* @param pathRootNodeRef
* @param path the path
* @return Returns the existing node reference
* @throws FileNotFoundException
*/
public ContentFileInfo getFileInformation(final NodeRef pathRootNodeRef, final String path, final boolean readOnly, final boolean lockedFilesAsOffline) throws FileNotFoundException
{
RetryingTransactionCallback<ContentFileInfo> cb = new RetryingTransactionCallback<ContentFileInfo>()
{
/**
* Perform a set of commands as a unit of transactional work.
*
* @return Return the result of the unit of work
* @throws Throwable This can be anything and will guarantee either a retry or a rollback
*/
public ContentFileInfo execute() throws IOException
{
try
{
return getFileInformationImpl(pathRootNodeRef, path, readOnly, lockedFilesAsOffline);
}
catch (FileNotFoundException e)
{
// Ensure original checked IOExceptions get propagated
throw new PropagatingException(e);
}
}
};
try
{
return getRetryingTransactionHelper().doInTransaction(cb, true);
}
catch(PropagatingException pe)
{
// Unwrap checked exceptions
throw (FileNotFoundException) pe.getCause();
}
}
public ContentFileInfo getFileInformation(final NodeRef nodeRef, final boolean readOnly, final boolean lockedFilesAsOffline) throws FileNotFoundException
{
RetryingTransactionCallback<ContentFileInfo> cb = new RetryingTransactionCallback<ContentFileInfo>()
{
/**
* Perform a set of commands as a unit of transactional work.
*
* @return Return the result of the unit of work
* @throws Throwable This can be anything and will guarantee either a retry or a rollback
*/
public ContentFileInfo execute() throws IOException
{
try
{
return getFileInformationImpl(nodeRef, readOnly, lockedFilesAsOffline);
}
catch (FileNotFoundException e)
{
// Ensure original checked IOExceptions get propagated
throw new PropagatingException(e);
}
}
};
try
{
return getRetryingTransactionHelper().doInTransaction(cb, true);
}
catch(PropagatingException pe)
{
// Unwrap checked exceptions
throw (FileNotFoundException) pe.getCause();
}
}
/**
* Extract a single node's file info, where the node is reference by
@@ -194,13 +283,14 @@ public class CifsHelper
* @return Returns the existing node reference
* @throws FileNotFoundException
*/
public ContentFileInfo getFileInformation(NodeRef pathRootNodeRef, String path, boolean readOnly, boolean lockedFilesAsOffline) throws FileNotFoundException
public ContentFileInfo getFileInformationImpl(NodeRef pathRootNodeRef, String path, boolean readOnly, boolean lockedFilesAsOffline) throws FileNotFoundException
{
// get the node being referenced
NodeRef nodeRef = getNodeRef(pathRootNodeRef, path);
return getFileInformation(nodeRef, readOnly, lockedFilesAsOffline);
return getFileInformationImpl(nodeRef, readOnly, lockedFilesAsOffline);
}
/**
* Helper method to extract file info from a specific node.
@@ -215,7 +305,7 @@ public class CifsHelper
* @return Returns the file information pertinent to the node
* @throws FileNotFoundException if the path refers to a non-existent file
*/
public ContentFileInfo getFileInformation(NodeRef nodeRef, boolean readOnly, boolean lockedFilesAsOffline) throws FileNotFoundException
private ContentFileInfo getFileInformationImpl(NodeRef nodeRef, boolean readOnly, boolean lockedFilesAsOffline) throws FileNotFoundException
{
// get the file info
org.alfresco.service.cmr.model.FileInfo fileFolderInfo = fileFolderService.getFileInfo(nodeRef);
@@ -732,6 +822,31 @@ public class CifsHelper
}
}
/**
* Return the file name for a node
*
* @param nodeRef NodeRef of node to get the file name
* @return String or null if the nodeRef is not valid
*/
public String getFileName(final NodeRef nodeRef)
{
RetryingTransactionCallback<String> cb = new RetryingTransactionCallback<String>()
{
/**
* Perform a set of commands as a unit of transactional work.
*
* @return Return the result of the unit of work
* @throws Throwable This can be anything and will guarantee either a retry or a rollback
*/
public String execute() throws IOException
{
return getFileName(nodeRef);
}
};
return getRetryingTransactionHelper().doInTransaction(cb, true);
}
/**
* Return the file name for a node
*
@@ -739,7 +854,7 @@ public class CifsHelper
* @return String
* @throws FileNotFoundException
*/
public String getFileName(NodeRef node)
public String getFileNameImpl(NodeRef node)
{
String fname = null;
@@ -782,4 +897,12 @@ public class CifsHelper
return lockService;
}
public void setRetryingTransactionHelper(RetryingTransactionHelper retryingTransactionHelper) {
this.retryingTransactionHelper = retryingTransactionHelper;
}
public RetryingTransactionHelper getRetryingTransactionHelper() {
return retryingTransactionHelper;
}
}

6
source/java/org/alfresco/filesys/repo/ContentSearchContext.java
View File

@@ -287,13 +287,7 @@ public class ContentSearchContext extends SearchContext
StringBuilder pathStr = new StringBuilder( m_relPath);
pathStr.append ( info.getFileName());
// Set the file id
long id = DefaultTypeConverter.INSTANCE.convert(Long.class, cifsHelper.getNodeService().getProperty(nextNodeRef, ContentModel.PROP_NODE_DBID));
info.setFileId((int) (id & 0xFFFFFFFFL));
// Check if this is a link node
if ( nextInfo.isLinkNode())
{
// Set a dummy file size for the link data that will be generated if/when the file is opened