http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4039743/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiServer.java
index ca5dfd6,497be50..0f375b8
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@@ -16,87 -16,141 +16,141 @@@
  // under the License.
  package com.cloud.api;
  
- import com.cloud.api.response.ApiResponseSerializer;
- import com.cloud.async.AsyncJob;
- import com.cloud.async.AsyncJobManager;
- import com.cloud.async.AsyncJobVO;
- import com.cloud.configuration.Config;
- import com.cloud.configuration.ConfigurationVO;
- import com.cloud.configuration.dao.ConfigurationDao;
- import com.cloud.domain.Domain;
- import com.cloud.domain.DomainVO;
- import com.cloud.event.ActionEventUtils;
- import com.cloud.exception.*;
- import com.cloud.user.*;
- import com.cloud.utils.NumbersUtil;
- import com.cloud.utils.Pair;
- import com.cloud.utils.StringUtils;
- import com.cloud.utils.component.ComponentContext;
- import com.cloud.utils.component.PluggableService;
- import com.cloud.utils.concurrency.NamedThreadFactory;
- import com.cloud.utils.db.SearchCriteria;
- import com.cloud.utils.db.Transaction;
- import com.cloud.utils.exception.CloudRuntimeException;
+ import java.io.ByteArrayInputStream;
+ import java.io.IOException;
+ import java.io.InterruptedIOException;
+ import java.net.InetAddress;
+ import java.net.ServerSocket;
+ import java.net.Socket;
+ import java.net.URI;
+ import java.net.URISyntaxException;
+ import java.net.URLEncoder;
+ import java.security.SecureRandom;
+ import java.text.DateFormat;
+ import java.text.ParseException;
+ import java.text.SimpleDateFormat;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.Date;
+ import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+ import java.util.TimeZone;
+ import java.util.concurrent.ExecutorService;
+ import java.util.concurrent.LinkedBlockingQueue;
+ import java.util.concurrent.ThreadPoolExecutor;
+ import java.util.concurrent.TimeUnit;
+ 
+ import javax.annotation.PostConstruct;
+ import javax.crypto.Mac;
+ import javax.crypto.spec.SecretKeySpec;
+ import javax.inject.Inject;
+ import javax.naming.ConfigurationException;
+ import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
+ 
 -import org.apache.cloudstack.acl.APIChecker;
 -import org.apache.cloudstack.api.APICommand;
 -import org.apache.cloudstack.api.ApiErrorCode;
 -import org.apache.cloudstack.api.BaseAsyncCmd;
 -import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 -import org.apache.cloudstack.api.BaseCmd;
 -import org.apache.cloudstack.api.BaseListCmd;
 -import org.apache.cloudstack.api.ResponseObject;
 -import org.apache.cloudstack.api.ServerApiException;
 -import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
 -import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
 -import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
 -import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
 -import com.cloud.event.ActionEventUtils;
 -import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
 -import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;
 -import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 -import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
 -import 
org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 -import 
org.apache.cloudstack.api.command.user.project.ListProjectInvitationsCmd;
 -import org.apache.cloudstack.api.command.user.project.ListProjectsCmd;
 -import 
org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;
 -import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 -import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
 -import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
 -import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
 -import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
 -import org.apache.cloudstack.api.response.ExceptionResponse;
 -import org.apache.cloudstack.api.response.ListResponse;
 -import org.apache.cloudstack.region.RegionManager;
+ import org.apache.commons.codec.binary.Base64;
+ import org.apache.http.ConnectionClosedException;
+ import org.apache.http.HttpException;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+ import org.apache.http.HttpServerConnection;
+ import org.apache.http.HttpStatus;
+ import org.apache.http.NameValuePair;
+ import org.apache.http.client.utils.URLEncodedUtils;
+ import org.apache.http.entity.BasicHttpEntity;
+ import org.apache.http.impl.DefaultHttpResponseFactory;
+ import org.apache.http.impl.DefaultHttpServerConnection;
+ import org.apache.http.impl.NoConnectionReuseStrategy;
+ import org.apache.http.impl.SocketHttpServerConnection;
+ import org.apache.http.params.BasicHttpParams;
+ import org.apache.http.params.CoreConnectionPNames;
+ import org.apache.http.params.CoreProtocolPNames;
+ import org.apache.http.params.HttpParams;
+ import org.apache.http.protocol.BasicHttpContext;
+ import org.apache.http.protocol.BasicHttpProcessor;
+ import org.apache.http.protocol.HttpContext;
+ import org.apache.http.protocol.HttpRequestHandler;
+ import org.apache.http.protocol.HttpRequestHandlerRegistry;
+ import org.apache.http.protocol.HttpService;
+ import org.apache.http.protocol.ResponseConnControl;
+ import org.apache.http.protocol.ResponseContent;
+ import org.apache.http.protocol.ResponseDate;
+ import org.apache.http.protocol.ResponseServer;
+ import org.apache.log4j.Logger;
+ import org.springframework.stereotype.Component;
+ 
 +import org.apache.cloudstack.acl.APIChecker;
