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

Merge DEV to HEAD

Browse Source 
ContentDiskDriver rework.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-07-29 09:08:54 +00:00
parent 65cb62ceb8
commit b4bd3a21c2
83 changed files with 11518 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/java/org/alfresco/filesys/repo/desk/JavaScriptDesktopAction.java
View File

@@ -26,15 +26,17 @@ import java.util.Map;
import java.util.StringTokenizer;
import org.alfresco.filesys.alfresco.AlfrescoContext;
import org.alfresco.filesys.alfresco.AlfrescoDiskDriver;
import org.alfresco.filesys.alfresco.DesktopAction;
import org.alfresco.filesys.alfresco.DesktopActionException;
import org.alfresco.filesys.alfresco.DesktopParams;
import org.alfresco.filesys.alfresco.DesktopResponse;
import org.alfresco.filesys.alfresco.AlfrescoDiskDriver.CallableIO;
import org.alfresco.jlan.server.filesys.DiskSharedDevice;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.scripts.ScriptException;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ScriptService;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ResourceFinder;
import org.springframework.core.io.Resource;
import org.springframework.extensions.config.ConfigElement;
@@ -130,12 +132,12 @@ public class JavaScriptDesktopAction extends DesktopAction {
}
@Override
public void initializeAction(AlfrescoDiskDriver filesysDriver, AlfrescoContext filesysContext)
public void initializeAction(ServiceRegistry serviceRegistry, AlfrescoContext filesysContext)
throws DesktopActionException
{
// Perform standard initialization
super.initializeAction(filesysDriver, filesysContext);
super.initializeAction(serviceRegistry, filesysContext);
// Get the script file name and check that it exists
@@ -217,17 +219,23 @@ public class JavaScriptDesktopAction extends DesktopAction {
// Add the webapp URL, if valid
if ( hasWebappURL())
model.put("webURL", getWebappURL());
try
{
model.put("webURL", getWebappURL());
}
TransactionService transactionService = this.getServiceRegistry().getTransactionService();
RetryingTransactionHelper tx = transactionService.getRetryingTransactionHelper();
// Compute the response in a retryable write transaction
return params.getDriver().doInWriteTransaction(params.getSession(), new CallableIO<DesktopResponse>()
{
public DesktopResponse call() throws IOException
RetryingTransactionCallback<DesktopResponse> runScriptCB = new RetryingTransactionCallback<DesktopResponse>() {
@Override
public DesktopResponse execute() throws Throwable
{
DesktopResponse response = new DesktopResponse(StsSuccess);
try
{
DesktopResponse response = new DesktopResponse(StsSuccess);
// Run the script
@@ -279,21 +287,21 @@ public class JavaScriptDesktopAction extends DesktopAction {
response.setStatus(sts, msgToken != null ? msgToken : "");
}
}
// Return the response
return response;
}
});
}
catch (ScriptException ex)
{
return new DesktopResponse(StsError, ex.getMessage());
}
catch (IOException ex)
{
return new DesktopResponse(StsError, ex.getMessage());
}
catch (ScriptException ex)
{
return new DesktopResponse(StsError, ex.getMessage());
}
}
};
return tx.doInTransaction(runScriptCB, false, false);
// Compute the response in a retryable write transaction
}
else
{