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

MOB-687 - WCM Deployment - Select multiple test servers

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-05-15 15:35:58 +00:00
parent 17fd83154b
commit 91452b1bae
3 changed files with 85 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
config/alfresco/workflow/invitation-nominated-workflow-messages.properties
View File

@@ -4,42 +4,41 @@
# Invitation Nominated Workflow # Invitation Nominated Workflow
# #
wf_invitation-nominated.workflow.title=Invitation - Nominated inwf_invitation-nominated.workflow.title=Invitation - Nominated
wf_invitation-nominated.workflow.description=Invitation to a Share Site, nominated by a site manager inwf_invitation-nominated.workflow.description=Invitation to a Share Site, nominated by a site manager
# Invite Task Definitions # Invite Task Definitions
inwf_invite-workflow-model.type.inwf_inviteToSiteTask.title=Start
wf_invitation-nominated-workflow-model.type.wf_inviteToSiteTask.title=Start task inwf_invite-workflow-model.type.inwf_inviteToSiteTask.description=Start a nominated invitation
wf_invitation-nominated-workflow-model.type.wf_inviteToSiteTask.description=Start a nominated invitation inwf_invite-workflow-model.type.inwf_invitePendingTask.title=Invitee Accepts
wf_invitation-nominated-workflow-model.type.wf_invitePendingTask.title=Pending invitation inwf_invite-workflow-model.type.inwf_invitePendingTask.description=Pending
wf_invitation-nominated-workflow-model.type.wf_invitePendingTask.description=Pending invitation inwf_invite-workflow-model.type.inwf_rejectInviteTask.title=Reject
wf_invitation-nominated-workflow-model.type.wf_rejectInviteTask.title=Rejected inwf_invite-workflow-model.type.inwf_rejectInviteTask.description=Rejected
wf_invitation-nominated-workflow-model.type.wf_rejectInviteTask.description=Rejected inwf_invite-workflow-model.type.inwf_acceptInviteTask.title=Accept
wf_invitation-nominated-workflow-model.type.wf_acceptInviteTask.title=Accepted inwf_invite-workflow-model.type.inwf_acceptInviteTask.description=Accepted
wf_invitation-nominated-workflow-model.type.wf_acceptInviteTask.description=Accepted
# Invite Process Definitions # Invite Process Definitions
wf_invitation-nominated.node.start.title=Start inwf_invitation-nominated.node.start.title=Start
wf_invitation-nominated.node.start.description=Start inwf_invitation-nominated.node.start.description=Send an invitation
wf_invitation-nominated.node.invitePending.title=Invite Pending
wf_invitation-nominated.node.invitePending.description=Invite Pending inwf_invitation-nominated.node.invitePending.title=Invite Pending
wf_invitation-nominated.node.invitePending.transition.reject.title=Reject inwf_invitation-nominated.node.invitePending.description=Invite Pending
wf_invitation-nominated.node.invitePending.transition.reject.description=Reject inwf_invitation-nominated.node.invitePending.transition.reject.title=Reject
wf_invitation-nominated.node.invitePending.transition.accept.title=Accept inwf_invitation-nominated.node.invitePending.transition.reject.description=Reject
wf_invitation-nominated.node.invitePending.transition.accept.description=Accept inwf_invitation-nominated.node.invitePending.transition.accept.title=Accept
wf_invitation-nominated.node.invitePending.transition.cancel.title=Cancel inwf_invitation-nominated.node.invitePending.transition.accept.description=Accept
wf_invitation-nominated.node.invitePending.transition.cancel.description=Cancel inwf_invitation-nominated.node.invitePending.transition.cancel.title=Cancel
wf_invitation-nominated.node.inviteRejected.title=Rejected inwf_invitation-nominated.node.invitePending.transition.cancel.description=Cancel
wf_invitation-nominated.node.inviteRejected.description=Rejected
wf_invitation-nominated.node.inviteRejected.transition.end.title=End inwf_invitation-nominated.node.inviteRejected.title=Rejected
wf_invitation-nominated.node.inviteRejected.transition.end.description=End inwf_invitation-nominated.node.inviteRejected.description=Rejected
wf_invitation-nominated.task.wf_rejectInviteTask.title=Rejected inwf_invitation-nominated.node.inviteRejected.transition.end.title=End
wf_invitation-nominated.task.wf_rejectInviteTask.description=Rejected inwf_invitation-nominated.node.inviteRejected.transition.end.description=End
wf_invitation-nominated.node.inviteAccepted.title=Accepted
wf_invitation-nominated.node.inviteAccepted.description=Accepted inwf_invitation-nominated.node.inviteAccepted.title=Accepted
wf_invitation-nominated.node.inviteAccepted.transition.end.title=End inwf_invitation-nominated.node.inviteAccepted.description=Accepted
wf_invitation-nominated.node.inviteAccepted.transition.end.description=End inwf_invitation-nominated.node.inviteAccepted.transition.end.title=End
wf_invitation-nominated.task.wf_acceptInviteTask.title=Accepted inwf_invitation-nominated.node.inviteAccepted.transition.end.description=End
wf_invitation-nominated.task.wf_acceptInviteTask.description=Accepted
wf_invitation-nominated.node.end.title=End inwf_invitation-nominated.node.end.title=End
wf_invitation-nominated.node.end.description=End inwf_invitation-nominated.node.end.description=End