- import org.apache.cloudstack.api.*;
++import org.apache.cloudstack.api.APICommand;
++import org.apache.cloudstack.api.ApiErrorCode;
++import org.apache.cloudstack.api.BaseAsyncCmd;
++import org.apache.cloudstack.api.BaseAsyncCreateCmd;
++import org.apache.cloudstack.api.BaseCmd;
++import org.apache.cloudstack.api.BaseListCmd;
++import org.apache.cloudstack.api.ResponseObject;
++import org.apache.cloudstack.api.ServerApiException;
 +import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
 +import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
 +import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
 +import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
 +import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
 +import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;
 +import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
 +import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
 +import 
org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 +import 
org.apache.cloudstack.api.command.user.project.ListProjectInvitationsCmd;
 +import org.apache.cloudstack.api.command.user.project.ListProjectsCmd;
 +import 
org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;
 +import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 +import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
 +import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;
 +import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
 +import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
 +import org.apache.cloudstack.api.response.ExceptionResponse;
 +import org.apache.cloudstack.api.response.ListResponse;
 +import org.apache.cloudstack.region.RegionManager;
- import org.apache.commons.codec.binary.Base64;
- import org.apache.http.*;
- import org.apache.http.client.utils.URLEncodedUtils;
- import org.apache.http.entity.BasicHttpEntity;
- import org.apache.http.impl.DefaultHttpResponseFactory;
- import org.apache.http.impl.DefaultHttpServerConnection;
- import org.apache.http.impl.NoConnectionReuseStrategy;
- import org.apache.http.impl.SocketHttpServerConnection;
- import org.apache.http.params.BasicHttpParams;
- import org.apache.http.params.CoreConnectionPNames;
- import org.apache.http.params.CoreProtocolPNames;
- import org.apache.http.params.HttpParams;
- import org.apache.http.protocol.*;
- import org.apache.log4j.Logger;
- import org.springframework.stereotype.Component;
 +
- import javax.annotation.PostConstruct;
- import javax.crypto.Mac;
- import javax.crypto.spec.SecretKeySpec;
- import javax.inject.Inject;
- import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpSession;
- import java.io.ByteArrayInputStream;
- import java.io.IOException;
- import java.io.InterruptedIOException;
- import java.net.*;
- import java.security.SecureRandom;
- import java.text.DateFormat;
- import java.text.ParseException;
- import java.text.SimpleDateFormat;
- import java.util.*;
- import java.util.concurrent.ExecutorService;
- import java.util.concurrent.LinkedBlockingQueue;
- import java.util.concurrent.ThreadPoolExecutor;
- import java.util.concurrent.TimeUnit;
+ import com.cloud.api.response.ApiResponseSerializer;
 -import com.cloud.async.AsyncCommandQueued;
+ import com.cloud.async.AsyncJob;
+ import com.cloud.async.AsyncJobManager;
+ import com.cloud.async.AsyncJobVO;
+ import com.cloud.configuration.Config;
+ import com.cloud.configuration.ConfigurationVO;
+ import com.cloud.configuration.dao.ConfigurationDao;
+ import com.cloud.domain.Domain;
+ import com.cloud.domain.DomainVO;
++import com.cloud.event.ActionEventUtils;
+ import com.cloud.exception.AccountLimitException;
+ import com.cloud.exception.CloudAuthenticationException;
+ import com.cloud.exception.InsufficientCapacityException;
+ import com.cloud.exception.InvalidParameterValueException;
+ import com.cloud.exception.PermissionDeniedException;
+ import com.cloud.exception.RequestLimitException;
+ import com.cloud.exception.ResourceAllocationException;
+ import com.cloud.exception.ResourceUnavailableException;
+ import com.cloud.user.Account;
+ import com.cloud.user.AccountManager;
+ import com.cloud.user.DomainManager;
+ import com.cloud.user.User;
+ import com.cloud.user.UserAccount;
+ import com.cloud.user.UserContext;
+ import com.cloud.user.UserVO;
+ import com.cloud.utils.NumbersUtil;
+ import com.cloud.utils.Pair;
+ import com.cloud.utils.StringUtils;
+ import com.cloud.utils.component.ComponentContext;
+ import com.cloud.utils.component.ManagerBase;
+ import com.cloud.utils.component.PluggableService;
+ import com.cloud.utils.concurrency.NamedThreadFactory;
+ import com.cloud.utils.db.SearchCriteria;
+ import com.cloud.utils.db.Transaction;
+ import com.cloud.utils.exception.CloudRuntimeException;
  
