cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [12/12] git commit: updated refs/heads/vmsync to cbdc406
Date Wed, 15 May 2013 17:13:14 GMT
Isolated the job queue work in its own project


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cbdc4063
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cbdc4063
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cbdc4063

Branch: refs/heads/vmsync
Commit: cbdc4063c80926e8bdbf453907905d6c5b8e3e39
Parents: bb242a8
Author: Alex Huang <alex.huang@gmail.com>
Authored: Wed May 15 10:14:39 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
Committed: Wed May 15 10:14:39 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/agent/api/to/FirewallRuleTO.java |    1 -
 .../com/cloud/async/AsyncInstanceCreateStatus.java |   24 -
 api/src/com/cloud/async/AsyncJob.java              |  109 ----
 api/src/com/cloud/async/SyncQueueItem.java         |   41 --
 .../cloud/configuration/ConfigurationService.java  |   10 +-
 api/src/com/cloud/event/UsageEvent.java            |    4 +-
 .../exception/AgentControlChannelException.java    |    1 -
 api/src/com/cloud/network/NetworkService.java      |    3 +-
 api/src/com/cloud/network/NetworkUsageService.java |    5 +-
 api/src/com/cloud/network/PhysicalNetwork.java     |    3 +-
 .../com/cloud/network/rules/HealthCheckPolicy.java |    3 -
 .../network/security/SecurityGroupService.java     |    1 -
 .../com/cloud/network/security/SecurityRule.java   |    8 +-
 api/src/com/cloud/offering/NetworkOffering.java    |    2 -
 .../region/ha/GlobalLoadBalancingRulesService.java |   12 +-
 .../cloud/resource/UnableDeleteHostException.java  |    2 +-
 api/src/com/cloud/storage/Snapshot.java            |    5 +-
 .../cloud/storage/snapshot/SnapshotSchedule.java   |    4 +-
 api/src/com/cloud/user/AccountService.java         |    5 -
 api/src/com/cloud/user/UserContext.java            |    3 +-
 api/src/com/cloud/vm/UserVmService.java            |    1 +
 api/src/com/cloud/vm/snapshot/VMSnapshot.java      |    2 +-
 .../cloudstack/affinity/AffinityGroupResponse.java |    9 +-
 .../affinity/AffinityGroupTypeResponse.java        |    7 +-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java    |   18 +-
 .../apache/cloudstack/api/BaseAsyncCreateCmd.java  |   12 -
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    3 +-
 api/src/org/apache/cloudstack/api/BaseListCmd.java |    1 -
 .../api/BaseListTemplateOrIsoPermissionsCmd.java   |    3 +-
 .../org/apache/cloudstack/api/BaseResponse.java    |    3 +-
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |    3 +-
 .../api/BaseUpdateTemplateOrIsoPermissionsCmd.java |    3 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |    6 -
 .../command/admin/account/CreateAccountCmd.java    |   14 +-
 .../command/admin/account/DeleteAccountCmd.java    |    4 +-
 .../command/admin/account/DisableAccountCmd.java   |    4 +-
 .../command/admin/account/EnableAccountCmd.java    |    3 +-
 .../api/command/admin/account/LockAccountCmd.java  |    3 +-
 .../command/admin/account/UpdateAccountCmd.java    |    3 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |    4 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |    4 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |    4 +-
 .../command/admin/cluster/DeleteClusterCmd.java    |    3 +-
 .../api/command/admin/cluster/ListClustersCmd.java |    3 +-
 .../command/admin/cluster/UpdateClusterCmd.java    |    3 +-
 .../api/command/admin/config/ListCfgsByCmd.java    |   10 +-
 .../config/ListHypervisorCapabilitiesCmd.java      |    3 +-
 .../api/command/admin/config/UpdateCfgCmd.java     |    9 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java    |    3 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |    3 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |    3 +-
 .../admin/domain/ListDomainChildrenCmd.java        |    3 +-
 .../api/command/admin/domain/ListDomainsCmd.java   |    3 +-
 .../api/command/admin/domain/UpdateDomainCmd.java  |    4 +-
 .../api/command/admin/host/AddHostCmd.java         |    3 +-
 .../command/admin/host/AddSecondaryStorageCmd.java |    3 +-
 .../command/admin/host/CancelMaintenanceCmd.java   |    4 +-
 .../api/command/admin/host/DeleteHostCmd.java      |    3 +-
 .../admin/host/FindHostsForMigrationCmd.java       |    3 +-
 .../api/command/admin/host/ListHostsCmd.java       |    4 +-
 .../admin/host/PrepareForMaintenanceCmd.java       |    4 +-
 .../api/command/admin/host/ReconnectHostCmd.java   |    4 +-
 .../api/command/admin/host/UpdateHostCmd.java      |    3 +-
 .../command/admin/host/UpdateHostPasswordCmd.java  |    3 +-
 .../ConfigureInternalLoadBalancerElementCmd.java   |    3 +-
 .../CreateInternalLoadBalancerElementCmd.java      |    3 +-
 .../ListInternalLoadBalancerElementsCmd.java       |    3 +-
 .../api/command/admin/ldap/LDAPConfigCmd.java      |    5 +-
 .../api/command/admin/ldap/LDAPRemoveCmd.java      |    3 +-
 .../command/admin/network/AddNetworkDeviceCmd.java |    3 +-
 .../network/AddNetworkServiceProviderCmd.java      |    4 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |    3 +-
 .../admin/network/CreatePhysicalNetworkCmd.java    |    4 +-
 .../network/CreateStorageNetworkIpRangeCmd.java    |    3 +-
 .../admin/network/DedicateGuestVlanRangeCmd.java   |   12 +-
 .../admin/network/DeleteNetworkDeviceCmd.java      |    3 +-
 .../admin/network/DeleteNetworkOfferingCmd.java    |    3 +-
 .../network/DeleteNetworkServiceProviderCmd.java   |    4 +-
 .../admin/network/DeletePhysicalNetworkCmd.java    |    4 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java    |    3 +-
 .../network/ListDedicatedGuestVlanRangesCmd.java   |   22 +-
 .../admin/network/ListNetworkDeviceCmd.java        |    3 +-
 .../network/ListNetworkServiceProvidersCmd.java    |    3 +-
 .../admin/network/ListPhysicalNetworksCmd.java     |    3 +-
 .../network/ListStorageNetworkIpRangeCmd.java      |    3 +-
 .../network/ListSupportedNetworkServicesCmd.java   |    3 +-
 .../admin/network/UpdateNetworkOfferingCmd.java    |    3 +-
 .../network/UpdateNetworkServiceProviderCmd.java   |    4 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java    |    4 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |    3 +-
 .../admin/offering/CreateDiskOfferingCmd.java      |    3 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |    3 +-
 .../admin/offering/DeleteDiskOfferingCmd.java      |    3 +-
 .../admin/offering/DeleteServiceOfferingCmd.java   |    3 +-
 .../admin/offering/UpdateDiskOfferingCmd.java      |    3 +-
 .../admin/offering/UpdateServiceOfferingCmd.java   |    3 +-
 .../api/command/admin/pod/CreatePodCmd.java        |    3 +-
 .../api/command/admin/pod/DeletePodCmd.java        |    3 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |    3 +-
 .../api/command/admin/pod/UpdatePodCmd.java        |    3 +-
 .../api/command/admin/region/AddRegionCmd.java     |    3 +-
 .../api/command/admin/region/RemoveRegionCmd.java  |    3 +-
 .../api/command/admin/region/UpdateRegionCmd.java  |    3 +-
 .../command/admin/resource/ArchiveAlertsCmd.java   |    4 +-
 .../command/admin/resource/DeleteAlertsCmd.java    |    3 +-
 .../api/command/admin/resource/ListAlertsCmd.java  |    3 +-
 .../command/admin/resource/ListCapacityCmd.java    |    3 +-
 .../admin/resource/UploadCustomCertificateCmd.java |    3 +-
 .../router/ConfigureVirtualRouterElementCmd.java   |    4 +-
 .../router/CreateVirtualRouterElementCmd.java      |    3 +-
 .../api/command/admin/router/DestroyRouterCmd.java |    4 +-
 .../api/command/admin/router/ListRoutersCmd.java   |    4 +-
 .../admin/router/ListVirtualRouterElementsCmd.java |    3 +-
 .../api/command/admin/router/RebootRouterCmd.java  |    4 +-
 .../api/command/admin/router/StartRouterCmd.java   |    4 +-
 .../api/command/admin/router/StopRouterCmd.java    |    4 +-
 .../api/command/admin/router/UpgradeRouterCmd.java |    3 +-
 .../CancelPrimaryStorageMaintenanceCmd.java        |    4 +-
 .../admin/storage/CreateStoragePoolCmd.java        |    3 +-
 .../api/command/admin/storage/DeletePoolCmd.java   |    3 +-
 .../command/admin/storage/ListStoragePoolsCmd.java |    4 +-
 .../admin/storage/ListStorageProvidersCmd.java     |    3 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java    |    4 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |    3 +-
 .../api/command/admin/swift/AddSwiftCmd.java       |    3 +-
 .../api/command/admin/swift/ListSwiftsCmd.java     |    3 +-
 .../command/admin/systemvm/DestroySystemVmCmd.java |    4 +-
 .../command/admin/systemvm/ListSystemVMsCmd.java   |    4 +-
 .../command/admin/systemvm/MigrateSystemVMCmd.java |    3 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |    4 +-
 .../command/admin/systemvm/StartSystemVMCmd.java   |    4 +-
 .../command/admin/systemvm/StopSystemVmCmd.java    |    4 +-
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    3 +-
 .../command/admin/template/PrepareTemplateCmd.java |    3 +-
 .../command/admin/usage/AddTrafficMonitorCmd.java  |    3 +-
 .../api/command/admin/usage/AddTrafficTypeCmd.java |    4 +-
 .../admin/usage/DeleteTrafficMonitorCmd.java       |    3 +-
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |    4 +-
 .../admin/usage/GenerateUsageRecordsCmd.java       |    9 +-
 .../command/admin/usage/GetUsageRecordsCmd.java    |    4 +-
 .../admin/usage/ListTrafficMonitorsCmd.java        |    3 +-
 .../usage/ListTrafficTypeImplementorsCmd.java      |    3 +-
 .../command/admin/usage/ListTrafficTypesCmd.java   |    3 +-
 .../api/command/admin/usage/ListUsageTypesCmd.java |    3 +-
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |    4 +-
 .../api/command/admin/user/CreateUserCmd.java      |    3 +-
 .../api/command/admin/user/DeleteUserCmd.java      |    3 +-
 .../api/command/admin/user/DisableUserCmd.java     |    5 +-
 .../api/command/admin/user/EnableUserCmd.java      |    3 +-
 .../api/command/admin/user/GetUserCmd.java         |    3 +-
 .../api/command/admin/user/ListUsersCmd.java       |    3 +-
 .../api/command/admin/user/LockUserCmd.java        |    3 +-
 .../api/command/admin/user/RegisterCmd.java        |    3 +-
 .../api/command/admin/user/UpdateUserCmd.java      |    3 +-
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |    3 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |    4 +-
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |    3 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |    3 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |    3 +-
 .../api/command/admin/vm/AssignVMCmd.java          |    3 +-
 .../api/command/admin/vm/MigrateVMCmd.java         |    3 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |   12 +-
 .../api/command/admin/vm/RecoverVMCmd.java         |    3 +-
 .../command/admin/vpc/CreatePrivateGatewayCmd.java |    4 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   10 +-
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |    4 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |    3 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |    3 +-
 .../api/command/admin/zone/CreateZoneCmd.java      |    3 +-
 .../api/command/admin/zone/DeleteZoneCmd.java      |    3 +-
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |    4 +-
 .../api/command/admin/zone/UpdateZoneCmd.java      |    3 +-
 .../user/account/AddAccountToProjectCmd.java       |    3 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |    3 +-
 .../api/command/user/account/ListAccountsCmd.java  |    3 +-
 .../user/account/ListProjectAccountsCmd.java       |    3 +-
 .../command/user/address/AssociateIPAddrCmd.java   |   16 +-
 .../user/address/DisassociateIPAddrCmd.java        |    4 +-
 .../user/address/ListPublicIpAddressesCmd.java     |    4 +-
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |    3 +-
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |    4 +-
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |    4 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |    4 +-
 .../command/user/autoscale/CreateConditionCmd.java |    4 +-
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |    4 +-
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |    4 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |    4 +-
 .../command/user/autoscale/DeleteConditionCmd.java |    4 +-
 .../user/autoscale/DisableAutoScaleVmGroupCmd.java |    4 +-
 .../user/autoscale/EnableAutoScaleVmGroupCmd.java  |    4 +-
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |    3 +-
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |    3 +-
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |    3 +-
 .../command/user/autoscale/ListConditionsCmd.java  |    3 +-
 .../command/user/autoscale/ListCountersCmd.java    |    3 +-
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |    4 +-
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |    4 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |    4 +-
 .../command/user/config/ListCapabilitiesCmd.java   |    3 +-
 .../api/command/user/event/ArchiveEventsCmd.java   |    4 +-
 .../api/command/user/event/DeleteEventsCmd.java    |    4 +-
 .../api/command/user/event/ListEventTypesCmd.java  |    3 +-
 .../api/command/user/event/ListEventsCmd.java      |    3 +-
 .../user/firewall/CreateEgressFirewallRuleCmd.java |    3 +-
 .../user/firewall/CreateFirewallRuleCmd.java       |    3 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |    4 +-
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |    5 +-
 .../user/firewall/DeleteFirewallRuleCmd.java       |    4 +-
 .../user/firewall/DeletePortForwardingRuleCmd.java |    4 +-
 .../user/firewall/ListEgressFirewallRulesCmd.java  |    5 +-
 .../user/firewall/ListFirewallRulesCmd.java        |    3 +-
 .../user/firewall/ListPortForwardingRulesCmd.java  |    3 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |    3 +-
 .../user/guest/ListGuestOsCategoriesCmd.java       |    3 +-
 .../api/command/user/guest/ListGuestOsCmd.java     |    3 +-
 .../api/command/user/iso/AttachIsoCmd.java         |    3 +-
 .../api/command/user/iso/CopyIsoCmd.java           |    3 +-
 .../api/command/user/iso/DeleteIsoCmd.java         |    4 +-
 .../api/command/user/iso/DetachIsoCmd.java         |    4 +-
 .../api/command/user/iso/ExtractIsoCmd.java        |    4 +-
 .../command/user/iso/ListIsoPermissionsCmd.java    |    3 +-
 .../api/command/user/iso/ListIsosCmd.java          |    4 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |    3 +-
 .../api/command/user/iso/UpdateIsoCmd.java         |    3 +-
 .../command/user/iso/UpdateIsoPermissionsCmd.java  |    3 +-
 .../command/user/job/QueryAsyncJobResultCmd.java   |    3 +-
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |    3 +-
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |    7 +-
 .../loadbalancer/CreateLBStickinessPolicyCmd.java  |    3 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |    4 +-
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |    5 +-
 .../loadbalancer/DeleteLBStickinessPolicyCmd.java  |    3 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |    4 +-
 .../ListApplicationLoadBalancersCmd.java           |    3 +-
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |    7 +-
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |    3 +-
 .../ListLoadBalancerRuleInstancesCmd.java          |    3 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |    3 +-
 .../RemoveFromLoadBalancerRuleCmd.java             |    3 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |    3 +-
 .../user/nat/CreateIpForwardingRuleCmd.java        |    4 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java        |    4 +-
 .../api/command/user/nat/DisableStaticNatCmd.java  |    3 +-
 .../api/command/user/nat/EnableStaticNatCmd.java   |    3 +-
 .../command/user/nat/ListIpForwardingRulesCmd.java |    3 +-
 .../command/user/network/CreateNetworkACLCmd.java  |    4 +-
 .../api/command/user/network/CreateNetworkCmd.java |    3 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |    4 +-
 .../api/command/user/network/DeleteNetworkCmd.java |    3 +-
 .../command/user/network/ListNetworkACLsCmd.java   |    3 +-
 .../user/network/ListNetworkOfferingsCmd.java      |    3 +-
 .../api/command/user/network/ListNetworksCmd.java  |    3 +-
 .../command/user/network/RestartNetworkCmd.java    |    3 +-
 .../api/command/user/network/UpdateNetworkCmd.java |    3 +-
 .../user/offering/ListDiskOfferingsCmd.java        |    7 +-
 .../user/offering/ListServiceOfferingsCmd.java     |    4 +-
 .../command/user/project/ActivateProjectCmd.java   |    3 +-
 .../api/command/user/project/CreateProjectCmd.java |    3 +-
 .../api/command/user/project/DeleteProjectCmd.java |    3 +-
 .../user/project/DeleteProjectInvitationCmd.java   |    3 +-
 .../user/project/ListProjectInvitationsCmd.java    |    3 +-
 .../api/command/user/project/ListProjectsCmd.java  |    3 +-
 .../command/user/project/SuspendProjectCmd.java    |    3 +-
 .../api/command/user/project/UpdateProjectCmd.java |    3 +-
 .../user/project/UpdateProjectInvitationCmd.java   |    3 +-
 .../api/command/user/region/ListRegionsCmd.java    |    3 +-
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |   24 +-
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |   23 +-
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |   19 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |   15 +-
 .../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java  |   24 +-
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |    8 +-
 .../user/resource/GetCloudIdentifierCmd.java       |    3 +-
 .../command/user/resource/ListHypervisorsCmd.java  |    3 +-
 .../user/resource/ListResourceLimitsCmd.java       |    3 +-
 .../user/resource/UpdateResourceCountCmd.java      |    3 +-
 .../user/resource/UpdateResourceLimitCmd.java      |    3 +-
 .../AuthorizeSecurityGroupEgressCmd.java           |    4 +-
 .../AuthorizeSecurityGroupIngressCmd.java          |    4 +-
 .../user/securitygroup/CreateSecurityGroupCmd.java |    3 +-
 .../user/securitygroup/DeleteSecurityGroupCmd.java |    3 +-
 .../user/securitygroup/ListSecurityGroupsCmd.java  |    4 +-
 .../RevokeSecurityGroupEgressCmd.java              |    4 +-
 .../RevokeSecurityGroupIngressCmd.java             |    4 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |    4 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |    3 +-
 .../command/user/snapshot/DeleteSnapshotCmd.java   |    4 +-
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |    3 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |    3 +-
 .../command/user/snapshot/ListSnapshotsCmd.java    |    4 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |    3 +-
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |    3 +-
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |    3 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |    3 +-
 .../api/command/user/tag/CreateTagsCmd.java        |    3 +-
 .../api/command/user/tag/DeleteTagsCmd.java        |    3 +-
 .../api/command/user/template/CopyTemplateCmd.java |    5 +-
 .../command/user/template/CreateTemplateCmd.java   |    4 +-
 .../command/user/template/DeleteTemplateCmd.java   |    5 +-
 .../command/user/template/ExtractTemplateCmd.java  |    5 +-
 .../user/template/ListTemplatePermissionsCmd.java  |    3 +-
 .../command/user/template/ListTemplatesCmd.java    |    4 +-
 .../command/user/template/RegisterTemplateCmd.java |    4 +-
 .../command/user/template/UpdateTemplateCmd.java   |    3 +-
 .../template/UpdateTemplatePermissionsCmd.java     |    3 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |    3 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |   14 +-
 .../api/command/user/vm/DeployVMCmd.java           |    4 +-
 .../api/command/user/vm/DestroyVMCmd.java          |    5 +-
 .../api/command/user/vm/GetVMPasswordCmd.java      |    3 +-
 .../api/command/user/vm/ListNicsCmd.java           |    2 -
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |    4 +-
 .../api/command/user/vm/RebootVMCmd.java           |    5 +-
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |    4 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java    |   14 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java    |    4 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |   13 +-
 .../api/command/user/vm/RestoreVMCmd.java          |    3 +-
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |   22 +-
 .../cloudstack/api/command/user/vm/StartVMCmd.java |    5 +-
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |    5 +-
 .../command/user/vm/UpdateDefaultNicForVMCmd.java  |   14 +-
 .../api/command/user/vm/UpdateVMCmd.java           |    3 +-
 .../api/command/user/vm/UpgradeVMCmd.java          |    3 +-
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |    3 +-
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |    3 +-
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |    3 +-
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |    3 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |    3 +-
 .../api/command/user/volume/AttachVolumeCmd.java   |    4 +-
 .../api/command/user/volume/CreateVolumeCmd.java   |    4 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    3 +-
 .../api/command/user/volume/DetachVolumeCmd.java   |    4 +-
 .../api/command/user/volume/ExtractVolumeCmd.java  |    4 +-
 .../api/command/user/volume/ListVolumesCmd.java    |    4 +-
 .../api/command/user/volume/ResizeVolumeCmd.java   |    4 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |    3 +-
 .../api/command/user/vpc/CreateStaticRouteCmd.java |    4 +-
 .../api/command/user/vpc/CreateVPCCmd.java         |    3 +-
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |    4 +-
 .../api/command/user/vpc/DeleteVPCCmd.java         |    3 +-
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |    3 +-
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |    3 +-
 .../api/command/user/vpc/ListVPCsCmd.java          |    4 +-
 .../api/command/user/vpc/RestartVPCCmd.java        |    3 +-
 .../api/command/user/vpc/UpdateVPCCmd.java         |    3 +-
 .../api/command/user/vpn/AddVpnUserCmd.java        |    3 +-
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |    3 +-
 .../command/user/vpn/CreateVpnConnectionCmd.java   |    3 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |    3 +-
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |    3 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |    3 +-
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |    3 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |    3 +-
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |    3 +-
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |    3 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java    |    3 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |    3 +-
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |    3 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java      |    3 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |    3 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java    |    3 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |    3 +-
 .../api/command/user/zone/ListZonesByCmd.java      |    8 +-
 .../cloudstack/api/response/AccountResponse.java   |    3 +-
 .../api/response/AddIpToVmNicResponse.java         |    4 +-
 .../cloudstack/api/response/AlertResponse.java     |    3 +-
 .../ApplicationLoadBalancerInstanceResponse.java   |    3 +-
 .../response/ApplicationLoadBalancerResponse.java  |    5 +-
 .../ApplicationLoadBalancerRuleResponse.java       |    3 +-
 .../cloudstack/api/response/AsyncJobResponse.java  |    7 +-
 .../api/response/AutoScalePolicyResponse.java      |    3 +-
 .../api/response/AutoScaleVmGroupResponse.java     |    3 +-
 .../api/response/AutoScaleVmProfileResponse.java   |    3 +-
 .../api/response/CapabilitiesResponse.java         |    3 +-
 .../api/response/CapabilityResponse.java           |    3 +-
 .../cloudstack/api/response/CapacityResponse.java  |    3 +-
 .../api/response/CloudIdentifierResponse.java      |    3 +-
 .../cloudstack/api/response/ClusterResponse.java   |    3 +-
 .../cloudstack/api/response/ConditionResponse.java |    3 +-
 .../api/response/ConfigurationResponse.java        |    3 +-
 .../cloudstack/api/response/CounterResponse.java   |    3 +-
 .../api/response/CustomCertificateResponse.java    |    3 +-
 .../api/response/DeploymentPlannersResponse.java   |    3 +-
 .../api/response/DiskOfferingResponse.java         |    3 +-
 .../cloudstack/api/response/DomainResponse.java    |    3 +-
 .../api/response/DomainRouterResponse.java         |    4 +-
 .../cloudstack/api/response/EventResponse.java     |    3 +-
 .../cloudstack/api/response/EventTypeResponse.java |    3 +-
 .../cloudstack/api/response/ExceptionResponse.java |    3 +-
 .../api/response/ExternalFirewallResponse.java     |    3 +-
 .../api/response/ExternalLoadBalancerResponse.java |    3 +-
 .../cloudstack/api/response/ExtractResponse.java   |    3 +-
 .../cloudstack/api/response/FirewallResponse.java  |    3 +-
 .../api/response/FirewallRuleResponse.java         |    3 +-
 .../api/response/GetVMPasswordResponse.java        |    3 +-
 .../api/response/GlobalLoadBalancerResponse.java   |    8 +-
 .../api/response/GuestOSCategoryResponse.java      |    3 +-
 .../cloudstack/api/response/GuestOSResponse.java   |    3 +-
 .../api/response/GuestVlanRangeResponse.java       |    3 +-
 .../api/response/HostForMigrationResponse.java     |    3 +-
 .../cloudstack/api/response/HostResponse.java      |    3 +-
 .../response/HypervisorCapabilitiesResponse.java   |    3 +-
 .../api/response/HypervisorResponse.java           |    3 +-
 .../cloudstack/api/response/IPAddressResponse.java |    3 +-
 .../api/response/InstanceGroupResponse.java        |    3 +-
 .../InternalLoadBalancerElementResponse.java       |    3 +-
 .../api/response/IpForwardingRuleResponse.java     |    3 +-
 .../cloudstack/api/response/IsoVmResponse.java     |    3 +-
 .../api/response/IsolationMethodResponse.java      |    3 +-
 .../api/response/LBHealthCheckPolicyResponse.java  |    6 +-
 .../api/response/LBHealthCheckResponse.java        |   11 +-
 .../api/response/LBStickinessPolicyResponse.java   |    3 +-
 .../api/response/LBStickinessResponse.java         |    3 +-
 .../api/response/LDAPConfigResponse.java           |    3 +-
 .../api/response/LoadBalancerResponse.java         |    3 +-
 .../api/response/NetworkACLResponse.java           |    3 +-
 .../api/response/NetworkDeviceResponse.java        |    3 +-
 .../api/response/NetworkOfferingResponse.java      |    3 +-
 .../cloudstack/api/response/NetworkResponse.java   |    3 +-
 .../cloudstack/api/response/NicResponse.java       |    8 +-
 .../api/response/NicSecondaryIpResponse.java       |    5 +-
 .../api/response/PhysicalNetworkResponse.java      |    3 +-
 .../cloudstack/api/response/PodResponse.java       |    3 +-
 .../api/response/PrivateGatewayResponse.java       |    3 +-
 .../api/response/ProjectAccountResponse.java       |    3 +-
 .../api/response/ProjectInvitationResponse.java    |    3 +-
 .../cloudstack/api/response/ProjectResponse.java   |    3 +-
 .../cloudstack/api/response/ProviderResponse.java  |    3 +-
 .../cloudstack/api/response/RegionResponse.java    |    3 +-
 .../cloudstack/api/response/RegisterResponse.java  |    3 +-
 .../api/response/RemoteAccessVpnResponse.java      |    3 +-
 .../api/response/ResourceCountResponse.java        |    3 +-
 .../api/response/ResourceLimitResponse.java        |    3 +-
 .../api/response/ResourceTagResponse.java          |    3 +-
 .../apache/cloudstack/api/response/S3Response.java |    3 +-
 .../api/response/SSHKeyPairResponse.java           |    3 +-
 .../api/response/SecurityGroupResponse.java        |    4 +-
 .../api/response/SecurityGroupRuleResponse.java    |    3 +-
 .../api/response/ServiceOfferingResponse.java      |    3 +-
 .../cloudstack/api/response/ServiceResponse.java   |    6 +-
 .../response/Site2SiteCustomerGatewayResponse.java |    3 +-
 .../response/Site2SiteVpnConnectionResponse.java   |    3 +-
 .../api/response/Site2SiteVpnGatewayResponse.java  |    3 +-
 .../api/response/SnapshotPolicyResponse.java       |    3 +-
 .../cloudstack/api/response/SnapshotResponse.java  |   12 +-
 .../api/response/SnapshotScheduleResponse.java     |    3 +-
 .../api/response/StaticRouteResponse.java          |    3 +-
 .../cloudstack/api/response/StatusResponse.java    |    4 +-
 .../response/StorageNetworkIpRangeResponse.java    |    3 +-
 .../response/StoragePoolForMigrationResponse.java  |    3 +-
 .../api/response/StoragePoolResponse.java          |    3 +-
 .../api/response/StorageProviderResponse.java      |    3 +-
 .../cloudstack/api/response/SuccessResponse.java   |    3 +-
 .../cloudstack/api/response/SwiftResponse.java     |    3 +-
 .../api/response/SystemVmInstanceResponse.java     |    3 +-
 .../cloudstack/api/response/SystemVmResponse.java  |    3 +-
 .../api/response/TemplatePermissionsResponse.java  |    3 +-
 .../cloudstack/api/response/TemplateResponse.java  |    3 +-
 .../api/response/TrafficMonitorResponse.java       |    3 +-
 .../response/TrafficTypeImplementorResponse.java   |    3 +-
 .../api/response/TrafficTypeResponse.java          |    3 +-
 .../cloudstack/api/response/UpgradeVmResponse.java |    3 +-
 .../api/response/UsageRecordResponse.java          |    3 +-
 .../cloudstack/api/response/UsageTypeResponse.java |    3 +-
 .../cloudstack/api/response/UserResponse.java      |    3 +-
 .../cloudstack/api/response/UserVmResponse.java    |    4 +-
 .../api/response/VMSnapshotResponse.java           |    3 +-
 .../response/VirtualRouterProviderResponse.java    |    3 +-
 .../api/response/VlanIpRangeResponse.java          |    3 +-
 .../cloudstack/api/response/VolumeResponse.java    |    4 +-
 .../api/response/VpcOfferingResponse.java          |    3 +-
 .../cloudstack/api/response/VpcResponse.java       |    3 +-
 .../cloudstack/api/response/VpnUsersResponse.java  |    3 +-
 .../cloudstack/api/response/ZoneResponse.java      |    3 +-
 .../InternalLoadBalancerElementService.java        |    1 -
 api/src/org/apache/cloudstack/usage/Usage.java     |   11 -
 client/tomcatconf/applicationContext.xml.in        |   41 +-
 core/src/com/cloud/async/AsyncJobJoinMapVO.java    |  210 --------
 core/src/com/cloud/async/AsyncJobJournalVO.java    |  108 ----
 .../engine/service/api/OperationsServices.java     |   19 +-
 .../com/cloud/network/dao/NetworkRuleConfigVO.java |   18 +-
 .../network/security/SecurityGroupRuleVO.java      |   41 +--
 framework/jobs/pom.xml                             |    5 +
 .../org/apache/cloudstack/framework/job/Job.java   |   32 --
 .../cloudstack/framework/job/JobInterceptor.java   |   23 -
 .../apache/cloudstack/framework/jobs/AsyncJob.java |  115 +++++
 .../framework/jobs/AsyncJobConstants.java          |   34 ++
 .../framework/jobs/AsyncJobDispatcher.java         |   23 +
 .../framework/jobs/AsyncJobJoinMapVO.java          |  210 ++++++++
 .../framework/jobs/AsyncJobJournalVO.java          |  108 ++++
 .../cloudstack/framework/jobs/AsyncJobMBean.java   |   37 ++
 .../framework/jobs/AsyncJobMBeanImpl.java          |  143 ++++++
 .../cloudstack/framework/jobs/AsyncJobManager.java |  129 +++++
 .../cloudstack/framework/jobs/AsyncJobMonitor.java |  179 +++++++
 .../cloudstack/framework/jobs/AsyncJobVO.java      |  382 +++++++++++++++
 .../cloudstack/framework/jobs/SyncQueueItem.java   |   41 ++
 .../cloudstack/framework/jobs/SyncQueueItemVO.java |  143 ++++++
 .../framework/jobs/SyncQueueManager.java           |   34 ++
 .../framework/jobs/SyncQueueManagerImpl.java       |  258 ++++++++++
 .../cloudstack/framework/jobs/SyncQueueVO.java     |  137 +++++
 .../cloudstack/framework/jobs/dao/AsyncJobDao.java |   35 ++
 .../framework/jobs/dao/AsyncJobDaoImpl.java        |  156 ++++++
 .../framework/jobs/dao/AsyncJobJoinMapDao.java     |   40 ++
 .../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java |  239 +++++++++
 .../framework/jobs/dao/AsyncJobJournalDao.java     |   27 +
 .../framework/jobs/dao/AsyncJobJournalDaoImpl.java |   45 ++
 .../framework/jobs/dao/SyncQueueDao.java           |   26 +
 .../framework/jobs/dao/SyncQueueDaoImpl.java       |   78 +++
 .../framework/jobs/dao/SyncQueueItemDao.java       |   31 ++
 .../framework/jobs/dao/SyncQueueItemDaoImpl.java   |  155 ++++++
 server/pom.xml                                     |    2 -
 .../src/com/cloud/api/ApiAsyncJobDispatcher.java   |   18 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   22 +-
 server/src/com/cloud/api/ApiDispatcher.java        |   10 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |   27 +-
 server/src/com/cloud/api/ApiServer.java            |   44 ++-
 .../com/cloud/api/query/dao/AsyncJobJoinDao.java   |    4 +-
 .../cloud/api/query/dao/AsyncJobJoinDaoImpl.java   |   14 +-
 server/src/com/cloud/async/AsyncJobConstants.java  |   34 --
 server/src/com/cloud/async/AsyncJobDispatcher.java |   23 -
 .../com/cloud/async/AsyncJobExecutionContext.java  |   22 +-
 server/src/com/cloud/async/AsyncJobMBean.java      |   37 --
 server/src/com/cloud/async/AsyncJobMBeanImpl.java  |  143 ------
 server/src/com/cloud/async/AsyncJobManager.java    |  128 -----
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |   51 ++-
 server/src/com/cloud/async/AsyncJobMonitor.java    |  179 -------
 server/src/com/cloud/async/AsyncJobResult.java     |    2 +
 server/src/com/cloud/async/AsyncJobVO.java         |  382 ---------------
 server/src/com/cloud/async/SyncQueueItemVO.java    |  142 ------
 server/src/com/cloud/async/SyncQueueManager.java   |   34 --
 .../src/com/cloud/async/SyncQueueManagerImpl.java  |  257 ----------
 server/src/com/cloud/async/SyncQueueVO.java        |  137 -----
 server/src/com/cloud/async/dao/AsyncJobDao.java    |   34 --
 .../src/com/cloud/async/dao/AsyncJobDaoImpl.java   |  155 ------
 .../com/cloud/async/dao/AsyncJobJoinMapDao.java    |   39 --
 .../cloud/async/dao/AsyncJobJoinMapDaoImpl.java    |  238 ---------
 .../com/cloud/async/dao/AsyncJobJournalDao.java    |   26 -
 .../cloud/async/dao/AsyncJobJournalDaoImpl.java    |   44 --
 server/src/com/cloud/async/dao/SyncQueueDao.java   |   25 -
 .../src/com/cloud/async/dao/SyncQueueDaoImpl.java  |   77 ---
 .../src/com/cloud/async/dao/SyncQueueItemDao.java  |   30 --
 .../com/cloud/async/dao/SyncQueueItemDaoImpl.java  |  154 ------
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    2 +-
 .../src/com/cloud/server/ManagementServerImpl.java |    8 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    2 +-
 .../src/com/cloud/storage/VolumeManagerImpl.java   |  107 ++--
 .../secondary/SecondaryStorageManagerImpl.java     |    3 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |    9 +-
 .../com/cloud/storage/upload/UploadListener.java   |    4 +-
 .../com/cloud/storage/upload/UploadMonitor.java    |    3 +-
 .../cloud/storage/upload/UploadMonitorImpl.java    |    3 +-
 .../com/cloud/template/TemplateManagerImpl.java    |    4 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    6 +-
 server/src/com/cloud/vm/VmWorkJobDaoImpl.java      |    3 +-
 server/src/com/cloud/vm/VmWorkJobDispatcher.java   |   13 +-
 server/src/com/cloud/vm/VmWorkJobVO.java           |    3 +-
 .../com/cloud/vm/VmWorkJobWakeupDispatcher.java    |   15 +-
 .../vm/VmWorkMockVirtualMachineManagerImpl.java    |    2 +-
 server/test/com/cloud/vm/VmWorkTest.java           |    5 +-
 .../com/cloud/vm/VmWorkTestApiJobDispatcher.java   |   15 +-
 .../test/com/cloud/vm/VmWorkTestConfiguration.java |   27 +-
 .../com/cloud/vm/VmWorkTestWorkJobDispatcher.java  |    9 +-
 564 files changed, 4199 insertions(+), 3962 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
