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

Merged V2.2 to HEAD

Browse Source 
7498: Deployment callback and event changes
   7499: Build fix
   7505: Fixed deployment script issue in IE
   7525: Added sample job that will clean deployment attempts older than 180 days (by default)
   7526: Typo compilation fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-02-26 15:13:48 +00:00
parent ff15cf4079
commit fecfd82767
9 changed files with 418 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,7 +282,7 @@ public class DeploymentServiceImpl implements DeploymentService
{
DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.FAILED,
new Pair<Integer, String>(version, srcPath),
dstPath);
dstPath, e.getMessage());
for (DeploymentCallback callback : callbacks)
{
callback.eventOccurred(event);
@@ -310,7 +310,7 @@ public class DeploymentServiceImpl implements DeploymentService
{
DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.FAILED,
new Pair<Integer, String>(version, srcPath),
dstPath);
dstPath, e.getMessage());
for (DeploymentCallback callback : callbacks)
{
callback.eventOccurred(event);
@@ -799,10 +799,11 @@ public class DeploymentServiceImpl implements DeploymentService
List<DeploymentCallback> callbacks)
{
DeploymentReport report = new DeploymentReport();
DeploymentReceiverService service = getReceiver(hostName, port);
DeploymentReceiverService service = null;
String ticket = null;
try
{
service = getReceiver(hostName, port);
DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.START,
new Pair<Integer, String>(version, srcPath),
target);
@@ -840,12 +841,17 @@ public class DeploymentServiceImpl implements DeploymentService
{
DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.FAILED,
new Pair<Integer, String>(version, srcPath),
target);
target, e.getMessage());
for (DeploymentCallback callback : callbacks)
{
callback.eventOccurred(event);
}
service.abort(ticket);
if (service != null)
{
service.abort(ticket);
}
throw new AVMException("Deployment to: " + target + " failed.", e);
}
}