Dave Ward a794361ac2 Merged V4.1-BUG-FIX to HEAD
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
   43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
   44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
         - NPE when there is no exception message
   44046: MERGE DEV to V4.1-BUG-FIX
     ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
   44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
   44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node.  If it exists it doesn't add it again.
   44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
   44319: Latest installer translations from Gloria
   44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
      44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
         << Regression introduced into 4.0.2 on 12/4/12 r35201 >>
         44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
            44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
            - Fix for regression from ALF-11956, connected with setting titles for file picker controls
      44316: Merged DEV to V4.1
         44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
         44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Handle Mac 2011 Word backup in scope of RenameShuffle
      44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix incremental cache state to cope with duplicate leaf/aux doc entries.
      44283: Encoding fix by David Webster
      44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix initial cache state to cope with duplicate leaf/aux doc entries.
      44252: Russian fix from Gloria
      44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - still difficult to reproduce
      44149: Merged HEAD to V4.1
         44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
         44039: Version in parent-pom was not changed properly when deploying to Maven repo
      44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
      44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
      44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
      - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
      - and then blowing up as it continually fetched into the same in-memory HashSet!
   44404: Merged DEV to V4.1-BUG-FIX
      44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
      1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
      2. Added a simple implementation for SOLR to use
      3. Made M2Label look up model labels via a supplied MessageLookup argument
      4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
      5. Accounted for interface changes throughout. 
   44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
         - Not just Ghostscript but any thumbnail failure
   44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
   44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
         - got the wrong branch
         44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
               - Not just Ghostscript but any thumbnail failure
   44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
      44435: Merged DEV to V4.0.2 (4.0.2.22)
         44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
         - Initialize rootRefs in the property definition to prevent NPE.
   44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
     MNT-211 (Still needs implementing on 4.1)
   44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
   44511: ALF-16791: Added missing class.
   44519: ALF-16791: Fixed broken unit tests
   44541: Fix for     ALF-17151   SOLR - add support to disable permission checks
   44542: MNT-211  Re-implement on 4.1
   44548: ALF-16791: Fixed broken SOLR
   44559: ALF-17075: "Exporting and importing null MLText values does not work."
   44577: Final part for     ALF-16558 SOLR tracking does not do incremental updates but one single chunk 
   - fixed code so SolrSearchers are held for as little time as possible
   44590: ALF-14523 (Share - Metadata constraint on workflow creation)
   44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
   44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44600: ALF-16791: Another omission not covered by unit tests
   44603: ALF-14201: upgrade activiti to 5.7-20121211
   44605: Added missing vti.server.url.path.prefix property required by commit 43471
   Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
   44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
   44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
   44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
   44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
         44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
            Check if external authentication is active in BaseServlet
   44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
   Initial implementation by Dmitry Velichkevich.
   Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
   44632: addition of validation of NetworkFile isClosed property.
   44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
      44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
      44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
         also, sneak in the SVN path, so that tracability is complete
   44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
   44651: ALF-14348 (Unable to update external blog configuration details)
   44654: Merged DEV to V4.1-BUG-FIX
      44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
      Added a message bundles for FullControll access role.
   44655: Merged DEV to V4.1-BUG-FIX
      44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
      44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
   44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
   - Wrong node was being used for access checks
   - Fix by Andrey Chernov
   44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
         - Now we can cope with a runAs where the username is in the wrong case
      44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-13 14:16:40 +00:00

411 lines
15 KiB
Java