20
source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
View File

@@ -372,13 +372,13 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
logger.debug("Starting deployment of " + actionedUponNodeRef.toString() + logger.debug("Starting deployment of " + actionedUponNodeRef.toString() +
" to " + serverUri + " at " + startDate); " to " + serverUri + " at " + startDate);
if (delayDeploymentLogger.isDebugEnabled() && delay > 0) // if (delayDeploymentLogger.isDebugEnabled() && delay > 0)
{ // {
delayDeploymentLogger.debug("Delaying deployment by " + delay + "s..."); // delayDeploymentLogger.debug("Delaying deployment by " + delay + "s...");
//
// add a delay for testing purposes if the delay logger level is debug // // add a delay for testing purposes if the delay logger level is debug
try { Thread.sleep(1000*delay); } catch (Throwable e) {} // try { Thread.sleep(1000*delay); } catch (Throwable e) {}
} // }
// make the deploy call passing in the DeploymentCallback, if present // make the deploy call passing in the DeploymentCallback, if present
Throwable deployError = null; Throwable deployError = null;
@@ -441,7 +441,8 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
// create the deployment report node // create the deployment report node
createDeploymentReportNode(report, attemptRef, serverProps, version, createDeploymentReportNode(report, attemptRef, serverProps, version,
websiteRef, startDate, deployError); websiteRef, startDate, deployError);
} }
/** /**
@@ -497,6 +498,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
reportProps.put(WCMAppModel.PROP_DEPLOYFAILEDREASON, errorMsg); reportProps.put(WCMAppModel.PROP_DEPLOYFAILEDREASON, errorMsg);
} }
reportRef = this.nodeService.createNode(attempt, reportRef = this.nodeService.createNode(attempt,
WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORTS,
WCMAppModel.TYPE_DEPLOYMENTREPORT, reportProps).getChildRef(); WCMAppModel.TYPE_DEPLOYMENTREPORT, reportProps).getChildRef();
@@ -540,6 +542,4 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
return reportRef; return reportRef;
} }
} }

52
source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
View File

@@ -183,17 +183,18 @@ public class DeploymentServiceImpl implements DeploymentService
*/ */
fgLogger.debug("creating snapshot of local version"); fgLogger.debug("creating snapshot of local version");
final String storeName = srcPath.substring(0, srcPath.indexOf(":")); final String storeName = srcPath.substring(0, srcPath.indexOf(":"));
version = snapshotLocal(storeName);
RetryingTransactionCallback<Integer> localSnapshot = new RetryingTransactionCallback<Integer>() // RetryingTransactionCallback<Integer> localSnapshot = new RetryingTransactionCallback<Integer>()
{ // {
public Integer execute() throws Throwable // public Integer execute() throws Throwable
{ // {
int newVersion = fAVMService.createSnapshot(storeName, null, null).get(storeName); // int newVersion = fAVMService.createSnapshot(storeName, null, null).get(storeName);
return new Integer(newVersion); // return new Integer(newVersion);
} // }
}; // };
version = trn.doInTransaction(localSnapshot, false, true).intValue(); // version = trn.doInTransaction(localSnapshot, false, true).intValue();
fgLogger.debug("snapshot local created " + storeName + ", " + version); // fgLogger.debug("snapshot local created " + storeName + ", " + version);
} }
{ {
@@ -855,6 +856,34 @@ public class DeploymentServiceImpl implements DeploymentService
} }
} }
/**
* Create a new local snapshot
* @param storeName
* @return the version
*/
private int snapshotLocal(final String storeName)
{
RetryingTransactionHelper trn = trxService.getRetryingTransactionHelper();
/**
* If version is -1, Create a local snapshot to deploy
*/
fgLogger.debug("creating snapshot of local version");
RetryingTransactionCallback<Integer> localSnapshot = new RetryingTransactionCallback<Integer>()
{
public Integer execute() throws Throwable
{
int newVersion = fAVMService.createSnapshot(storeName, null, null).get(storeName);
return new Integer(newVersion);
}
};
int version = trn.doInTransaction(localSnapshot, false, true).intValue();
fgLogger.debug("snapshot local created " + storeName + ", " + version);
return version;
}
/** /**
* Deploy differences to a File System Receiver, FSR * Deploy differences to a File System Receiver, FSR
* *
@@ -916,7 +945,8 @@ public class DeploymentServiceImpl implements DeploymentService
if (version < 0) if (version < 0)
{ {
String storeName = srcPath.substring(0, srcPath.indexOf(':')); String storeName = srcPath.substring(0, srcPath.indexOf(':'));
version = fAVMService.createSnapshot(storeName, null, null).get(storeName); version = snapshotLocal(storeName);
//version = fAVMService.createSnapshot(storeName, null, null).get(storeName);
} }
transformers = getTransformers(adapterName); transformers = getTransformers(adapterName);