diff --git a/config/alfresco/workflow/invitation-nominated-workflow-messages.properties b/config/alfresco/workflow/invitation-nominated-workflow-messages.properties index d0375d1b1b..de785bc2ff 100644 --- a/config/alfresco/workflow/invitation-nominated-workflow-messages.properties +++ b/config/alfresco/workflow/invitation-nominated-workflow-messages.properties @@ -4,42 +4,41 @@ # Invitation Nominated Workflow # -wf_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.title=Invitation - Nominated +inwf_invitation-nominated.workflow.description=Invitation to a Share Site, nominated by a site manager # Invite Task Definitions - -wf_invitation-nominated-workflow-model.type.wf_inviteToSiteTask.title=Start task -wf_invitation-nominated-workflow-model.type.wf_inviteToSiteTask.description=Start a nominated invitation -wf_invitation-nominated-workflow-model.type.wf_invitePendingTask.title=Pending invitation -wf_invitation-nominated-workflow-model.type.wf_invitePendingTask.description=Pending invitation -wf_invitation-nominated-workflow-model.type.wf_rejectInviteTask.title=Rejected -wf_invitation-nominated-workflow-model.type.wf_rejectInviteTask.description=Rejected -wf_invitation-nominated-workflow-model.type.wf_acceptInviteTask.title=Accepted -wf_invitation-nominated-workflow-model.type.wf_acceptInviteTask.description=Accepted +inwf_invite-workflow-model.type.inwf_inviteToSiteTask.title=Start +inwf_invite-workflow-model.type.inwf_inviteToSiteTask.description=Start a nominated invitation +inwf_invite-workflow-model.type.inwf_invitePendingTask.title=Invitee Accepts +inwf_invite-workflow-model.type.inwf_invitePendingTask.description=Pending +inwf_invite-workflow-model.type.inwf_rejectInviteTask.title=Reject +inwf_invite-workflow-model.type.inwf_rejectInviteTask.description=Rejected +inwf_invite-workflow-model.type.inwf_acceptInviteTask.title=Accept +inwf_invite-workflow-model.type.inwf_acceptInviteTask.description=Accepted # Invite Process Definitions -wf_invitation-nominated.node.start.title=Start -wf_invitation-nominated.node.start.description=Start -wf_invitation-nominated.node.invitePending.title=Invite Pending -wf_invitation-nominated.node.invitePending.description=Invite Pending -wf_invitation-nominated.node.invitePending.transition.reject.title=Reject -wf_invitation-nominated.node.invitePending.transition.reject.description=Reject -wf_invitation-nominated.node.invitePending.transition.accept.title=Accept -wf_invitation-nominated.node.invitePending.transition.accept.description=Accept -wf_invitation-nominated.node.invitePending.transition.cancel.title=Cancel -wf_invitation-nominated.node.invitePending.transition.cancel.description=Cancel -wf_invitation-nominated.node.inviteRejected.title=Rejected -wf_invitation-nominated.node.inviteRejected.description=Rejected -wf_invitation-nominated.node.inviteRejected.transition.end.title=End -wf_invitation-nominated.node.inviteRejected.transition.end.description=End -wf_invitation-nominated.task.wf_rejectInviteTask.title=Rejected -wf_invitation-nominated.task.wf_rejectInviteTask.description=Rejected -wf_invitation-nominated.node.inviteAccepted.title=Accepted -wf_invitation-nominated.node.inviteAccepted.description=Accepted -wf_invitation-nominated.node.inviteAccepted.transition.end.title=End -wf_invitation-nominated.node.inviteAccepted.transition.end.description=End -wf_invitation-nominated.task.wf_acceptInviteTask.title=Accepted -wf_invitation-nominated.task.wf_acceptInviteTask.description=Accepted -wf_invitation-nominated.node.end.title=End -wf_invitation-nominated.node.end.description=End \ No newline at end of file +inwf_invitation-nominated.node.start.title=Start +inwf_invitation-nominated.node.start.description=Send an invitation + +inwf_invitation-nominated.node.invitePending.title=Invite Pending +inwf_invitation-nominated.node.invitePending.description=Invite Pending +inwf_invitation-nominated.node.invitePending.transition.reject.title=Reject +inwf_invitation-nominated.node.invitePending.transition.reject.description=Reject +inwf_invitation-nominated.node.invitePending.transition.accept.title=Accept +inwf_invitation-nominated.node.invitePending.transition.accept.description=Accept +inwf_invitation-nominated.node.invitePending.transition.cancel.title=Cancel +inwf_invitation-nominated.node.invitePending.transition.cancel.description=Cancel + +inwf_invitation-nominated.node.inviteRejected.title=Rejected +inwf_invitation-nominated.node.inviteRejected.description=Rejected +inwf_invitation-nominated.node.inviteRejected.transition.end.title=End +inwf_invitation-nominated.node.inviteRejected.transition.end.description=End + +inwf_invitation-nominated.node.inviteAccepted.title=Accepted +inwf_invitation-nominated.node.inviteAccepted.description=Accepted +inwf_invitation-nominated.node.inviteAccepted.transition.end.title=End +inwf_invitation-nominated.node.inviteAccepted.transition.end.description=End + +inwf_invitation-nominated.node.end.title=End +inwf_invitation-nominated.node.end.description=End diff --git a/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java index 4120445d73..5209b1cf23 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java @@ -372,13 +372,13 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase logger.debug("Starting deployment of " + actionedUponNodeRef.toString() + " to " + serverUri + " at " + startDate); - if (delayDeploymentLogger.isDebugEnabled() && delay > 0) - { - delayDeploymentLogger.debug("Delaying deployment by " + delay + "s..."); - - // add a delay for testing purposes if the delay logger level is debug - try { Thread.sleep(1000*delay); } catch (Throwable e) {} - } +// if (delayDeploymentLogger.isDebugEnabled() && delay > 0) +// { +// delayDeploymentLogger.debug("Delaying deployment by " + delay + "s..."); +// +// // add a delay for testing purposes if the delay logger level is debug +// try { Thread.sleep(1000*delay); } catch (Throwable e) {} +// } // make the deploy call passing in the DeploymentCallback, if present Throwable deployError = null; @@ -441,7 +441,8 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase // create the deployment report node 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); } + reportRef = this.nodeService.createNode(attempt, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.TYPE_DEPLOYMENTREPORT, reportProps).getChildRef(); @@ -540,6 +542,4 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase return reportRef; } - - } diff --git a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java index f78136d507..c77ed3d26c 100644 --- a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java +++ b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java @@ -183,17 +183,18 @@ public class DeploymentServiceImpl implements DeploymentService */ fgLogger.debug("creating snapshot of local version"); final String storeName = srcPath.substring(0, srcPath.indexOf(":")); + version = snapshotLocal(storeName); - RetryingTransactionCallback localSnapshot = new RetryingTransactionCallback() - { - public Integer execute() throws Throwable - { - int newVersion = fAVMService.createSnapshot(storeName, null, null).get(storeName); - return new Integer(newVersion); - } - }; - version = trn.doInTransaction(localSnapshot, false, true).intValue(); - fgLogger.debug("snapshot local created " + storeName + ", " + version); +// RetryingTransactionCallback localSnapshot = new RetryingTransactionCallback() +// { +// public Integer execute() throws Throwable +// { +// int newVersion = fAVMService.createSnapshot(storeName, null, null).get(storeName); +// return new Integer(newVersion); +// } +// }; +// version = trn.doInTransaction(localSnapshot, false, true).intValue(); +// fgLogger.debug("snapshot local created " + storeName + ", " + version); } { @@ -854,6 +855,34 @@ public class DeploymentServiceImpl implements DeploymentService prevPath = currPath; } } + + /** + * 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 localSnapshot = new RetryingTransactionCallback() + { + 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 @@ -916,7 +945,8 @@ public class DeploymentServiceImpl implements DeploymentService if (version < 0) { 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);