package org.alfresco.filesys.repo;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.util.List;
import org.alfresco.filesys.alfresco.ExtendedDiskInterface;
import org.alfresco.filesys.alfresco.RepositoryDiskInterface;
import org.alfresco.filesys.repo.rules.Command;
import org.alfresco.filesys.repo.rules.commands.CloseFileCommand;
import org.alfresco.filesys.repo.rules.commands.CompoundCommand;
import org.alfresco.filesys.repo.rules.commands.CopyContentCommand;
import org.alfresco.filesys.repo.rules.commands.CreateFileCommand;
import org.alfresco.filesys.repo.rules.commands.DeleteFileCommand;
import org.alfresco.filesys.repo.rules.commands.DoNothingCommand;
import org.alfresco.filesys.repo.rules.commands.MoveFileCommand;
import org.alfresco.filesys.repo.rules.commands.OpenFileCommand;
import org.alfresco.filesys.repo.rules.commands.ReduceQuotaCommand;
import org.alfresco.filesys.repo.rules.commands.RemoveNoContentFileOnError;
import org.alfresco.filesys.repo.rules.commands.RemoveTempFileCommand;
import org.alfresco.filesys.repo.rules.commands.RenameFileCommand;
import org.alfresco.filesys.repo.rules.commands.RestoreFileCommand;
import org.alfresco.filesys.repo.rules.commands.ReturnValueCommand;
import org.alfresco.jlan.server.SrvSession;
import org.alfresco.jlan.server.filesys.TreeConnection;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.FileFilterMode;
import org.alfresco.util.FileFilterMode.Client;
import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Content Disk Driver Command Executor
* <p>
* Executes commands against the repository.
*/
public class CommandExecutorImpl implements CommandExecutor
{
private static Log logger = LogFactory.getLog(CommandExecutorImpl.class);
// Services go here.
private TransactionService transactionService;
private RepositoryDiskInterface repositoryDiskInterface;
private ExtendedDiskInterface diskInterface;
public void init()
{
PropertyCheck.mandatory(this, "transactionService", transactionService);
PropertyCheck.mandatory(this, "diskInterface", diskInterface);
PropertyCheck.mandatory(this, "repositoryDiskInterface", getRepositoryDiskInterface());
}
@Override
public Object execute(final SrvSession sess, final TreeConnection tree, final Command command) throws IOException
{
TxnReadState readState = command.getTransactionRequired();
Object ret = null;
// No transaction required.
if(readState == TxnReadState.TXN_NONE)
{
ret = executeInternal(sess, tree, command, null);
}
else
{
// Yes a transaction is required.
RetryingTransactionHelper helper = transactionService.getRetryingTransactionHelper();
boolean readOnly = readState == TxnReadState.TXN_READ_ONLY;
RetryingTransactionCallback<Object> cb = new RetryingTransactionCallback<Object>()
{
/**
* 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 Object execute() throws IOException
{
try
{
return executeInternal(sess, tree, command, null);
}
catch (IOException e)
{
// Ensure original checked IOExceptions get propagated
throw new PropagatingException(e);
}
}
};
try
{
ret = helper.doInTransaction(cb, readOnly);
}
catch(PropagatingException pe)
{
if(command instanceof CompoundCommand)
{
if(logger.isDebugEnabled())
{
logger.debug("error executing command :command" + command, pe);
}
CompoundCommand c = (CompoundCommand)command;
// Error Callback Here ?
List<Command> commands = c.getPostErrorCommands();
if(commands != null)
{
for(Command c2 : commands)
{
try
{
executeInternal(sess, tree, c2, ret);
}
catch(Throwable t)
{
logger.warn("caught and ignored exception from error handler", t);
// Swallow exception from error handler.
}
}
}
}
// Unwrap checked exceptions
throw (IOException) pe.getCause();
}
}
/**
* execute post commit commands.
*/
if(command instanceof CompoundCommand)
{
logger.debug("post commit of compound command");
CompoundCommand c = (CompoundCommand)command;
List<Command> commands = c.getPostCommitCommands();
if(commands != null)
{
for(Command c2 : commands)
{
// TODO - what about exceptions from post commit?
executeInternal(sess, tree, c2, ret);
}
}
}
return ret;
}
private Client getClient(SrvSession srvSession)
{
String clientStr = srvSession.getServer().getProtocolName().toLowerCase();
if(clientStr.equals("cifs"))
{
return Client.cifs;
}
else if(clientStr.equals("nfs"))
{
return Client.nfs;
}
else if(clientStr.equals("ftp"))
{
return Client.ftp;
}
else
{
return null;
}
}
/**
* @param sess
* @param tree
* @param command
* @param result
* @return
* @throws IOException
*/
private Object executeInternal(SrvSession sess, TreeConnection tree, Command command, Object result) throws IOException
{
FileFilterMode.setClient(getClient(sess));
try
{
if(command instanceof CompoundCommand)
{
Object ret = null;
logger.debug("compound command received");
CompoundCommand x = (CompoundCommand)command;
for(Command compoundPart : x.getCommands())
{
logger.debug("running part of compound command");
Object val = executeInternal(sess, tree, compoundPart, result);
if(val != null)
{
// Return the value from the last command.
ret = val;
}
}
return ret;
}
else if(command instanceof CreateFileCommand)
{
logger.debug("create file command");
CreateFileCommand create = (CreateFileCommand)command;
return repositoryDiskInterface.createFile(create.getRootNode(), create.getPath(), create.getAllocationSize());
}
else if(command instanceof RestoreFileCommand)
{
logger.debug("restore file command");
RestoreFileCommand restore = (RestoreFileCommand)command;
return repositoryDiskInterface.restoreFile(sess, tree, restore.getRootNode(), restore.getPath(), restore.getAllocationSize(), restore.getOriginalNodeRef());
}
else if(command instanceof DeleteFileCommand)
{
logger.debug("delete file command");
DeleteFileCommand delete = (DeleteFileCommand)command;
return repositoryDiskInterface.deleteFile2(sess, tree, delete.getRootNode(), delete.getPath());
}
else if(command instanceof OpenFileCommand)
{
logger.debug("open file command");
OpenFileCommand o = (OpenFileCommand)command;
OpenFileMode mode = o.getMode();
return repositoryDiskInterface.openFile(sess, tree, o.getRootNodeRef(), o.getPath(), mode, o.isTruncate());
}
else if(command instanceof CloseFileCommand)
{
logger.debug("close file command");
CloseFileCommand c = (CloseFileCommand)command;
return repositoryDiskInterface.closeFile(c.getRootNodeRef(), c.getPath(), c.getNetworkFile());
}
else if(command instanceof ReduceQuotaCommand)
{
logger.debug("reduceQuota file command");
ReduceQuotaCommand r = (ReduceQuotaCommand)command;
repositoryDiskInterface.reduceQuota(sess, tree, r.getNetworkFile());
}
else if(command instanceof RenameFileCommand)
{
logger.debug("rename command");
RenameFileCommand rename = (RenameFileCommand)command;
repositoryDiskInterface.renameFile(rename.getRootNode(), rename.getFromPath(), rename.getToPath(), rename.isSoft());
}
else if(command instanceof MoveFileCommand)
{
logger.debug("move command");
MoveFileCommand move = (MoveFileCommand)command;
repositoryDiskInterface.renameFile(move.getRootNode(), move.getFromPath(), move.getToPath(), false);
}
else if(command instanceof CopyContentCommand)
{
if(logger.isDebugEnabled())
{
logger.debug("Copy content command - copy content");
}
CopyContentCommand copy = (CopyContentCommand)command;
repositoryDiskInterface.copyContent(copy.getRootNode(), copy.getFromPath(), copy.getToPath());
}
else if(command instanceof DoNothingCommand)
{
if(logger.isDebugEnabled())
{
logger.debug("Do Nothing Command - doing nothing");
}
}
else if(command instanceof ResultCallback)
{
if(logger.isDebugEnabled())
{
logger.debug("Result Callback");
}
ResultCallback callback = (ResultCallback)command;
callback.execute(result);
}
else if(command instanceof RemoveTempFileCommand)
{
RemoveTempFileCommand r = (RemoveTempFileCommand)command;
if(logger.isDebugEnabled())
{
logger.debug("Remove Temp File:" + r.getNetworkFile());
}
File file = r.getNetworkFile().getFile();
boolean isDeleted = file.delete();
if(!isDeleted)
{
logger.debug("unable to delete temp file:" + r.getNetworkFile() + ", closed="+ r.getNetworkFile().isClosed());
/*
* Unable to delete temporary file
* Could be a bug with the file handle not being closed, but yourkit does not
* find anything awry.
* There are reported Windows JVM bugs such as 4715154 ...
*/
FileChannel outChan = null;
try
{
outChan = new FileOutputStream(file).getChannel();
outChan.truncate(0);
}
catch (IOException e)
{
logger.debug("unable to clean up file", e);
}
finally
{
if(outChan != null)
{
try
{
outChan.close();
}
catch(IOException e){}
}
}
}
}
else if(command instanceof ReturnValueCommand)
{
ReturnValueCommand r = (ReturnValueCommand)command;
if(logger.isDebugEnabled())
{
logger.debug("Return value");
}
return r.getReturnValue();
}
else if(command instanceof RemoveNoContentFileOnError)
{
RemoveNoContentFileOnError r = (RemoveNoContentFileOnError)command;
if(logger.isDebugEnabled())
{
logger.debug("Remove no content file on error");
}
repositoryDiskInterface.deleteEmptyFile(r.getRootNodeRef(), r.getPath());
}
}
finally
{
FileFilterMode.clearClient();
}
return null;
}
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
public TransactionService getTransactionService()
{
return transactionService;
}
public void setRepositoryDiskInterface(RepositoryDiskInterface repositoryDiskInterface)
{
this.repositoryDiskInterface = repositoryDiskInterface;
}
public RepositoryDiskInterface getRepositoryDiskInterface()
{
return repositoryDiskInterface;
}
public void setDiskInterface(ExtendedDiskInterface diskInterface)
{
this.diskInterface = diskInterface;
}
public ExtendedDiskInterface getDiskInterface()
{
return diskInterface;
}
/**
* A wrapper for checked exceptions to be passed through the retrying transaction handler.
*/
protected static class PropagatingException extends RuntimeException
{
private static final long serialVersionUID = 1L;
/**
* @param cause
*/
public PropagatingException(Throwable cause)
{
super(cause);
}
}
}