index f296aa4..de73076 100644
--- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -23,7 +23,6 @@ import org.apache.cloudstack.api.InternalIdentity;
 
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.State;
-import com.cloud.network.rules.FirewallRule.TrafficType;
 import com.cloud.utils.net.NetUtils;
 
 /**

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/async/AsyncInstanceCreateStatus.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/async/AsyncInstanceCreateStatus.java b/api/src/com/cloud/async/AsyncInstanceCreateStatus.java
deleted file mode 100644
index a085fb6..0000000
--- a/api/src/com/cloud/async/AsyncInstanceCreateStatus.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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;
-
-public enum AsyncInstanceCreateStatus {
-    Creating,
-    Created,
-    Corrupted,
-    Failed;
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/async/AsyncJob.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/async/AsyncJob.java b/api/src/com/cloud/async/AsyncJob.java
deleted file mode 100644
index 41afb79..0000000
--- a/api/src/com/cloud/async/AsyncJob.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// 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.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
-
-import java.util.Date;
-
-public interface AsyncJob extends Identity, InternalIdentity {
-	
-	public enum JournalType { 
-		SUCCESS, FAILURE 
-	};
-	
-    String getType();
-    
-    String getDispatcher();
-
-    int getPendingSignals();
-    public enum Type {
-        None,
-        VirtualMachine,
-        DomainRouter,
-        Volume,
-        ConsoleProxy,
-        Snapshot,
-        Template,
-        Iso,
-        SystemVm,
-        Host,
-        StoragePool,
-        IpAddress,
-        SecurityGroup,
-        PhysicalNetwork,
-        TrafficType,
-        PhysicalNetworkServiceProvider,
-        FirewallRule,
-        Account,
-        User,
-        PrivateGateway,
-        StaticRoute,
-        Counter,
-        Condition,
-        AutoScalePolicy,
-        AutoScaleVmProfile,
-        AutoScaleVmGroup,
-        GlobalLoadBalancerRule,
-        LoadBalancerRule,
-        AffinityGroup,
-        InternalLbVm,
-        DedicatedGuestVlanRange
-    }
-    
-    long getUserId();
-
-    long getAccountId();
-
-    String getCmd();
-
-    int getCmdVersion();
-
-    String getCmdInfo();
-    
-    int getStatus();
-
-    int getProcessStatus();
-
-    int getResultCode();
-
-    String getResult();
-
-    Long getInitMsid();
-    void setInitMsid(Long msid);
-
-    Long getExecutingMsid();
-    
-    Long getCompleteMsid();
-    void setCompleteMsid(Long msid);
-
-    Date getCreated();
-
-    Date getLastUpdated();
-
-    Date getLastPolled();
-
-    Date getRemoved();
-
-    String getInstanceType();
-
-    Long getInstanceId();
-
-    SyncQueueItem getSyncSource();
-    void setSyncSource(SyncQueueItem item);
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/async/SyncQueueItem.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/async/SyncQueueItem.java b/api/src/com/cloud/async/SyncQueueItem.java
deleted file mode 100644
index b8232f4..0000000
--- a/api/src/com/cloud/async/SyncQueueItem.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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;
-
-public interface SyncQueueItem {
-    public final String AsyncJobContentType = "AsyncJob";
-
-    /**
-     * @return queue item id
-     */
-    long getId();
-
-    /**
-     * @return queue id
-     */
-    Long getQueueId();
-
-    /**
-     * @return subject object type pointed by the queue item
-     */
-    String getContentType();
-    
-    /**
-     * @return subject object id pointed by the queue item
-     */
-    Long getContentId();
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/configuration/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java
index fdbd9d6..fcd5b1a 100644
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@ -20,11 +20,6 @@ import java.util.List;
 
 import javax.naming.NamingException;
 
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.ResourceAllocationException;
 import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
 import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
 import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