--@Component
- public class ApiServer implements HttpRequestHandler, ApiServerService {
++@Component 
+ public class ApiServer extends ManagerBase implements HttpRequestHandler, 
ApiServerService {
      private static final Logger s_logger = 
Logger.getLogger(ApiServer.class.getName());
      private static final Logger s_accessLogger = 
Logger.getLogger("apiserver." + ApiServer.class.getName());
  
@@@ -133,7 -186,14 +186,14 @@@
      public static ApiServer getInstance() {
          return s_instance;
      }
 -    
 +
+       @Override
+       public boolean configure(String name, Map<String, Object> params)
+                       throws ConfigurationException {
+               init();
+               return true;
+       }
+  
      public void init() {
          Integer apiPort = null; // api port, null by default
          SearchCriteria<ConfigurationVO> sc = 
_configDao.createSearchCriteria();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4039743/server/src/com/cloud/async/AsyncJobVO.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/async/AsyncJobVO.java
index 0000000,c40fc98..93b72d6
mode 000000,100644..100644
--- a/server/src/com/cloud/async/AsyncJobVO.java
+++ b/server/src/com/cloud/async/AsyncJobVO.java
@@@ -1,0 -1,401 +1,382 @@@
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License.  You may obtain a copy of the License at
+ //
+ //   http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied.  See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+ package com.cloud.async;
+ 
+ import java.util.Date;
+ import java.util.UUID;
+ 
+ import javax.persistence.Column;
++import javax.persistence.DiscriminatorColumn;
++import javax.persistence.DiscriminatorType;
+ import javax.persistence.Entity;
 -import javax.persistence.EnumType;
 -import javax.persistence.Enumerated;
+ import javax.persistence.GeneratedValue;
+ import javax.persistence.GenerationType;
+ import javax.persistence.Id;
++import javax.persistence.Inheritance;
++import javax.persistence.InheritanceType;
+ import javax.persistence.Table;
+ import javax.persistence.Temporal;
+ import javax.persistence.TemporalType;
+ import javax.persistence.Transient;
+ 
+ import com.cloud.utils.db.GenericDao;
 -import org.apache.cloudstack.api.InternalIdentity;
+ 
+ @Entity
+ @Table(name="async_job")
++@Inheritance(strategy=InheritanceType.JOINED)
++@DiscriminatorColumn(name="job_type", 
discriminatorType=DiscriminatorType.STRING, length=32)
+ public class AsyncJobVO implements AsyncJob {
 -      public static final int CALLBACK_POLLING = 0;
 -      public static final int CALLBACK_EMAIL = 1;
+       
+       @Id
+     @GeneratedValue(strategy=GenerationType.IDENTITY)
+     @Column(name="id")
+     private Long id = null;
 -
++      
++    @Column(name="job_type", length=32)
++    protected String type;
++    
++    @Column(name="job_dispatcher", length=64)
++    protected String dispatcher;
++    
++    @Column(name="job_pending_signals")
++    protected int pendingSignals;
++    
+     @Column(name="user_id")
+     private long userId;
+     
+     @Column(name="account_id")
+     private long accountId;
+     
 -    @Column(name="session_key")
 -    private String sessionKey;
 -    
+       @Column(name="job_cmd")
+     private String cmd;
 -      
 -      @Column(name="job_cmd_originator")
 -      private String cmdOriginator;
 -    
++
+       @Column(name="job_cmd_ver")
+     private int cmdVersion;
 -    
++      
+     @Column(name="job_cmd_info", length=65535)
+     private String cmdInfo;
 -    
 -    @Column(name="callback_type")
 -    private int callbackType;
 -    
 -    @Column(name="callback_address")
 -    private String callbackAddress;
 -    
++  
+     @Column(name="job_status")
+     private int status;
+     
+     @Column(name="job_process_status")
+     private int processStatus;
+     
+     @Column(name="job_result_code")
+     private int resultCode;
+     
+     @Column(name="job_result", length=65535)
+     private String result;
+     
 -    @Enumerated(value=EnumType.STRING)
+     @Column(name="instance_type", length=64)
 -    private Type instanceType;
++    private String instanceType;
+     
+       @Column(name="instance_id", length=64)
+     private Long instanceId;
+     
+     @Column(name="job_init_msid")
+     private Long initMsid;
+ 
+     @Column(name="job_complete_msid")
+     private Long completeMsid;
+     
++    @Column(name="job_executing_msid")
++    private Long executingMsid;
++
+     @Column(name=GenericDao.CREATED_COLUMN)
+     private Date created;
+     
+     @Column(name="last_updated")
+     @Temporal(TemporalType.TIMESTAMP)
+     private Date lastUpdated;
+     
+     @Column(name="last_polled")
+     @Temporal(TemporalType.TIMESTAMP)
+     private Date lastPolled;
+     
+     @Column(name=GenericDao.REMOVED_COLUMN)
+     private Date removed;
+     
+     @Column(name="uuid")
 -    private String uuid;
++    private String uuid;    
+ 
+     @Transient
 -    private SyncQueueItemVO syncSource = null;
++    private SyncQueueItem syncSource = null;
+ 
 -    @Transient
 -    private boolean fromPreviousSession = false;
 -
 -    
+     public AsyncJobVO() {
+         this.uuid = UUID.randomUUID().toString();
+     }
+ 
 -    public AsyncJobVO(long userId, long accountId, String cmd, String 
cmdInfo, Long instanceId, Type instanceType) {
 -      this.userId = userId;
 -      this.accountId = accountId;
 -      this.cmd = cmd;
 -      this.cmdInfo = cmdInfo;
 -      this.callbackType = CALLBACK_POLLING;
 -      this.uuid = UUID.randomUUID().toString();
 -        this.instanceId = instanceId;
 -        this.instanceType = instanceType;
++    public AsyncJobVO(long userId, long accountId, String cmd, String 
cmdInfo, Long instanceId, String instanceType) {
++              this.userId = userId;
++              this.accountId = accountId;
++              this.cmd = cmd;
++              this.cmdInfo = cmdInfo;
++          this.uuid = UUID.randomUUID().toString();
++          this.instanceId = instanceId;
++          this.instanceType = instanceType;
+     }
+ 
+     public AsyncJobVO(long userId, long accountId, String cmd, String cmdInfo,
+       int callbackType, String callbackAddress, Long instanceId, Type 
instanceType) {
 -
 -      this(userId, accountId, cmd, cmdInfo, instanceId, instanceType);
 -      this.callbackType = callbackType;
 -      this.callbackAddress = callbackAddress;
 -      this.uuid = UUID.randomUUID().toString();
++          
++          this.type ="AsyncJobVO";
+     }
+ 
 -
+     @Override
+     public long getId() {
+               return id;
+       }
+ 
+       public void setId(Long id) {
+               this.id = id;
+       }
++      
++      @Override
++      public String getType() {
++              return this.type;
++      }
++      
++      public void setType(String type) {
++              this.type = type;
++      }
++      
++      @Override
++      public String getDispatcher() {
++              return this.dispatcher;
++      }
++      
++      public void setDispatcher(String dispatcher) {
++              this.dispatcher = dispatcher;
++      }
++      
++      @Override
++      public int getPendingSignals() {
++              return this.pendingSignals;
++      }
++      
++      public void setPendingSignals(int signals) {
++              this.pendingSignals = signals;
++      }
+ 
+       @Override
+     public long getUserId() {
+               return userId;
+       }
+ 
+       public void setUserId(long userId) {
+               this.userId = userId;
+       }
+ 
+       @Override
+     public long getAccountId() {
+               return accountId;
+       }
+ 
+       public void setAccountId(long accountId) {
+               this.accountId = accountId;
+       }
+ 
+       @Override
+     public String getCmd() {
+               return cmd;
+       }
+ 
+       public void setCmd(String cmd) {
+               this.cmd = cmd;
+       }
+       
+       @Override
+     public int getCmdVersion() {
+               return cmdVersion;
+       }
+       
+       public void setCmdVersion(int version) {
+               cmdVersion = version;
+       }
+ 
+       @Override
+     public String getCmdInfo() {
+               return cmdInfo;
+       }
+ 
+       public void setCmdInfo(String cmdInfo) {
+               this.cmdInfo = cmdInfo;
+       }
 -
 -      @Override
 -    public int getCallbackType() {
 -              return callbackType;
 -      }
 -
 -      public void setCallbackType(int callbackType) {
 -              this.callbackType = callbackType;
 -      }
 -
 -      @Override
 -    public String getCallbackAddress() {
 -              return callbackAddress;
 -      }
 -
 -      public void setCallbackAddress(String callbackAddress) {
 -              this.callbackAddress = callbackAddress;
 -      }
 -
++      
+       @Override
+     public int getStatus() {
+               return status;
+       }
+ 
+       public void setStatus(int status) {
+               this.status = status;
+       }
+       
+       @Override
+     public int getProcessStatus() {
+               return processStatus;
+       }
+       
+       public void setProcessStatus(int status) {
+               processStatus = status;
+       }
+       
+       @Override
+     public int getResultCode() {
+               return resultCode;
+       }
+       
+       public void setResultCode(int resultCode) {
+               this.resultCode = resultCode;
+       }
+ 
+       @Override
+     public String getResult() {
+               return result;
+       }
+ 
+       public void setResult(String result) {
+               this.result = result;
+       }
+ 
+       @Override
+     public Long getInitMsid() {
+               return initMsid;
+       }
+ 
++      @Override
+       public void setInitMsid(Long initMsid) {
+               this.initMsid = initMsid;
+       }
++      
++      @Override
++      public Long getExecutingMsid() {
++              return this.executingMsid;
++      }
++      
++      public void setExecutingMsid(Long executingMsid) {
++              this.executingMsid = executingMsid;
++      }
+ 
+       @Override
+     public Long getCompleteMsid() {
+               return completeMsid;
+       }
+ 
++      @Override
+       public void setCompleteMsid(Long completeMsid) {
+               this.completeMsid = completeMsid;
+       }
+ 
+       @Override
+     public Date getCreated() {
+               return created;
+       }
+ 
+       public void setCreated(Date created) {
+               this.created = created;
+       }
+ 
+       @Override
+     public Date getLastUpdated() {
+               return lastUpdated;
+       }
+ 
+       public void setLastUpdated(Date lastUpdated) {
+               this.lastUpdated = lastUpdated;
+       }
+ 
+       @Override
+     public Date getLastPolled() {
+               return lastPolled;
+       }
+ 
+       public void setLastPolled(Date lastPolled) {
+               this.lastPolled = lastPolled;
+       }
+ 
+       @Override
+     public Date getRemoved() {
+               return removed;
+       }
+ 
+       public void setRemoved(Date removed) {
+               this.removed = removed;
+       }
+       
+     @Override
 -    public Type getInstanceType() {
++    public String getInstanceType() {
+               return instanceType;
+       }
+ 
 -      public void setInstanceType(Type instanceType) {
++      public void setInstanceType(String instanceType) {
+               this.instanceType = instanceType;
+       }
+ 
+       @Override
+     public Long getInstanceId() {
+               return instanceId;
+       }
+ 
+       public void setInstanceId(Long instanceId) {
+               this.instanceId = instanceId;
+       }
+       
 -    @Override
 -    public String getSessionKey() {
 -              return sessionKey;
 -      }
 -
 -      public void setSessionKey(String sessionKey) {
 -              this.sessionKey = sessionKey;
 -      }
 -      
 -    @Override
 -    public String getCmdOriginator() {
 -              return cmdOriginator;
 -      }
 -
 -      public void setCmdOriginator(String cmdOriginator) {
 -              this.cmdOriginator = cmdOriginator;
 -      }
 -      
+       @Override
 -    public SyncQueueItemVO getSyncSource() {
++    public SyncQueueItem getSyncSource() {
+         return syncSource;
+     }
+     
 -    public void setSyncSource(SyncQueueItemVO syncSource) {
++      @Override
++    public void setSyncSource(SyncQueueItem syncSource) {
+         this.syncSource = syncSource;
+     }
+     
+     @Override
 -    public boolean isFromPreviousSession() {
 -        return fromPreviousSession;
 -    }
 -    
 -    public void setFromPreviousSession(boolean fromPreviousSession) {
 -        this.fromPreviousSession = fromPreviousSession;
 -    }
 -    
 -    @Override
+     public String getUuid() {
+       return this.uuid;
+     }
+     
+     public void setUuid(String uuid) {
+       this.uuid = uuid;
+     }
+     
+       @Override
+     public String toString() {
+               StringBuffer sb = new StringBuffer();
+               sb.append("AsyncJobVO {id:").append(getId());
+               sb.append(", userId: ").append(getUserId());
+               sb.append(", accountId: ").append(getAccountId());
 -              sb.append(", sessionKey: ").append(getSessionKey());
+               sb.append(", instanceType: ").append(getInstanceType());
+               sb.append(", instanceId: ").append(getInstanceId());
+               sb.append(", cmd: ").append(getCmd());
 -              sb.append(", cmdOriginator: ").append(getCmdOriginator());
+               sb.append(", cmdInfo: ").append(getCmdInfo());
+               sb.append(", cmdVersion: ").append(getCmdVersion());
 -              sb.append(", callbackType: ").append(getCallbackType());
 -              sb.append(", callbackAddress: ").append(getCallbackAddress());
+               sb.append(", status: ").append(getStatus());
+               sb.append(", processStatus: ").append(getProcessStatus());
+               sb.append(", resultCode: ").append(getResultCode());
+               sb.append(", result: ").append(getResult());
+               sb.append(", initMsid: ").append(getInitMsid());
+               sb.append(", completeMsid: ").append(getCompleteMsid());
+               sb.append(", lastUpdated: ").append(getLastUpdated());
+               sb.append(", lastPolled: ").append(getLastPolled());
+               sb.append(", created: ").append(getCreated());
+               sb.append("}");
+               return sb.toString();
+       }
+ }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4039743/server/src/com/cloud/async/SyncQueueItemVO.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/async/SyncQueueItemVO.java
index 0000000,b0546a7..21fbb91
mode 000000,100644..100644
--- a/server/src/com/cloud/async/SyncQueueItemVO.java
+++ b/server/src/com/cloud/async/SyncQueueItemVO.java
@@@ -1,0 -1,141 +1,142 @@@
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License.  You may obtain a copy of the License at
+ //
+ //   http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied.  See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+ package com.cloud.async;
+ 
+ import org.apache.cloudstack.api.InternalIdentity;
+ 
+ import java.util.Date;
+ 
+ import javax.persistence.Column;
+ import javax.persistence.Entity;
+ import javax.persistence.GeneratedValue;
+ import javax.persistence.GenerationType;
+ import javax.persistence.Id;
+ import javax.persistence.Table;
+ import javax.persistence.Temporal;
+ import javax.persistence.TemporalType;
+ 
+ @Entity
+ @Table(name="sync_queue_item")
+ public class SyncQueueItemVO implements SyncQueueItem, InternalIdentity {
+ 
+     @Id
+     @GeneratedValue(strategy=GenerationType.IDENTITY)
+     @Column(name="id")
+     private Long id = null;
+     
+     @Column(name="queue_id")
+     private Long queueId;
+     
+     @Column(name="content_type")
+     private String contentType;
+     
+     @Column(name="content_id")
+     private Long contentId;
+     
+     @Column(name="queue_proc_msid")
+     private Long lastProcessMsid;
+ 
+     @Column(name="queue_proc_number")
+     private Long lastProcessNumber;
+     
+     @Column(name="queue_proc_time")
+     @Temporal(TemporalType.TIMESTAMP)
+     private Date lastProcessTime;
+     
+     @Column(name="created")
+     private Date created;
+     
+     public long getId() {
+         return id;
+     }
+ 
+     public void setId(Long id) {
+         this.id = id;
+     }
+ 
++    @Override
+     public Long getQueueId() {
+         return queueId;
+     }
+ 
+     public void setQueueId(Long queueId) {
+         this.queueId = queueId;
+     }
+ 
+     @Override
+     public String getContentType() {
+         return contentType;
+     }
+ 
+     public void setContentType(String contentType) {
+         this.contentType = contentType;
+     }
+     
+     @Override
+     public Long getContentId() {
+         return contentId;
+     }
+ 
+     public void setContentId(Long contentId) {
+         this.contentId = contentId;
+     }
+ 
+     public Long getLastProcessMsid() {
+         return lastProcessMsid;
+     }
+ 
+     public void setLastProcessMsid(Long lastProcessMsid) {
+         this.lastProcessMsid = lastProcessMsid;
+     }
+ 
+     public Long getLastProcessNumber() {
+         return lastProcessNumber;
+     }
+ 
+     public void setLastProcessNumber(Long lastProcessNumber) {
+         this.lastProcessNumber = lastProcessNumber;
+     }
+ 
+     public Date getCreated() {
+         return created;
+     }
+ 
+     public void setCreated(Date created) {
+         this.created = created;
+     }
+ 
+     public String toString() {
+         StringBuffer sb = new StringBuffer();
+         sb.append("SyncQueueItemVO {id:").append(getId()).append(", queueId: 
").append(getQueueId());
+         sb.append(", contentType: ").append(getContentType());
+         sb.append(", contentId: ").append(getContentId());
+         sb.append(", lastProcessMsid: ").append(getLastProcessMsid());
+         sb.append(", lastprocessNumber: ").append(getLastProcessNumber());
+         sb.append(", lastProcessTime: ").append(getLastProcessTime());
+         sb.append(", created: ").append(getCreated());
+         sb.append("}");
+         return sb.toString();
+     }
+ 
+        public Date getLastProcessTime() {
+             return lastProcessTime;
+         }
+ 
+         public void setLastProcessTime(Date lastProcessTime) {
+             this.lastProcessTime = lastProcessTime;
+         }
+ }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4039743/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
index 58cd660,df53e0d..0d47207
--- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
@@@ -274,95 -214,4 +214,5 @@@ public class AgentBasedConsoleProxyMana
      public String getName() {
          return _name;
      }
 +
-     @Override
-     public Long convertToId(String vmName) {
-         if (!VirtualMachineName.isValidConsoleProxyName(vmName, _instance)) {
-             return null;
-         }
-         return VirtualMachineName.getConsoleProxyId(vmName);
-     }
- 
-     @Override
-     public ConsoleProxyVO findByName(String name) {
-         // TODO Auto-generated method stub
-         return null;
-     }
- 
-     @Override
-     public ConsoleProxyVO findById(long id) {
-         // TODO Auto-generated method stub
-         return null;
-     }
- 
-     @Override
-     public ConsoleProxyVO persist(ConsoleProxyVO vm) {
-         // TODO Auto-generated method stub
-         return null;
-     }
- 
-     @Override
-     public boolean 
finalizeVirtualMachineProfile(VirtualMachineProfile<ConsoleProxyVO> profile, 
DeployDestination dest, ReservationContext context) {
-         // TODO Auto-generated method stub
-         return false;
-     }
- 
-     @Override
-     public boolean finalizeDeployment(Commands cmds, 
VirtualMachineProfile<ConsoleProxyVO> profile, DeployDestination dest, 
ReservationContext context) {
-         // TODO Auto-generated method stub
-         return false;
-     }
- 
-     @Override
-     public boolean finalizeCommandsOnStart(Commands cmds, 
VirtualMachineProfile<ConsoleProxyVO> profile) {
-         // TODO Auto-generated method stub
-         return false;
-     }
- 
-     @Override
-     public boolean finalizeStart(VirtualMachineProfile<ConsoleProxyVO> 
profile, long hostId, Commands cmds, ReservationContext context) {
-         // TODO Auto-generated method stub
-         return false;
-     }
- 
-     @Override
-     public void finalizeStop(VirtualMachineProfile<ConsoleProxyVO> profile, 
StopAnswer answer) {
-         // TODO Auto-generated method stub
-     }
- 
-     @Override 
-     public void finalizeExpunge(ConsoleProxyVO proxy) {
-     }
- 
-     @Override
-     public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm,
-             ReservationContext context, DeployDestination dest) throws 
ConcurrentOperationException, ResourceUnavailableException,
-             InsufficientCapacityException {
-         //not supported
-         throw new UnsupportedOperationException("Plug nic is not supported 
for vm of type " + vm.getType());
-     }
- 
- 
-     @Override
-     public boolean unplugNic(Network network, NicTO nic, VirtualMachineTO vm,
-             ReservationContext context, DeployDestination dest) throws 
ConcurrentOperationException, ResourceUnavailableException {
-         //not supported
-         throw new UnsupportedOperationException("Unplug nic is not supported 
for vm of type " + vm.getType());
-     }
- 
-     @Override
-     public void prepareStop(VirtualMachineProfile<ConsoleProxyVO> profile) {
-     }
-     
-     @Override
-     public void vmWorkStart(VmWork work) {
-     }
-     
-     @Override
-     public void vmWorkStop(VmWork work) {
-     }
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4039743/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 3e011dc,9a7a46f..5950a99
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@@ -30,19 -28,13 +28,17 @@@ import javax.ejb.Local
  import javax.inject.Inject;
  import javax.naming.ConfigurationException;
  
- import org.apache.cloudstack.api.ServerApiException;
++import org.apache.log4j.Logger;
++
++import com.google.gson.Gson;
++import com.google.gson.GsonBuilder;
++
  import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
  import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
--import org.apache.log4j.Logger;
  
  import com.cloud.agent.AgentManager;
- import com.cloud.agent.api.AgentControlAnswer;
  import com.cloud.agent.api.Answer;
- import com.cloud.agent.api.ConsoleAccessAuthenticationAnswer;
- import com.cloud.agent.api.ConsoleAccessAuthenticationCommand;
  import com.cloud.agent.api.ConsoleProxyLoadReportCommand;
- import com.cloud.agent.api.GetVncPortAnswer;
- import com.cloud.agent.api.GetVncPortCommand;
  import com.cloud.agent.api.RebootCommand;
  import com.cloud.agent.api.StartupCommand;
  import com.cloud.agent.api.StartupProxyCommand;
@@@ -53,11 -45,6 +49,8 @@@ import com.cloud.agent.api.proxy.Consol
  import com.cloud.agent.api.to.NicTO;
  import com.cloud.agent.api.to.VirtualMachineTO;
  import com.cloud.agent.manager.Commands;
- import com.cloud.api.commands.DestroyConsoleProxyCmd;
 +import com.cloud.async.AsyncJobConstants;
 +import com.cloud.async.AsyncJobExecutionContext;
- import com.cloud.async.AsyncJobResult;
  import com.cloud.certificate.dao.CertificateDao;
  import com.cloud.cluster.ClusterManager;
  import com.cloud.configuration.Config;
@@@ -111,10 -94,9 +101,10 @@@ import com.cloud.resource.ResourceManag
  import com.cloud.resource.ResourceStateAdapter;
  import com.cloud.resource.ServerResource;
  import com.cloud.resource.UnableDeleteHostException;
 +import com.cloud.serializer.SerializerHelper;
+ import com.cloud.server.ManagementServer;
  import com.cloud.service.ServiceOfferingVO;
  import com.cloud.service.dao.ServiceOfferingDao;
- import com.cloud.servlet.ConsoleProxyServlet;
  import com.cloud.storage.StorageManager;
  import com.cloud.storage.StoragePoolStatus;
  import com.cloud.storage.VMTemplateHostVO;
@@@ -159,13 -136,11 +146,12 @@@ import com.cloud.vm.VirtualMachineGuru
  import com.cloud.vm.VirtualMachineManager;
  import com.cloud.vm.VirtualMachineName;
  import com.cloud.vm.VirtualMachineProfile;
++import com.cloud.vm.VmWork;
 +import com.cloud.vm.VmWorkStart;
 +import com.cloud.vm.VmWorkStop;
  import com.cloud.vm.dao.ConsoleProxyDao;
  import com.cloud.vm.dao.UserVmDetailsDao;
  import com.cloud.vm.dao.VMInstanceDao;
--import com.google.gson.Gson;
--import com.google.gson.GsonBuilder;
  
  //
  // Possible console proxy state transition cases
@@@ -244,9 -220,8 +231,11 @@@ public class ConsoleProxyManagerImpl ex
      TemplateManager templateMgr;
      @Inject
      IPAddressDao _ipAddressDao;
+     @Inject
+     ManagementServer _ms;
 +    
 +    @Inject
 +    EntityManager _entityMgr;
  
      private ConsoleProxyListener _listener;
  

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4039743/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --cc 
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 7eff938,e3dd06b..994a5c3
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@@ -40,10 -40,11 +40,11 @@@ import javax.ejb.Local
  import javax.inject.Inject;
  import javax.naming.ConfigurationException;
  
  import org.apache.log4j.Logger;
  import org.springframework.stereotype.Component;
  
++import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
++
  import com.cloud.agent.AgentManager;
  import com.cloud.agent.AgentManager.OnError;
  import com.cloud.agent.Listener;
@@@ -183,6 -185,6 +185,7 @@@ import com.cloud.offering.NetworkOfferi
  import com.cloud.offering.ServiceOffering;
  import com.cloud.offerings.dao.NetworkOfferingDao;
  import com.cloud.resource.ResourceManager;
++import com.cloud.server.ConfigurationServer;
  import com.cloud.service.ServiceOfferingVO;
  import com.cloud.service.dao.ServiceOfferingDao;
  import com.cloud.storage.GuestOSVO;
@@@ -235,6 -237,6 +238,7 @@@ import com.cloud.vm.VirtualMachineManag
  import com.cloud.vm.VirtualMachineName;
  import com.cloud.vm.VirtualMachineProfile;
  import com.cloud.vm.VirtualMachineProfile.Param;
++import com.cloud.vm.VmWork;
  import com.cloud.vm.dao.DomainRouterDao;
  import com.cloud.vm.dao.NicDao;
  import com.cloud.vm.dao.UserVmDao;
@@@ -3317,7 -3342,33 +3344,33 @@@ public class VirtualNetworkApplianceMan
              }
          });
      }
 -    
 +
+     
+     @Override
+     public boolean applyLoadBalancingRules(Network network, final List<? 
extends LoadBalancingRule> rules, List<? extends VirtualRouter> routers) throws 
ResourceUnavailableException {
+         if (rules == null || rules.isEmpty()) {
+             s_logger.debug("No lb rules to be applied for network " + 
network.getId());
+             return true;
+         }
+         return applyRules(network, routers, "loadbalancing rules", false, 
null, false, new RuleApplier() {
+             @Override
+             public boolean execute(Network network, VirtualRouter router) 
throws ResourceUnavailableException {
+                 // for load balancer we have to resend all lb rules for the 
network
+                 List<LoadBalancerVO> lbs = 
_loadBalancerDao.listByNetworkIdAndScheme(network.getId(), Scheme.Public);
+                 List<LoadBalancingRule> lbRules = new 
ArrayList<LoadBalancingRule>();
+                 for (LoadBalancerVO lb : lbs) {
+                     List<LbDestination> dstList = 
_lbMgr.getExistingDestinations(lb.getId());
+                     List<LbStickinessPolicy> policyList = 
_lbMgr.getStickinessPolicies(lb.getId());
+                     List<LbHealthCheckPolicy> hcPolicyList = 
_lbMgr.getHealthCheckPolicies(lb.getId());
+                     Ip sourceIp = 
_networkModel.getPublicIpAddress(lb.getSourceIpAddressId()).getAddress();
+                     LoadBalancingRule loadBalancing = new 
LoadBalancingRule(lb, dstList, policyList, hcPolicyList, sourceIp);
+                     lbRules.add(loadBalancing);
+                 }
+                 return sendLBRules(router, lbRules, network.getId());  
+             }
+         });
+     }
+ 
      protected boolean sendLBRules(VirtualRouter router, 
List<LoadBalancingRule> rules, long guestNetworkId) throws 
ResourceUnavailableException {
          Commands cmds = new Commands(OnError.Continue);
          createApplyLoadBalancingRulesCommands(rules, router, cmds, 
guestNetworkId);
@@@ -3713,12 -3764,11 +3766,18 @@@
              }
          }
      }
 -
 +    
 +    @Override
 +    public void vmWorkStart(VmWork work) {
 +    }
 +    
 +    @Override
 +    public void vmWorkStop(VmWork work) {
 +    }
+ 
+ 
+     @Override
+     public VirtualRouter findRouter(long routerId) {
+         return _routerDao.findById(routerId);
+     }
  }

Reply via email to