@@ -51,6 +46,11 @@ import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/event/UsageEvent.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/UsageEvent.java b/api/src/com/cloud/event/UsageEvent.java
index 0d4ef17..cef796e 100644
--- a/api/src/com/cloud/event/UsageEvent.java
+++ b/api/src/com/cloud/event/UsageEvent.java
@@ -16,10 +16,10 @@
 // under the License.
 package com.cloud.event;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import java.util.Date;
 
+import org.apache.cloudstack.api.InternalIdentity;
+
 public interface UsageEvent extends InternalIdentity {
     String getType();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/exception/AgentControlChannelException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/exception/AgentControlChannelException.java b/api/src/com/cloud/exception/AgentControlChannelException.java
index 50b84d4..7db9b83 100644
--- a/api/src/com/cloud/exception/AgentControlChannelException.java
+++ b/api/src/com/cloud/exception/AgentControlChannelException.java
@@ -16,7 +16,6 @@
 // under the License.
 package com.cloud.exception;
 
-import com.cloud.exception.CloudException;
 
 public class AgentControlChannelException extends CloudException {
 	private static final long serialVersionUID = -310647782960500466L;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
index 5d4fd67..5410af0 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -21,9 +21,9 @@ import java.util.List;
 import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd;
 import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
-import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
 import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
 import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
+import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
 import org.apache.cloudstack.api.command.user.vm.ListNicsCmd;
 
 import com.cloud.exception.ConcurrentOperationException;
@@ -31,7 +31,6 @@ import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.GuestVlan;
 import com.cloud.network.Network.Service;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.user.Account;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/network/NetworkUsageService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkUsageService.java b/api/src/com/cloud/network/NetworkUsageService.java
index 1cfea24..71a2f49 100644
--- a/api/src/com/cloud/network/NetworkUsageService.java
+++ b/api/src/com/cloud/network/NetworkUsageService.java
@@ -18,12 +18,11 @@ package com.cloud.network;
 
 import java.util.List;
 
-import com.cloud.host.Host;
-
 import org.apache.cloudstack.api.command.admin.usage.AddTrafficMonitorCmd;
 import org.apache.cloudstack.api.command.admin.usage.DeleteTrafficMonitorCmd;
 import org.apache.cloudstack.api.command.admin.usage.ListTrafficMonitorsCmd;
-import org.apache.cloudstack.api.response.TrafficMonitorResponse;
+
+import com.cloud.host.Host;
 import com.cloud.utils.component.Manager;
 
 public interface NetworkUsageService extends Manager {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/network/PhysicalNetwork.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java
index c521dc4..cfe8c72 100644
--- a/api/src/com/cloud/network/PhysicalNetwork.java
+++ b/api/src/com/cloud/network/PhysicalNetwork.java
@@ -18,10 +18,11 @@ package com.cloud.network;
 
 import java.util.List;
 
-import com.cloud.utils.Pair;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.utils.Pair;
+
 /**
  *
  */

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/network/rules/HealthCheckPolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/HealthCheckPolicy.java b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
index 96bb282..6157bd4 100644
--- a/api/src/com/cloud/network/rules/HealthCheckPolicy.java
+++ b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
@@ -16,9 +16,6 @@
 // under the License.
 package com.cloud.network.rules;
 
-import java.util.List;
-
-import com.cloud.utils.Pair;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/network/security/SecurityGroupService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java
index 397de1c..96b8680 100644
--- a/api/src/com/cloud/network/security/SecurityGroupService.java
+++ b/api/src/com/cloud/network/security/SecurityGroupService.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupC
 import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;
 import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;
 import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;
-import org.apache.cloudstack.api.command.user.vm.AddIpToVmNicCmd;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/network/security/SecurityRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/security/SecurityRule.java b/api/src/com/cloud/network/security/SecurityRule.java
index 350b52d..ff28a2a 100644
--- a/api/src/com/cloud/network/security/SecurityRule.java
+++ b/api/src/com/cloud/network/security/SecurityRule.java
@@ -19,8 +19,6 @@ package com.cloud.network.security;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-import com.cloud.async.AsyncInstanceCreateStatus;
-
 public interface SecurityRule extends Identity, InternalIdentity {
 
     public static class SecurityRuleType {
@@ -28,13 +26,13 @@ public interface SecurityRule extends Identity, InternalIdentity {
         public static final SecurityRuleType EgressRule = new SecurityRuleType("egress");
 
         public SecurityRuleType(String type) {
-            this._type = type;
+            _type = type;
         }
 
         public String getType(){
             return _type;
         }
-        private String _type;
+        private final String _type;
     }
 
     long getSecurityGroupId();
@@ -49,8 +47,6 @@ public interface SecurityRule extends Identity, InternalIdentity {
 
     String getProtocol();
 
-    AsyncInstanceCreateStatus getCreateStatus();
-
     Long getAllowedNetworkId();
 
     String getAllowedSourceIpCidr();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/offering/NetworkOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/com/cloud/offering/NetworkOffering.java
index 72e2a2b..dc39464 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.offering;
 
-import java.util.Map;
-
 import org.apache.cloudstack.acl.InfrastructureEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
index 186faf7..4cdf808 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
@@ -17,11 +17,17 @@
 
 package com.cloud.region.ha;
 
-import com.cloud.network.rules.LoadBalancer;
-import org.apache.cloudstack.api.command.user.region.ha.gslb.*;
-
 import java.util.List;
 
+import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.ListGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.RemoveFromGlobalLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.region.ha.gslb.UpdateGlobalLoadBalancerRuleCmd;
+
+import com.cloud.network.rules.LoadBalancer;
+
 public interface GlobalLoadBalancingRulesService {
 
     /*

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/resource/UnableDeleteHostException.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/com/cloud/resource/UnableDeleteHostException.java
index 154147c..8583468 100755
--- a/api/src/com/cloud/resource/UnableDeleteHostException.java
+++ b/api/src/com/cloud/resource/UnableDeleteHostException.java
@@ -16,8 +16,8 @@
 // under the License.
 package com.cloud.resource;
 
-import com.cloud.utils.SerialVersionUID;
 import com.cloud.exception.CloudException;
+import com.cloud.utils.SerialVersionUID;
 
 public class UnableDeleteHostException extends CloudException {
     private static final long serialVersionUID = SerialVersionUID.UnableDeleteHostException;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/storage/Snapshot.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/com/cloud/storage/Snapshot.java
index f71265c..842843e 100644
--- a/api/src/com/cloud/storage/Snapshot.java
+++ b/api/src/com/cloud/storage/Snapshot.java
@@ -18,12 +18,13 @@ package com.cloud.storage;
 
 import java.util.Date;
 
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.utils.fsm.StateObject;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.utils.fsm.StateObject;
+
 public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, StateObject<Snapshot.State> {
     public enum Type {
         MANUAL,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
index 6f3d2ce..db6087a 100644
--- a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
+++ b/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
@@ -16,11 +16,11 @@
 // under the License.
 package com.cloud.storage.snapshot;
 
+import java.util.Date;
+
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-import java.util.Date;
-
 public interface SnapshotSchedule extends InternalIdentity, Identity {
 
     Long getVolumeId();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/user/AccountService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index 903eebc..b8a0b7f 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -22,11 +22,6 @@ import java.util.Map;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
-import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
-import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
-import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
-
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
 
 import com.cloud.domain.Domain;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/user/UserContext.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index bcb33b5..f14e6cd 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -16,9 +16,10 @@
 // under the License.
 package com.cloud.user;
 
-import com.cloud.utils.component.ComponentContext;
 import javax.inject.Inject;
 
+import com.cloud.utils.component.ComponentContext;
+
 public class UserContext {
     private static ThreadLocal<UserContext> s_currentContext = new ThreadLocal<UserContext>();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/vm/UserVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index fa89521..b840e5e 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -39,6 +39,7 @@ import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
 import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
 import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
 import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
+
 import com.cloud.dc.DataCenter;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/com/cloud/vm/snapshot/VMSnapshot.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/com/cloud/vm/snapshot/VMSnapshot.java
index f0ee7ee..cbf0c57 100644
--- a/api/src/com/cloud/vm/snapshot/VMSnapshot.java
+++ b/api/src/com/cloud/vm/snapshot/VMSnapshot.java
@@ -19,10 +19,10 @@ package com.cloud.vm.snapshot;
 
 import java.util.Date;
 
+import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-import org.apache.cloudstack.acl.ControlledEntity;
 import com.cloud.utils.fsm.StateMachine2;
 import com.cloud.utils.fsm.StateObject;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
index b6d4ff6..75f9a03 100644
--- a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
+++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
@@ -17,21 +17,16 @@
 package org.apache.cloudstack.affinity;
 
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
+
+import com.google.gson.annotations.SerializedName;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
-import org.apache.cloudstack.api.response.ControlledEntityResponse;
 import org.apache.cloudstack.api.response.ControlledViewEntityResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
 
-import com.cloud.network.security.SecurityGroup;
 import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 @EntityReference(value = AffinityGroup.class)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
index 2d1cd25..e400b6f 100644
--- a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
+++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
@@ -16,18 +16,13 @@
 // under the License.
 package org.apache.cloudstack.affinity;
 
-import java.util.HashSet;
-import java.util.Set;
+import com.google.gson.annotations.SerializedName;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
-import org.apache.cloudstack.api.response.ControlledEntityResponse;
-import org.apache.cloudstack.api.response.ControlledViewEntityResponse;
 
-import com.cloud.network.security.SecurityGroup;
 import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 
 @SuppressWarnings("unused")
 @EntityReference(value = AffinityGroup.class)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
index 022157a..56e2ba1 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
@@ -16,9 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api;
 
-import org.apache.cloudstack.api.response.AsyncJobResponse;
-
-import com.cloud.async.AsyncJob;
 import com.cloud.user.User;
 import com.cloud.user.UserContext;
 
@@ -33,7 +30,7 @@ public abstract class BaseAsyncCmd extends BaseCmd {
     public static final String snapshotHostSyncObject = "snapshothost";
     public static final String gslbSyncObject = "globalserverloadbalacner";
 
-    private AsyncJob job;
+    private Object job;
 
     @Parameter(name = "starteventid", type = CommandType.LONG)
     private Long startEventId;
@@ -56,16 +53,7 @@ public abstract class BaseAsyncCmd extends BaseCmd {
      */
     public abstract String getEventDescription();
 
-    public ResponseObject getResponse(long jobId) {
-        AsyncJobResponse response = new AsyncJobResponse();
-
-        AsyncJob job = _entityMgr.findById(AsyncJob.class, jobId);
-        response.setJobId(job.getUuid());
-        response.setResponseName(getCommandName());
-        return response;
-    }
-
-    public void setJob(AsyncJob job) {
+    public void setJob(Object job) {
         this.job = job;
     }
 
@@ -100,7 +88,7 @@ public abstract class BaseAsyncCmd extends BaseCmd {
         return null;
     }
 
-    public AsyncJob getJob() {
+    public Object getJob() {
         return job;
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
index 1f2d3f1..55d73b4 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
@@ -16,9 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api;
 
-import org.apache.cloudstack.api.response.CreateCmdResponse;
-
-import com.cloud.async.AsyncJob;
 import com.cloud.exception.ResourceAllocationException;
 
 public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {
@@ -45,15 +42,6 @@ public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {
         this.uuid = uuid;
     }
 
-    public String getResponse(long jobId, String objectUuid) {
-        CreateCmdResponse response = new CreateCmdResponse();
-        AsyncJob job = _entityMgr.findById(AsyncJob.class, jobId);
-        response.setJobId(job.getUuid());
-        response.setId(objectUuid);
-        response.setResponseName(getCommandName());
-        return _responseGenerator.toSerializedString(response, getResponseType());
-    }
-
     public String getCreateEventType() {
         return null;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java
index 8d66a83..17a1ec5 100644
--- a/api/src/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseCmd.java
@@ -27,13 +27,14 @@ import java.util.regex.Pattern;
 
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.affinity.AffinityGroupService;
 import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
 import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
 import org.apache.cloudstack.query.QueryService;
 import org.apache.cloudstack.usage.UsageService;
-import org.apache.log4j.Logger;
 
 import com.cloud.configuration.ConfigurationService;
 import com.cloud.dao.EntityManager;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java
index 5a57af2..4d9b350 100644
--- a/api/src/org/apache/cloudstack/api/BaseListCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java
@@ -16,7 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api;
 
-import com.cloud.async.AsyncJob;
 import com.cloud.exception.InvalidParameterValueException;
 
 public abstract class BaseListCmd extends BaseCmd {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
index 47aa679..1c94e10 100644
--- a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
@@ -18,9 +18,10 @@ package org.apache.cloudstack.api;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
 import org.apache.log4j.Logger;
 
+import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
+
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseResponse.java b/api/src/org/apache/cloudstack/api/BaseResponse.java
index 187ad94..5f3f7a1 100644
--- a/api/src/org/apache/cloudstack/api/BaseResponse.java
+++ b/api/src/org/apache/cloudstack/api/BaseResponse.java
@@ -16,9 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api;
 
-import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
+import com.cloud.serializer.Param;
+
 public abstract class BaseResponse implements ResponseObject {
     private transient String responseName;
     private transient String objectName;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
index 6fd9773..75a722e 100644
--- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
@@ -16,10 +16,11 @@
 // under the License.
 package org.apache.cloudstack.api;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
 import org.apache.cloudstack.api.response.GuestOSResponse;
 import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
 
 public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
index 5cd4881..8f6a812 100644
--- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
@@ -18,10 +18,11 @@ package org.apache.cloudstack.api;
 
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.log4j.Logger;
 
 import com.cloud.exception.InvalidParameterValueException;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/ResponseGenerator.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
index ab8f995..33b4458 100644
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -37,7 +37,6 @@ import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ConditionResponse;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.api.response.CounterResponse;
-import org.apache.cloudstack.api.response.CreateCmdResponse;
 import org.apache.cloudstack.api.response.DiskOfferingResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.DomainRouterResponse;
@@ -113,7 +112,6 @@ import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
 import org.apache.cloudstack.region.Region;
 import org.apache.cloudstack.usage.Usage;
 
-import com.cloud.async.AsyncJob;
 import com.cloud.capacity.Capacity;
 import com.cloud.configuration.Configuration;
 import com.cloud.configuration.ResourceCount;
@@ -291,10 +289,6 @@ public interface ResponseGenerator {
 
     ExtractResponse createExtractResponse(Long uploadId, Long id, Long zoneId, Long accountId, String mode);
 
-    String toSerializedString(CreateCmdResponse response, String responseType);
-
-    AsyncJobResponse createAsyncJobResponse(AsyncJob job);
-
     EventResponse createEventResponse(Event event);
 
     //List<EventResponse> createEventResponse(EventJoinVO... events);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
index cc74eb2..9f3624b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@ -16,9 +16,11 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.account;
 
-import com.cloud.user.Account;
-import com.cloud.user.UserAccount;
-import com.cloud.user.UserContext;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,10 +29,10 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.log4j.Logger;
 
-import java.util.Collection;
-import java.util.Map;
+import com.cloud.user.Account;
+import com.cloud.user.UserAccount;
+import com.cloud.user.UserContext;
 
 @APICommand(name = "createAccount", description="Creates an account", responseObject=AccountResponse.class)
 public class CreateAccountCmd extends BaseCmd {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
index 7b7bc9a..a283365 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account;
 
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -28,9 +30,7 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
 
-import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import com.cloud.user.User;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
index 07abd21..c01433e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account;
 
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -28,9 +30,7 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
 
-import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.ResourceUnavailableException;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
index b9a9f6d..0fd2e60 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.admin.account;
 
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,7 +29,6 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
 
 import com.cloud.user.Account;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
index f4aa3af..a0ffd5f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.account;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.log4j.Logger;
 
 import com.cloud.user.Account;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
index 60d1a97..2fc144c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@ -21,6 +21,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,7 +32,6 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.region.RegionService;
-import org.apache.log4j.Logger;
 
 import com.cloud.user.Account;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
index b94ff10..179fd03 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
@@ -17,6 +17,8 @@
 
 package org.apache.cloudstack.api.command.admin.autoscale;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -25,9 +27,7 @@ import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.CounterResponse;
-import org.apache.log4j.Logger;
 
-import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.network.as.Counter;
 import com.cloud.user.Account;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
index 81eaa9b..a063769 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
@@ -17,6 +17,8 @@
 
 package org.apache.cloudstack.api.command.admin.autoscale;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -26,9 +28,7 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.CounterResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
 
-import com.cloud.async.AsyncJob;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.user.Account;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index d55ccd7..6252f6b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -20,8 +20,6 @@ package org.apache.cloudstack.api.command.admin.cluster;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.cloud.exception.InvalidParameterValueException;
-import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -34,9 +32,9 @@ import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
 
 import com.cloud.exception.DiscoveryException;
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.org.Cluster;
 import com.cloud.user.Account;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
index 4fece0c..1f51b90 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.cluster;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -24,7 +26,6 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
 
 import com.cloud.user.Account;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index f2dd349..1283f2c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -19,6 +19,8 @@ package org.apache.cloudstack.api.command.admin.cluster;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
@@ -28,7 +30,6 @@ import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.log4j.Logger;
 
 import com.cloud.org.Cluster;
 import com.cloud.utils.Pair;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index c513058..8d49a8c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.cluster;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -23,7 +25,6 @@ import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ClusterResponse;
-import org.apache.log4j.Logger;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.org.Cluster;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cbdc4063/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index a11904e..5a3d22f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -19,12 +19,18 @@ package org.apache.cloudstack.api.command.admin.config;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.*;
-import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.response.AccountResponse;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
 
 import com.cloud.configuration.Configuration;
 import com.cloud.utils.Pair;


Mime
View raw message