incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [42/55] [abbrv] git commit: api_refactor: refactor vpn and vm apis
Date Tue, 04 Dec 2012 10:02:57 GMT
api_refactor: refactor vpn and vm apis

- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


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

Branch: refs/heads/api_refactoring
Commit: 6fc3bc3760b35236cc005790abea766d308c23ae
Parents: 5edfc27
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Mon Dec 3 21:15:53 2012 -0800
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Mon Dec 3 21:27:02 2012 -0800

----------------------------------------------------------------------
 api/src/com/cloud/api/ACL.java                     |   31 -
 api/src/com/cloud/api/ApiConstants.java            |  431 ------------
 api/src/com/cloud/api/BaseAsyncCmd.java            |  134 ----
 api/src/com/cloud/api/BaseAsyncCreateCmd.java      |   55 --
 api/src/com/cloud/api/BaseCmd.java                 |  533 ---------------
 .../com/cloud/api/BaseListAccountResourcesCmd.java |   27 -
 api/src/com/cloud/api/BaseListCmd.java             |  108 ---
 .../com/cloud/api/BaseListDomainResourcesCmd.java  |   45 --
 .../api/BaseListProjectAndAccountResourcesCmd.java |   28 -
 .../com/cloud/api/BaseListTaggedResourcesCmd.java  |   48 --
 api/src/com/cloud/api/Identity.java                |   21 -
 api/src/com/cloud/api/IdentityMapper.java          |   29 -
 api/src/com/cloud/api/IdentityService.java         |   25 -
 api/src/com/cloud/api/Implementation.java          |   39 --
 api/src/com/cloud/api/Parameter.java               |   51 --
 api/src/com/cloud/api/PlugService.java             |   31 -
 api/src/com/cloud/api/ResponseGenerator.java       |  364 ----------
 api/src/com/cloud/api/ResponseObject.java          |   78 ---
 api/src/com/cloud/api/ServerApiException.java      |   51 --
 .../com/cloud/api/commands/ActivateProjectCmd.java |   14 +-
 .../cloud/api/commands/AddAccountToProjectCmd.java |   14 +-
 api/src/com/cloud/api/commands/AddClusterCmd.java  |  160 +++---
 api/src/com/cloud/api/commands/AddHostCmd.java     |   12 +-
 .../api/commands/AddNetworkServiceProviderCmd.java |   14 +-
 .../cloud/api/commands/AddSecondaryStorageCmd.java |   12 +-
 api/src/com/cloud/api/commands/AddSwiftCmd.java    |   10 +-
 .../com/cloud/api/commands/AddTrafficTypeCmd.java  |   14 +-
 api/src/com/cloud/api/commands/AddVpnUserCmd.java  |   14 +-
 .../api/commands/AssignToLoadBalancerRuleCmd.java  |   14 +-
 api/src/com/cloud/api/commands/AssignVMCmd.java    |  125 ----
 .../com/cloud/api/commands/AssociateIPAddrCmd.java |   16 +-
 api/src/com/cloud/api/commands/AttachIsoCmd.java   |   17 +-
 .../com/cloud/api/commands/AttachVolumeCmd.java    |   14 +-
 .../commands/AuthorizeSecurityGroupEgressCmd.java  |   14 +-
 .../commands/AuthorizeSecurityGroupIngressCmd.java |   14 +-
 .../cloud/api/commands/CancelMaintenanceCmd.java   |   14 +-
 .../CancelPrimaryStorageMaintenanceCmd.java        |   14 +-
 .../commands/ConfigureVirtualRouterElementCmd.java |   16 +-
 .../com/cloud/api/commands/CopyTemplateCmd.java    |   14 +-
 .../com/cloud/api/commands/CreateAccountCmd.java   |   12 +-
 .../api/commands/CreateAutoScalePolicyCmd.java     |   48 +-
 .../api/commands/CreateAutoScaleVmGroupCmd.java    |   46 +-
 .../api/commands/CreateAutoScaleVmProfileCmd.java  |   46 +-
 .../com/cloud/api/commands/CreateConditionCmd.java |   14 +-
 .../com/cloud/api/commands/CreateCounterCmd.java   |   12 +-
 .../cloud/api/commands/CreateDiskOfferingCmd.java  |   12 +-
 .../com/cloud/api/commands/CreateDomainCmd.java    |   12 +-
 .../cloud/api/commands/CreateFirewallRuleCmd.java  |   16 +-
 .../api/commands/CreateIpForwardingRuleCmd.java    |   16 +-
 .../api/commands/CreateLBStickinessPolicyCmd.java  |   14 +-
 .../api/commands/CreateLoadBalancerRuleCmd.java    |   14 +-
 .../cloud/api/commands/CreateNetworkACLCmd.java    |   16 +-
 .../com/cloud/api/commands/CreateNetworkCmd.java   |   12 +-
 .../api/commands/CreateNetworkOfferingCmd.java     |   12 +-
 .../api/commands/CreatePhysicalNetworkCmd.java     |   14 +-
 api/src/com/cloud/api/commands/CreatePodCmd.java   |   12 +-
 .../api/commands/CreatePortForwardingRuleCmd.java  |   16 +-
 .../api/commands/CreatePrivateGatewayCmd.java      |   16 +-
 .../api/commands/CreatePrivateNetworkCmd.java      |   14 +-
 .../com/cloud/api/commands/CreateProjectCmd.java   |   14 +-
 .../api/commands/CreateRemoteAccessVpnCmd.java     |  198 ------
 .../cloud/api/commands/CreateSSHKeyPairCmd.java    |   10 +-
 .../cloud/api/commands/CreateSecurityGroupCmd.java |   12 +-
 .../api/commands/CreateServiceOfferingCmd.java     |   12 +-
 .../com/cloud/api/commands/CreateSnapshotCmd.java  |   16 +-
 .../api/commands/CreateSnapshotPolicyCmd.java      |   12 +-
 .../cloud/api/commands/CreateStaticRouteCmd.java   |   16 +-
 .../commands/CreateStorageNetworkIpRangeCmd.java   |   14 +-
 .../cloud/api/commands/CreateStoragePoolCmd.java   |   12 +-
 api/src/com/cloud/api/commands/CreateTagsCmd.java  |   12 +-
 .../com/cloud/api/commands/CreateTemplateCmd.java  |   14 +-
 api/src/com/cloud/api/commands/CreateUserCmd.java  |   12 +-
 .../com/cloud/api/commands/CreateVMGroupCmd.java   |   12 +-
 api/src/com/cloud/api/commands/CreateVPCCmd.java   |   14 +-
 .../cloud/api/commands/CreateVPCOfferingCmd.java   |   12 +-
 .../commands/CreateVirtualRouterElementCmd.java    |   16 +-
 .../cloud/api/commands/CreateVlanIpRangeCmd.java   |   12 +-
 .../com/cloud/api/commands/CreateVolumeCmd.java    |   14 +-
 .../cloud/api/commands/CreateVpnConnectionCmd.java |  143 ----
 .../api/commands/CreateVpnCustomerGatewayCmd.java  |  169 -----
 .../cloud/api/commands/CreateVpnGatewayCmd.java    |  106 ---
 api/src/com/cloud/api/commands/CreateZoneCmd.java  |   12 +-
 .../com/cloud/api/commands/DeleteAccountCmd.java   |   14 +-
 .../api/commands/DeleteAccountFromProjectCmd.java  |   14 +-
 .../api/commands/DeleteAutoScalePolicyCmd.java     |   46 +-
 .../api/commands/DeleteAutoScaleVmGroupCmd.java    |   46 +-
 .../api/commands/DeleteAutoScaleVmProfileCmd.java  |   46 +-
 .../com/cloud/api/commands/DeleteClusterCmd.java   |   12 +-
 .../com/cloud/api/commands/DeleteConditionCmd.java |   14 +-
 .../com/cloud/api/commands/DeleteCounterCmd.java   |   14 +-
 .../cloud/api/commands/DeleteDiskOfferingCmd.java  |   12 +-
 .../com/cloud/api/commands/DeleteDomainCmd.java    |   14 +-
 .../cloud/api/commands/DeleteFirewallRuleCmd.java  |   14 +-
 api/src/com/cloud/api/commands/DeleteHostCmd.java  |   12 +-
 .../api/commands/DeleteIpForwardingRuleCmd.java    |   14 +-
 api/src/com/cloud/api/commands/DeleteIsoCmd.java   |   14 +-
 .../api/commands/DeleteLBStickinessPolicyCmd.java  |   14 +-
 .../api/commands/DeleteLoadBalancerRuleCmd.java    |   14 +-
 .../cloud/api/commands/DeleteNetworkACLCmd.java    |   14 +-
 .../com/cloud/api/commands/DeleteNetworkCmd.java   |   14 +-
 .../api/commands/DeleteNetworkOfferingCmd.java     |   12 +-
 .../commands/DeleteNetworkServiceProviderCmd.java  |   14 +-
 .../api/commands/DeletePhysicalNetworkCmd.java     |   14 +-
 api/src/com/cloud/api/commands/DeletePodCmd.java   |   12 +-
 api/src/com/cloud/api/commands/DeletePoolCmd.java  |   12 +-
 .../api/commands/DeletePortForwardingRuleCmd.java  |   14 +-
 .../api/commands/DeletePrivateGatewayCmd.java      |   14 +-
 .../com/cloud/api/commands/DeleteProjectCmd.java   |   14 +-
 .../api/commands/DeleteProjectInvitationCmd.java   |   14 +-
 .../api/commands/DeleteRemoteAccessVpnCmd.java     |  100 ---
 .../cloud/api/commands/DeleteSSHKeyPairCmd.java    |   10 +-
 .../cloud/api/commands/DeleteSecurityGroupCmd.java |   12 +-
 .../api/commands/DeleteServiceOfferingCmd.java     |   12 +-
 .../com/cloud/api/commands/DeleteSnapshotCmd.java  |   14 +-
 .../api/commands/DeleteSnapshotPoliciesCmd.java    |   12 +-
 .../cloud/api/commands/DeleteStaticRouteCmd.java   |   14 +-
 .../commands/DeleteStorageNetworkIpRangeCmd.java   |   14 +-
 api/src/com/cloud/api/commands/DeleteTagsCmd.java  |   12 +-
 .../com/cloud/api/commands/DeleteTemplateCmd.java  |   14 +-
 .../cloud/api/commands/DeleteTrafficTypeCmd.java   |   14 +-
 api/src/com/cloud/api/commands/DeleteUserCmd.java  |   12 +-
 .../com/cloud/api/commands/DeleteVMGroupCmd.java   |   12 +-
 api/src/com/cloud/api/commands/DeleteVPCCmd.java   |   14 +-
 .../cloud/api/commands/DeleteVPCOfferingCmd.java   |   14 +-
 .../cloud/api/commands/DeleteVlanIpRangeCmd.java   |   12 +-
 .../com/cloud/api/commands/DeleteVolumeCmd.java    |   12 +-
 .../cloud/api/commands/DeleteVpnConnectionCmd.java |  103 ---
 .../api/commands/DeleteVpnCustomerGatewayCmd.java  |   97 ---
 .../cloud/api/commands/DeleteVpnGatewayCmd.java    |   98 ---
 api/src/com/cloud/api/commands/DeleteZoneCmd.java  |   12 +-
 api/src/com/cloud/api/commands/DeployVMCmd.java    |  451 ------------
 .../cloud/api/commands/DestroyConsoleProxyCmd.java |   12 +-
 .../com/cloud/api/commands/DestroyRouterCmd.java   |   14 +-
 .../com/cloud/api/commands/DestroySystemVmCmd.java |   14 +-
 api/src/com/cloud/api/commands/DestroyVMCmd.java   |  115 ----
 api/src/com/cloud/api/commands/DetachIsoCmd.java   |   17 +-
 .../com/cloud/api/commands/DetachVolumeCmd.java    |   14 +-
 .../com/cloud/api/commands/DisableAccountCmd.java  |   14 +-
 .../api/commands/DisableAutoScaleVmGroupCmd.java   |   14 +-
 .../cloud/api/commands/DisableStaticNatCmd.java    |   14 +-
 api/src/com/cloud/api/commands/DisableUserCmd.java |   14 +-
 .../cloud/api/commands/DisassociateIPAddrCmd.java  |   14 +-
 .../com/cloud/api/commands/EnableAccountCmd.java   |   12 +-
 .../api/commands/EnableAutoScaleVmGroupCmd.java    |   14 +-
 .../com/cloud/api/commands/EnableStaticNatCmd.java |   12 +-
 api/src/com/cloud/api/commands/EnableUserCmd.java  |   12 +-
 api/src/com/cloud/api/commands/ExtractIsoCmd.java  |   14 +-
 .../com/cloud/api/commands/ExtractTemplateCmd.java |   14 +-
 .../com/cloud/api/commands/ExtractVolumeCmd.java   |   14 +-
 .../cloud/api/commands/GetCloudIdentifierCmd.java  |   12 +-
 api/src/com/cloud/api/commands/GetUserCmd.java     |    8 +-
 .../com/cloud/api/commands/GetVMPasswordCmd.java   |   84 ---
 api/src/com/cloud/api/commands/LDAPConfigCmd.java  |   10 +-
 api/src/com/cloud/api/commands/LDAPRemoveCmd.java  |    4 +-
 .../com/cloud/api/commands/ListAccountsCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListAlertsCmd.java  |   10 +-
 .../com/cloud/api/commands/ListAsyncJobsCmd.java   |    8 +-
 .../api/commands/ListAutoScalePoliciesCmd.java     |   42 +-
 .../api/commands/ListAutoScaleVmGroupsCmd.java     |   42 +-
 .../api/commands/ListAutoScaleVmProfilesCmd.java   |   42 +-
 .../cloud/api/commands/ListCapabilitiesCmd.java    |    4 +-
 .../com/cloud/api/commands/ListCapacityCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListCfgsByCmd.java  |    8 +-
 .../com/cloud/api/commands/ListClustersCmd.java    |   10 +-
 .../com/cloud/api/commands/ListConditionsCmd.java  |   10 +-
 .../com/cloud/api/commands/ListCountersCmd.java    |   10 +-
 .../cloud/api/commands/ListDiskOfferingsCmd.java   |   10 +-
 .../cloud/api/commands/ListDomainChildrenCmd.java  |   10 +-
 api/src/com/cloud/api/commands/ListDomainsCmd.java |   10 +-
 .../com/cloud/api/commands/ListEventTypesCmd.java  |    4 +-
 api/src/com/cloud/api/commands/ListEventsCmd.java  |   10 +-
 .../cloud/api/commands/ListFirewallRulesCmd.java   |   10 +-
 .../api/commands/ListGuestOsCategoriesCmd.java     |   10 +-
 api/src/com/cloud/api/commands/ListGuestOsCmd.java |   10 +-
 api/src/com/cloud/api/commands/ListHostsCmd.java   |   12 +-
 .../commands/ListHypervisorCapabilitiesCmd.java    |   10 +-
 .../com/cloud/api/commands/ListHypervisorsCmd.java |   10 +-
 .../api/commands/ListIpForwardingRulesCmd.java     |   10 +-
 api/src/com/cloud/api/commands/ListIsosCmd.java    |   10 +-
 .../api/commands/ListLBStickinessPoliciesCmd.java  |   10 +-
 .../commands/ListLoadBalancerRuleInstancesCmd.java |   10 +-
 .../api/commands/ListLoadBalancerRulesCmd.java     |   10 +-
 .../com/cloud/api/commands/ListNetworkACLsCmd.java |   10 +-
 .../api/commands/ListNetworkOfferingsCmd.java      |   10 +-
 .../commands/ListNetworkServiceProvidersCmd.java   |   10 +-
 .../com/cloud/api/commands/ListNetworksCmd.java    |   10 +-
 .../api/commands/ListPhysicalNetworksCmd.java      |   14 +-
 api/src/com/cloud/api/commands/ListPodsByCmd.java  |   10 +-
 .../api/commands/ListPortForwardingRulesCmd.java   |   22 +-
 .../cloud/api/commands/ListPrivateGatewaysCmd.java |   10 +-
 .../cloud/api/commands/ListProjectAccountsCmd.java |   10 +-
 .../api/commands/ListProjectInvitationsCmd.java    |   10 +-
 .../com/cloud/api/commands/ListProjectsCmd.java    |   10 +-
 .../api/commands/ListPublicIpAddressesCmd.java     |   12 +-
 .../commands/ListRecurringSnapshotScheduleCmd.java |    8 +-
 .../api/commands/ListRemoteAccessVpnsCmd.java      |   80 ---
 .../cloud/api/commands/ListResourceLimitsCmd.java  |    8 +-
 api/src/com/cloud/api/commands/ListRoutersCmd.java |   10 +-
 .../com/cloud/api/commands/ListSSHKeyPairsCmd.java |    8 +-
 .../cloud/api/commands/ListSecurityGroupsCmd.java  |   38 +-
 .../api/commands/ListServiceOfferingsCmd.java      |   10 +-
 .../api/commands/ListSnapshotPoliciesCmd.java      |   10 +-
 .../com/cloud/api/commands/ListSnapshotsCmd.java   |   22 +-
 .../cloud/api/commands/ListStaticRoutesCmd.java    |   10 +-
 .../cloud/api/commands/ListStoragePoolsCmd.java    |   10 +-
 .../commands/ListSupportedNetworkServicesCmd.java  |    8 +-
 api/src/com/cloud/api/commands/ListSwiftsCmd.java  |    8 +-
 .../com/cloud/api/commands/ListSystemVMsCmd.java   |   10 +-
 api/src/com/cloud/api/commands/ListTagsCmd.java    |    8 +-
 .../commands/ListTemplateOrIsoPermissionsCmd.java  |   10 +-
 .../com/cloud/api/commands/ListTemplatesCmd.java   |   10 +-
 .../commands/ListTrafficTypeImplementorsCmd.java   |   10 +-
 .../cloud/api/commands/ListTrafficTypesCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListUsersCmd.java   |   10 +-
 .../com/cloud/api/commands/ListVMGroupsCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListVMsCmd.java     |  217 ------
 .../cloud/api/commands/ListVPCOfferingsCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListVPCsCmd.java    |   10 +-
 .../api/commands/ListVirtualRouterElementsCmd.java |   14 +-
 .../cloud/api/commands/ListVlanIpRangesCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListVolumesCmd.java |   22 +-
 .../cloud/api/commands/ListVpnConnectionsCmd.java  |   92 ---
 .../api/commands/ListVpnCustomerGatewaysCmd.java   |   84 ---
 .../com/cloud/api/commands/ListVpnGatewaysCmd.java |   91 ---
 .../com/cloud/api/commands/ListVpnUsersCmd.java    |   10 +-
 api/src/com/cloud/api/commands/ListZonesByCmd.java |   10 +-
 api/src/com/cloud/api/commands/LockAccountCmd.java |   10 +-
 api/src/com/cloud/api/commands/LockUserCmd.java    |   12 +-
 .../api/commands/MarkDefaultZoneForAccountCmd.java |   14 +-
 .../com/cloud/api/commands/MigrateSystemVMCmd.java |   14 +-
 api/src/com/cloud/api/commands/MigrateVMCmd.java   |  171 -----
 .../com/cloud/api/commands/MigrateVolumeCmd.java   |   14 +-
 .../api/commands/PrepareForMaintenanceCmd.java     |   14 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java    |   14 +-
 .../com/cloud/api/commands/PrepareTemplateCmd.java |   10 +-
 .../cloud/api/commands/QueryAsyncJobResultCmd.java |   10 +-
 .../com/cloud/api/commands/RebootRouterCmd.java    |   14 +-
 .../com/cloud/api/commands/RebootSystemVmCmd.java  |   14 +-
 api/src/com/cloud/api/commands/RebootVMCmd.java    |  114 ---
 .../com/cloud/api/commands/ReconnectHostCmd.java   |   14 +-
 api/src/com/cloud/api/commands/RecoverVMCmd.java   |   85 ---
 api/src/com/cloud/api/commands/RegisterCmd.java    |   10 +-
 api/src/com/cloud/api/commands/RegisterIsoCmd.java |   12 +-
 .../cloud/api/commands/RegisterSSHKeyPairCmd.java  |   10 +-
 .../cloud/api/commands/RegisterTemplateCmd.java    |   12 +-
 .../commands/RemoveFromLoadBalancerRuleCmd.java    |   14 +-
 .../com/cloud/api/commands/RemoveVpnUserCmd.java   |   14 +-
 .../com/cloud/api/commands/ResetVMPasswordCmd.java |  123 ----
 .../cloud/api/commands/ResetVpnConnectionCmd.java  |  120 ----
 .../com/cloud/api/commands/RestartNetworkCmd.java  |   14 +-
 api/src/com/cloud/api/commands/RestartVPCCmd.java  |   14 +-
 api/src/com/cloud/api/commands/RestoreVMCmd.java   |   90 ---
 .../api/commands/RevokeSecurityGroupEgressCmd.java |   14 +-
 .../commands/RevokeSecurityGroupIngressCmd.java    |   14 +-
 api/src/com/cloud/api/commands/StartRouterCmd.java |   14 +-
 .../com/cloud/api/commands/StartSystemVMCmd.java   |   14 +-
 api/src/com/cloud/api/commands/StartVMCmd.java     |  145 ----
 api/src/com/cloud/api/commands/StopRouterCmd.java  |   14 +-
 .../com/cloud/api/commands/StopSystemVmCmd.java    |   14 +-
 api/src/com/cloud/api/commands/StopVMCmd.java      |  130 ----
 .../com/cloud/api/commands/SuspendProjectCmd.java  |   14 +-
 .../com/cloud/api/commands/UpdateAccountCmd.java   |   12 +-
 .../api/commands/UpdateAutoScalePolicyCmd.java     |   14 +-
 .../api/commands/UpdateAutoScaleVmGroupCmd.java    |   14 +-
 .../api/commands/UpdateAutoScaleVmProfileCmd.java  |   14 +-
 api/src/com/cloud/api/commands/UpdateCfgCmd.java   |   10 +-
 .../com/cloud/api/commands/UpdateClusterCmd.java   |   12 +-
 .../cloud/api/commands/UpdateDiskOfferingCmd.java  |   12 +-
 .../com/cloud/api/commands/UpdateDomainCmd.java    |   12 +-
 api/src/com/cloud/api/commands/UpdateHostCmd.java  |   12 +-
 .../cloud/api/commands/UpdateHostPasswordCmd.java  |   10 +-
 .../commands/UpdateHypervisorCapabilitiesCmd.java  |   12 +-
 api/src/com/cloud/api/commands/UpdateIsoCmd.java   |    6 +-
 .../api/commands/UpdateIsoPermissionsCmd.java      |    2 +-
 .../api/commands/UpdateLoadBalancerRuleCmd.java    |   14 +-
 .../com/cloud/api/commands/UpdateNetworkCmd.java   |   14 +-
 .../api/commands/UpdateNetworkOfferingCmd.java     |   12 +-
 .../commands/UpdateNetworkServiceProviderCmd.java  |   14 +-
 .../api/commands/UpdatePhysicalNetworkCmd.java     |   10 +-
 api/src/com/cloud/api/commands/UpdatePodCmd.java   |   12 +-
 .../api/commands/UpdatePortForwardingRuleCmd.java  |   10 +-
 .../com/cloud/api/commands/UpdateProjectCmd.java   |   14 +-
 .../api/commands/UpdateProjectInvitationCmd.java   |   14 +-
 .../cloud/api/commands/UpdateResourceCountCmd.java |   12 +-
 .../cloud/api/commands/UpdateResourceLimitCmd.java |   12 +-
 .../api/commands/UpdateServiceOfferingCmd.java     |   12 +-
 .../commands/UpdateStorageNetworkIpRangeCmd.java   |   14 +-
 .../cloud/api/commands/UpdateStoragePoolCmd.java   |   12 +-
 .../com/cloud/api/commands/UpdateTemplateCmd.java  |    6 +-
 .../cloud/api/commands/UpdateTemplateOrIsoCmd.java |    8 +-
 .../UpdateTemplateOrIsoPermissionsCmd.java         |   10 +-
 .../api/commands/UpdateTemplatePermissionsCmd.java |    2 +-
 .../cloud/api/commands/UpdateTrafficTypeCmd.java   |   14 +-
 api/src/com/cloud/api/commands/UpdateUserCmd.java  |   12 +-
 api/src/com/cloud/api/commands/UpdateVMCmd.java    |  131 ----
 .../com/cloud/api/commands/UpdateVMGroupCmd.java   |   12 +-
 api/src/com/cloud/api/commands/UpdateVPCCmd.java   |   14 +-
 .../cloud/api/commands/UpdateVPCOfferingCmd.java   |   14 +-
 .../api/commands/UpdateVpnCustomerGatewayCmd.java  |  169 -----
 api/src/com/cloud/api/commands/UpdateZoneCmd.java  |   12 +-
 .../com/cloud/api/commands/UpgradeRouterCmd.java   |   12 +-
 .../com/cloud/api/commands/UpgradeSystemVMCmd.java |   13 +-
 api/src/com/cloud/api/commands/UpgradeVMCmd.java   |  106 ---
 .../api/commands/UploadCustomCertificateCmd.java   |   12 +-
 .../com/cloud/api/commands/UploadVolumeCmd.java    |   48 +-
 .../api/commands/listStorageNetworkIpRangeCmd.java |   14 +-
 .../com/cloud/api/response/AccountResponse.java    |    2 +-
 api/src/com/cloud/api/response/AlertResponse.java  |    2 +-
 .../com/cloud/api/response/AsyncJobResponse.java   |    4 +-
 .../api/response/AutoScalePolicyResponse.java      |   34 +-
 .../api/response/AutoScaleVmGroupResponse.java     |   34 +-
 .../api/response/AutoScaleVmProfileResponse.java   |   38 +-
 api/src/com/cloud/api/response/BaseResponse.java   |    4 +-
 .../cloud/api/response/CapabilitiesResponse.java   |    2 +-
 .../com/cloud/api/response/CapabilityResponse.java |    2 +-
 .../com/cloud/api/response/CapacityResponse.java   |    2 +-
 .../api/response/CloudIdentifierResponse.java      |    2 +-
 .../com/cloud/api/response/ClusterResponse.java    |    2 +-
 .../com/cloud/api/response/ConditionResponse.java  |    2 +-
 .../cloud/api/response/ConfigurationResponse.java  |    2 +-
 .../com/cloud/api/response/CounterResponse.java    |    2 +-
 .../com/cloud/api/response/CreateCmdResponse.java  |    2 +-
 .../cloud/api/response/DiskOfferingResponse.java   |    2 +-
 api/src/com/cloud/api/response/DomainResponse.java |    2 +-
 .../cloud/api/response/DomainRouterResponse.java   |    2 +-
 api/src/com/cloud/api/response/EventResponse.java  |    2 +-
 .../com/cloud/api/response/EventTypeResponse.java  |    2 +-
 .../com/cloud/api/response/ExtractResponse.java    |    2 +-
 .../com/cloud/api/response/FirewallResponse.java   |    2 +-
 .../cloud/api/response/FirewallRuleResponse.java   |    2 +-
 .../api/response/GuestOSCategoryResponse.java      |    2 +-
 .../com/cloud/api/response/GuestOSResponse.java    |    2 +-
 api/src/com/cloud/api/response/HostResponse.java   |    2 +-
 .../response/HypervisorCapabilitiesResponse.java   |    2 +-
 .../com/cloud/api/response/HypervisorResponse.java |    2 +-
 .../com/cloud/api/response/IPAddressResponse.java  |    2 +-
 .../cloud/api/response/InstanceGroupResponse.java  |    2 +-
 .../api/response/IpForwardingRuleResponse.java     |    2 +-
 .../cloud/api/response/LBStickinessResponse.java   |    2 +-
 .../com/cloud/api/response/LDAPConfigResponse.java |    2 +-
 api/src/com/cloud/api/response/ListResponse.java   |    2 +-
 .../cloud/api/response/LoadBalancerResponse.java   |    2 +-
 .../com/cloud/api/response/NetworkACLResponse.java |    2 +-
 .../api/response/NetworkOfferingResponse.java      |    2 +-
 .../com/cloud/api/response/NetworkResponse.java    |    2 +-
 api/src/com/cloud/api/response/NicResponse.java    |    2 +-
 .../api/response/PhysicalNetworkResponse.java      |    2 +-
 api/src/com/cloud/api/response/PodResponse.java    |    2 +-
 .../cloud/api/response/PrivateGatewayResponse.java |    2 +-
 .../cloud/api/response/ProjectAccountResponse.java |    2 +-
 .../api/response/ProjectInvitationResponse.java    |    2 +-
 .../com/cloud/api/response/ProjectResponse.java    |    2 +-
 .../com/cloud/api/response/ProviderResponse.java   |    2 +-
 .../api/response/RemoteAccessVpnResponse.java      |    2 +-
 .../cloud/api/response/ResourceCountResponse.java  |    2 +-
 .../cloud/api/response/ResourceLimitResponse.java  |    2 +-
 .../cloud/api/response/ResourceTagResponse.java    |    2 +-
 .../com/cloud/api/response/SSHKeyPairResponse.java |    2 +-
 .../cloud/api/response/SecurityGroupResponse.java  |    2 +-
 .../api/response/SecurityGroupRuleResponse.java    |    2 +-
 .../api/response/ServiceOfferingResponse.java      |    2 +-
 .../com/cloud/api/response/ServiceResponse.java    |    2 +-
 .../response/Site2SiteCustomerGatewayResponse.java |    2 +-
 .../response/Site2SiteVpnConnectionResponse.java   |    2 +-
 .../api/response/Site2SiteVpnGatewayResponse.java  |    2 +-
 .../com/cloud/api/response/SnapshotResponse.java   |    2 +-
 .../cloud/api/response/StaticRouteResponse.java    |    2 +-
 .../response/StorageNetworkIpRangeResponse.java    |    2 +-
 .../cloud/api/response/StoragePoolResponse.java    |    2 +-
 api/src/com/cloud/api/response/SwiftResponse.java  |    2 +-
 .../com/cloud/api/response/SystemVmResponse.java   |    2 +-
 .../api/response/TemplatePermissionsResponse.java  |    2 +-
 .../com/cloud/api/response/TemplateResponse.java   |    2 +-
 .../response/TrafficTypeImplementorResponse.java   |    2 +-
 .../cloud/api/response/TrafficTypeResponse.java    |    2 +-
 .../com/cloud/api/response/UpgradeVmResponse.java  |    2 +-
 api/src/com/cloud/api/response/UserVmResponse.java |    2 +-
 .../response/VirtualRouterProviderResponse.java    |    2 +-
 .../cloud/api/response/VlanIpRangeResponse.java    |    2 +-
 api/src/com/cloud/api/response/VolumeResponse.java |    2 +-
 .../cloud/api/response/VpcOfferingResponse.java    |    2 +-
 api/src/com/cloud/api/response/VpcResponse.java    |    2 +-
 .../com/cloud/api/response/VpnUsersResponse.java   |    2 +-
 api/src/com/cloud/api/response/ZoneResponse.java   |    2 +-
 api/src/com/cloud/async/AsyncJob.java              |    2 +-
 api/src/com/cloud/network/vpc/VpcGateway.java      |    2 +-
 .../cloud/network/vpn/RemoteAccessVpnService.java  |    2 +-
 .../com/cloud/network/vpn/Site2SiteVpnService.java |   22 +-
 api/src/com/cloud/projects/Project.java            |    2 +-
 api/src/com/cloud/server/ManagementService.java    |    4 +-
 api/src/com/cloud/vm/UserVmService.java            |   22 +-
 api/src/com/cloud/vm/VirtualMachine.java           |    2 +-
 api/src/org/apache/cloudstack/api/ACL.java         |   31 +
 .../org/apache/cloudstack/api/ApiConstants.java    |  431 ++++++++++++
 .../org/apache/cloudstack/api/BaseAsyncCmd.java    |  134 ++++
 .../apache/cloudstack/api/BaseAsyncCreateCmd.java  |   55 ++
 api/src/org/apache/cloudstack/api/BaseCmd.java     |  533 +++++++++++++++
 .../api/BaseListAccountResourcesCmd.java           |   27 +
 api/src/org/apache/cloudstack/api/BaseListCmd.java |  108 +++
 .../cloudstack/api/BaseListDomainResourcesCmd.java |   45 ++
 .../api/BaseListProjectAndAccountResourcesCmd.java |   28 +
 .../cloudstack/api/BaseListTaggedResourcesCmd.java |   48 ++
 api/src/org/apache/cloudstack/api/Identity.java    |   21 +
 .../org/apache/cloudstack/api/IdentityMapper.java  |   29 +
 .../org/apache/cloudstack/api/IdentityService.java |   25 +
 .../org/apache/cloudstack/api/Implementation.java  |   39 ++
 api/src/org/apache/cloudstack/api/Parameter.java   |   51 ++
 api/src/org/apache/cloudstack/api/PlugService.java |   31 +
 .../apache/cloudstack/api/ResponseGenerator.java   |  364 ++++++++++
 .../org/apache/cloudstack/api/ResponseObject.java  |   78 +++
 .../apache/cloudstack/api/ServerApiException.java  |   51 ++
 .../api/admin/vm/command/AssignVMCmd.java          |  126 ++++
 .../api/admin/vm/command/MigrateVMCmd.java         |  171 +++++
 .../api/admin/vm/command/RecoverVMCmd.java         |   85 +++
 .../api/user/vm/command/DeployVMCmd.java           |  451 ++++++++++++
 .../api/user/vm/command/DestroyVMCmd.java          |  115 ++++
 .../api/user/vm/command/GetVMPasswordCmd.java      |   84 +++
 .../cloudstack/api/user/vm/command/ListVMsCmd.java |  217 ++++++
 .../api/user/vm/command/RebootVMCmd.java           |  114 +++
 .../api/user/vm/command/ResetVMPasswordCmd.java    |  123 ++++
 .../api/user/vm/command/RestoreVMCmd.java          |   90 +++
 .../cloudstack/api/user/vm/command/StartVMCmd.java |  145 ++++
 .../cloudstack/api/user/vm/command/StopVMCmd.java  |  130 ++++
 .../api/user/vm/command/UpdateVMCmd.java           |  131 ++++
 .../api/user/vm/command/UpgradeVMCmd.java          |  106 +++
 .../user/vpn/command/CreateRemoteAccessVpnCmd.java |  198 ++++++
 .../user/vpn/command/CreateVpnConnectionCmd.java   |  143 ++++
 .../vpn/command/CreateVpnCustomerGatewayCmd.java   |  169 +++++
 .../api/user/vpn/command/CreateVpnGatewayCmd.java  |  106 +++
 .../user/vpn/command/DeleteRemoteAccessVpnCmd.java |  100 +++
 .../user/vpn/command/DeleteVpnConnectionCmd.java   |  103 +++
 .../vpn/command/DeleteVpnCustomerGatewayCmd.java   |   97 +++
 .../api/user/vpn/command/DeleteVpnGatewayCmd.java  |   98 +++
 .../user/vpn/command/ListRemoteAccessVpnsCmd.java  |   80 +++
 .../user/vpn/command/ListVpnConnectionsCmd.java    |   92 +++
 .../vpn/command/ListVpnCustomerGatewaysCmd.java    |   84 +++
 .../api/user/vpn/command/ListVpnGatewaysCmd.java   |   91 +++
 .../user/vpn/command/ResetVpnConnectionCmd.java    |  120 ++++
 .../vpn/command/UpdateVpnCustomerGatewayCmd.java   |  169 +++++
 .../cloud/api/commands/test/AddClusterCmdTest.java |    4 +-
 .../cloud/api/commands/test/AddHostCmdTest.java    |    4 +-
 .../test/AddNetworkServiceProviderCmdTest.java     |    2 +-
 .../commands/test/AddSecondaryStorageCmdTest.java  |    4 +-
 .../cloud/api/commands/test/AddSwiftCmdTest.java   |    4 +-
 .../cloud/api/commands/test/AddVpnUserCmdTest.java |    2 +-
 client/tomcatconf/commands.properties.in           |   56 +-
 core/src/com/cloud/alert/AlertVO.java              |    2 +-
 core/src/com/cloud/event/EventVO.java              |    2 +-
 core/src/com/cloud/host/HostVO.java                |    2 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |    2 +-
 core/src/com/cloud/network/VpnUserVO.java          |    2 +-
 .../cloud/network/security/SecurityGroupVO.java    |    2 +-
 core/src/com/cloud/storage/DiskOfferingVO.java     |    2 +-
 core/src/com/cloud/storage/GuestOSCategoryVO.java  |    2 +-
 core/src/com/cloud/storage/GuestOSVO.java          |    2 +-
 core/src/com/cloud/storage/SnapshotPolicyVO.java   |    2 +-
 core/src/com/cloud/storage/SnapshotScheduleVO.java |    2 +-
 core/src/com/cloud/storage/SnapshotVO.java         |    2 +-
 core/src/com/cloud/storage/StoragePoolVO.java      |    2 +-
 core/src/com/cloud/storage/SwiftVO.java            |    2 +-
 core/src/com/cloud/storage/VMTemplateVO.java       |    2 +-
 core/src/com/cloud/storage/VolumeVO.java           |    2 +-
 core/src/com/cloud/user/AccountVO.java             |    2 +-
 core/src/com/cloud/user/UserVO.java                |    2 +-
 core/src/com/cloud/vm/InstanceGroupVO.java         |    2 +-
 docs/en-US/added-error-codes.xml                   |    2 +-
 .../cloud/api/commands/netapp/AssociateLunCmd.java |   10 +-
 .../cloud/api/commands/netapp/CreateLunCmd.java    |   10 +-
 .../commands/netapp/CreateVolumeOnFilerCmd.java    |   10 +-
 .../api/commands/netapp/CreateVolumePoolCmd.java   |   10 +-
 .../api/commands/netapp/DeleteVolumePoolCmd.java   |   10 +-
 .../cloud/api/commands/netapp/DestroyLunCmd.java   |   10 +-
 .../commands/netapp/DestroyVolumeOnFilerCmd.java   |   10 +-
 .../api/commands/netapp/DissociateLunCmd.java      |   10 +-
 .../com/cloud/api/commands/netapp/ListLunsCmd.java |   10 +-
 .../api/commands/netapp/ListVolumePoolsCmd.java    |    6 +-
 .../api/commands/netapp/ListVolumesOnFilerCmd.java |   10 +-
 .../api/commands/netapp/ModifyVolumePoolCmd.java   |   10 +-
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |   14 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   14 +-
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   14 +-
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |   14 +-
 .../cloud/api/response/CiscoNexusVSMResponse.java  |    2 +-
 .../com/cloud/network/CiscoNexusVSMDeviceVO.java   |    2 +-
 .../api/commands/AddExternalLoadBalancerCmd.java   |   14 +-
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |   16 +-
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |   16 +-
 .../commands/DeleteExternalLoadBalancerCmd.java    |   14 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java      |   16 +-
 .../api/commands/ListExternalLoadBalancersCmd.java |   12 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   16 +-
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |   16 +-
 .../cloud/api/response/F5LoadBalancerResponse.java |    2 +-
 .../cloud/api/commands/AddExternalFirewallCmd.java |   14 +-
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |   16 +-
 .../api/commands/ConfigureSrxFirewallCmd.java      |   16 +-
 .../api/commands/DeleteExternalFirewallCmd.java    |   14 +-
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   16 +-
 .../api/commands/ListExternalFirewallsCmd.java     |   12 +-
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   16 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |   16 +-
 .../cloud/api/response/SrxFirewallResponse.java    |    2 +-
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   16 +-
 .../ConfigureNetscalerLoadBalancerCmd.java         |   16 +-
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |   16 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   16 +-
 .../commands/ListNetscalerLoadBalancersCmd.java    |   16 +-
 .../response/NetscalerLoadBalancerResponse.java    |    2 +-
 .../cloud/network/element/NetscalerElement.java    |    2 +-
 .../cloud/network/resource/NetscalerResource.java  |    2 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |   16 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java     |   16 +-
 .../commands/ListNiciraNvpDeviceNetworksCmd.java   |   16 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java      |   16 +-
 .../api/response/NiciraNvpDeviceResponse.java      |    2 +-
 .../cloud/server/auth/LDAPUserAuthenticator.java   |    2 +-
 server/src/com/cloud/acl/DomainChecker.java        |    2 +-
 server/src/com/cloud/api/ApiDispatcher.java        |    3 +-
 server/src/com/cloud/api/ApiGsonHelper.java        |    2 +
 .../src/com/cloud/api/ApiResponseGsonHelper.java   |    1 +
 server/src/com/cloud/api/ApiResponseHelper.java    |    8 +-
 server/src/com/cloud/api/ApiSerializerHelper.java  |    1 +
 server/src/com/cloud/api/ApiServer.java            |    1 +
 server/src/com/cloud/api/ApiServlet.java           |    2 +
 .../com/cloud/api/ResponseObjectTypeAdapter.java   |    1 +
 .../cloud/api/commands/AddNetworkDeviceCmd.java    |   10 +-
 .../cloud/api/commands/AddTrafficMonitorCmd.java   |   12 +-
 .../cloud/api/commands/DeleteNetworkDeviceCmd.java |   12 +-
 .../api/commands/DeleteTrafficMonitorCmd.java      |   12 +-
 .../api/commands/GenerateUsageRecordsCmd.java      |   12 +-
 .../com/cloud/api/commands/GetUsageRecordsCmd.java |   10 +-
 .../cloud/api/commands/ListNetworkDeviceCmd.java   |   12 +-
 .../cloud/api/commands/ListTrafficMonitorsCmd.java |   10 +-
 .../com/cloud/api/commands/ListUsageTypesCmd.java  |    4 +-
 server/src/com/cloud/api/doc/ApiXmlDocWriter.java  |   10 +-
 .../cloud/api/response/ApiResponseSerializer.java  |    6 +-
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |  426 ++++++------
 .../com/cloud/baremetal/BareMetalDiscoverer.java   |    2 +-
 .../com/cloud/baremetal/BareMetalResourceBase.java |    2 +-
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |    6 +-
 .../com/cloud/baremetal/DhcpServerResponse.java    |    2 +-
 .../src/com/cloud/baremetal/PxeServerResponse.java |    2 +-
 .../configuration/ConfigurationManagerImpl.java    |    2 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    2 +-
 server/src/com/cloud/dc/ClusterVO.java             |    2 +-
 server/src/com/cloud/dc/DataCenterVO.java          |    4 +-
 server/src/com/cloud/dc/HostPodVO.java             |    2 +-
 server/src/com/cloud/dc/VlanVO.java                |    2 +-
 server/src/com/cloud/domain/DomainVO.java          |    2 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |    2 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |    2 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |    4 +-
 server/src/com/cloud/network/IPAddressVO.java      |    6 +-
 server/src/com/cloud/network/NetworkVO.java        |    2 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |    6 +-
 .../com/cloud/network/as/AutoScaleVmProfileVO.java |   34 +-
 server/src/com/cloud/network/as/ConditionVO.java   |    2 +-
 server/src/com/cloud/network/as/CounterVO.java     |    2 +-
 .../com/cloud/network/rules/FirewallRuleVO.java    |    2 +-
 .../src/com/cloud/network/vpc/StaticRouteVO.java   |    2 +-
 server/src/com/cloud/network/vpc/VpcVO.java        |    2 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |    2 +-
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |   22 +-
 .../src/com/cloud/offerings/NetworkOfferingVO.java |    2 +-
 .../com/cloud/projects/ProjectInvitationVO.java    |    2 +-
 server/src/com/cloud/projects/ProjectVO.java       |    2 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    2 +-
 .../src/com/cloud/server/ManagementServerImpl.java |    4 +-
 .../api/response/ExternalFirewallResponse.java     |    2 +-
 .../api/response/ExternalLoadBalancerResponse.java |    2 +-
 .../server/api/response/NetworkDeviceResponse.java |    2 +-
 .../server/api/response/NwDeviceDhcpResponse.java  |    2 +-
 .../api/response/NwDevicePxeServerResponse.java    |    2 +-
 .../cloud/server/api/response/PxePingResponse.java |    2 +-
 .../api/response/TrafficMonitorResponse.java       |    2 +-
 .../server/api/response/UsageRecordResponse.java   |    2 +-
 .../server/api/response/UsageTypeResponse.java     |    2 +-
 .../response/netapp/AssociateLunCmdResponse.java   |    2 +-
 .../api/response/netapp/CreateLunCmdResponse.java  |    2 +-
 .../api/response/netapp/ListLunsCmdResponse.java   |    2 +-
 .../netapp/ListVolumePoolsCmdResponse.java         |    2 +-
 .../netapp/ListVolumesOnFilerCmdResponse.java      |    2 +-
 .../src/com/cloud/servlet/ConsoleProxyServlet.java |    2 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   20 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |    2 +-
 server/src/com/cloud/tags/ResourceTagVO.java       |    2 +-
 .../com/cloud/template/TemplateAdapterBase.java    |    2 +-
 .../cloud/uuididentity/IdentityServiceImpl.java    |    4 +-
 .../com/cloud/uuididentity/dao/IdentityDao.java    |    6 +-
 .../cloud/uuididentity/dao/IdentityDaoImpl.java    |    2 +-
 server/src/com/cloud/vm/NicVO.java                 |    2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   24 +-
 server/test/com/cloud/keystore/KeystoreTest.java   |    2 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   22 +-
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |   22 +-
 .../utils/exception/CSExceptionErrorCode.java      |    2 +-
 596 files changed, 8627 insertions(+), 8610 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fc3bc37/api/src/com/cloud/api/ACL.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/ACL.java b/api/src/com/cloud/api/ACL.java
deleted file mode 100644
index bd02c06..0000000
--- a/api/src/com/cloud/api/ACL.java
+++ /dev/null
@@ -1,31 +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.api;
-
-import static java.lang.annotation.ElementType.FIELD;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ FIELD })
-public @interface ACL {
-	
-	boolean checkKeyAccess() default false;
-	boolean checkValueAccess() default false;
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fc3bc37/api/src/com/cloud/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java
deleted file mode 100755
index 78a3ded..0000000
--- a/api/src/com/cloud/api/ApiConstants.java
+++ /dev/null
@@ -1,431 +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.api;
-
-public class ApiConstants {
-    public static final String ACCOUNT = "account";
-    public static final String ACCOUNTS = "accounts";
-    public static final String ACCOUNT_TYPE = "accounttype";
-    public static final String ACCOUNT_ID = "accountid";
-    public static final String ALGORITHM = "algorithm";
-    public static final String ALLOCATED_ONLY = "allocatedonly";
-    public static final String API_KEY = "userapikey";
-    public static final String APPLIED = "applied";
-    public static final String AVAILABLE = "available";
-    public static final String BITS = "bits";
-    public static final String BOOTABLE = "bootable";
-    public static final String BIND_DN = "binddn";
-    public static final String BIND_PASSWORD = "bindpass";
-    public static final String CATEGORY = "category";
-    public static final String CERTIFICATE = "certificate";
-    public static final String PRIVATE_KEY = "privatekey";
-    public static final String DOMAIN_SUFFIX = "domainsuffix";
-    public static final String DNS_SEARCH_ORDER = "dnssearchorder";
-    public static final String CIDR = "cidr";
-    public static final String CIDR_LIST = "cidrlist";
-    public static final String CLEANUP = "cleanup";
-    public static final String CLUSTER_ID = "clusterid";
-    public static final String CLUSTER_NAME = "clustername";
-    public static final String CLUSTER_TYPE = "clustertype";
-    public static final String COMPONENT = "component";
-    public static final String CPU_NUMBER = "cpunumber";
-    public static final String CPU_SPEED = "cpuspeed";
-    public static final String CREATED = "created";
-    public static final String CUSTOMIZED = "customized";
-    public static final String DESCRIPTION = "description";
-    public static final String DESTINATION_ZONE_ID = "destzoneid";
-    public static final String DETAILS = "details";
-    public static final String DEVICE_ID = "deviceid";
-    public static final String DISK_OFFERING_ID = "diskofferingid";
-    public static final String DISK_SIZE = "disksize";
-    public static final String DISPLAY_NAME = "displayname";
-    public static final String DISPLAY_TEXT = "displaytext";
-    public static final String DNS1 = "dns1";
-    public static final String DNS2 = "dns2";
-    public static final String DOMAIN = "domain";
-    public static final String DOMAIN_ID = "domainid";
-    public static final String DURATION = "duration";
-    public static final String EMAIL = "email";
-    public static final String END_DATE = "enddate";
-    public static final String END_IP = "endip";
-    public static final String END_PORT = "endport";
-    public static final String ENTRY_TIME = "entrytime";
-    public static final String FETCH_LATEST = "fetchlatest";
-    public static final String FIRSTNAME = "firstname";
-    public static final String FORCED = "forced";
-    public static final String FORCED_DESTROY_LOCAL_STORAGE = "forcedestroylocalstorage";
-    public static final String FORMAT = "format";
-    public static final String FOR_VIRTUAL_NETWORK = "forvirtualnetwork";
-    public static final String GATEWAY = "gateway";
-    public static final String GROUP = "group";
-    public static final String GROUP_ID = "groupid";
-    public static final String GUEST_CIDR_ADDRESS = "guestcidraddress";
-    public static final String HA_ENABLE = "haenable";
-    public static final String HOST_ID = "hostid";
-    public static final String HOST_NAME = "hostname";
-    public static final String HYPERVISOR = "hypervisor";
-    public static final String INLINE = "inline";
-    public static final String INSTANCE = "instance";
-    public static final String ICMP_CODE = "icmpcode";
-    public static final String ICMP_TYPE = "icmptype";
-    public static final String ID = "id";
-    public static final String IDS = "ids";
-    public static final String INTERNAL_DNS1 = "internaldns1";
-    public static final String INTERNAL_DNS2 = "internaldns2";
-    public static final String INTERVAL_TYPE = "intervaltype";
-    public static final String IP_ADDRESS = "ipaddress";
-    public static final String IP_ADDRESS_ID = "ipaddressid";
-    public static final String IP_AVAILABLE = "ipavailable";
-    public static final String IP_LIMIT = "iplimit";
-    public static final String IP_TOTAL = "iptotal";
-    public static final String IS_CLEANUP_REQUIRED = "iscleanuprequired";
-    public static final String IS_EXTRACTABLE = "isextractable";
-    public static final String IS_FEATURED = "isfeatured";
-    public static final String IS_PUBLIC = "ispublic";
-    public static final String IS_READY = "isready";
-    public static final String IS_RECURSIVE = "isrecursive";
-    public static final String ISO_FILTER = "isofilter";
-    public static final String ISO_GUEST_OS_NONE = "None";
-    public static final String JOB_ID = "jobid";
-    public static final String JOB_STATUS = "jobstatus";
-    public static final String LASTNAME = "lastname";
-    public static final String LEVEL = "level";
-    public static final String LIMIT_CPU_USE = "limitcpuuse";
-    public static final String LOCK = "lock";
-    public static final String LUN = "lun";
-    public static final String LBID = "lbruleid";
-    public static final String MAX = "max";
-    public static final String MAX_SNAPS = "maxsnaps";
-    public static final String MEMORY = "memory";
-    public static final String MODE = "mode";
-    public static final String NAME = "name";
-    public static final String METHOD_NAME = "methodname";
-    public static final String NETWORK_DOMAIN = "networkdomain";
-    public static final String NETMASK = "netmask";
-    public static final String NEW_NAME = "newname";
-    public static final String NUM_RETRIES = "numretries";
-    public static final String OFFER_HA = "offerha";
-    public static final String IS_SYSTEM_OFFERING = "issystem";
-    public static final String IS_DEFAULT_USE = "defaultuse";
-    public static final String OP = "op";
-    public static final String OS_CATEGORY_ID = "oscategoryid";
-    public static final String OS_TYPE_ID = "ostypeid";
-    public static final String PARENT_DOMAIN_ID = "parentdomainid";
-    public static final String PASSWORD = "password";
-    public static final String NEW_PASSWORD = "new_password";
-    public static final String PASSWORD_ENABLED = "passwordenabled";
-    public static final String SSHKEY_ENABLED = "sshkeyenabled";
-    public static final String PATH = "path";
-    public static final String POD_ID = "podid";
-    public static final String POD_IDS = "podids";
-    public static final String POLICY_ID = "policyid";
-    public static final String PORT = "port";
-    public static final String PORTAL = "portal";
-    public static final String PORT_FORWARDING_SERVICE_ID = "portforwardingserviceid";
-    public static final String PRIVATE_INTERFACE = "privateinterface";
-    public static final String PRIVATE_IP = "privateip";
-    public static final String PRIVATE_PORT = "privateport";
-    public static final String PRIVATE_START_PORT = "privateport";
-    public static final String PRIVATE_END_PORT = "privateendport";
-    public static final String PRIVATE_ZONE = "privatezone";
-    public static final String PROTOCOL = "protocol";
-    public static final String PUBLIC_INTERFACE = "publicinterface";
-    public static final String PUBLIC_IP_ID = "publicipid";
-    public static final String PUBLIC_IP = "publicip";
-    public static final String PUBLIC_PORT = "publicport";
-    public static final String PUBLIC_START_PORT = "publicport";
-    public static final String PUBLIC_END_PORT = "publicendport";
-    public static final String PUBLIC_ZONE = "publiczone";
-    public static final String RECEIVED_BYTES = "receivedbytes";
-    public static final String REQUIRES_HVM = "requireshvm";
-    public static final String RESOURCE_TYPE = "resourcetype";
-    public static final String QUERY_FILTER = "queryfilter";
-    public static final String SCHEDULE = "schedule";
-    public static final String SCOPE = "scope";
-    public static final String SECRET_KEY = "usersecretkey";
-    public static final String KEY = "key";
-    public static final String SEARCH_BASE = "searchbase";
-    public static final String SECURITY_GROUP_IDS = "securitygroupids";
-    public static final String SECURITY_GROUP_NAMES = "securitygroupnames";
-    public static final String SECURITY_GROUP_NAME = "securitygroupname";
-    public static final String SECURITY_GROUP_ID = "securitygroupid";
-    public static final String SENT = "sent";
-    public static final String SENT_BYTES = "sentbytes";
-    public static final String SERVICE_OFFERING_ID = "serviceofferingid";
-    public static final String SHOW_CAPACITIES = "showcapacities";
-    public static final String SIZE = "size";
-    public static final String SNAPSHOT_ID = "snapshotid";
-    public static final String SNAPSHOT_POLICY_ID = "snapshotpolicyid";
-    public static final String SNAPSHOT_TYPE = "snapshottype";
-    public static final String SOURCE_ZONE_ID = "sourcezoneid";
-    public static final String START_DATE = "startdate";
-    public static final String START_IP = "startip";
-    public static final String START_PORT = "startport";
-    public static final String STATE = "state";
-    public static final String STATUS = "status";
-    public static final String STORAGE_TYPE = "storagetype";
-    public static final String SYSTEM_VM_TYPE = "systemvmtype";
-    public static final String TAGS = "tags";
-    public static final String TARGET_IQN = "targetiqn";
-    public static final String TEMPLATE_FILTER = "templatefilter";
-    public static final String TEMPLATE_ID = "templateid";
-    public static final String ISO_ID = "isoid";
-    public static final String TIMEOUT = "timeout";
-    public static final String TIMEZONE = "timezone";
-    public static final String TYPE = "type";
-    public static final String TRUST_STORE = "truststore";
-    public static final String TRUST_STORE_PASSWORD = "truststorepass";
-    public static final String URL = "url";
-    public static final String USAGE_INTERFACE = "usageinterface";
-    public static final String USER_DATA = "userdata";
-    public static final String USER_ID = "userid";
-    public static final String USE_SSL = "ssl";
-    public static final String USERNAME = "username";
-    public static final String USER_SECURITY_GROUP_LIST = "usersecuritygrouplist";
-    public static final String USE_VIRTUAL_NETWORK = "usevirtualnetwork";
-    public static final String VALUE = "value";
-    public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
-    public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
-    public static final String VLAN = "vlan";
-    public static final String VLAN_ID = "vlanid";
-    public static final String VM_AVAILABLE = "vmavailable";
-    public static final String VM_LIMIT = "vmlimit";
-    public static final String VM_TOTAL = "vmtotal";
-    public static final String VNET = "vnet";
-    public static final String VOLUME_ID = "volumeid";
-    public static final String ZONE_ID = "zoneid";
-    public static final String ZONE_NAME = "zonename";
-    public static final String NETWORK_TYPE = "networktype";
-    public static final String PAGE = "page";
-    public static final String PAGE_SIZE = "pagesize";
-    public static final String COUNT = "count";
-    public static final String TRAFFIC_TYPE = "traffictype";
-    public static final String NETWORK_OFFERING_ID = "networkofferingid";
-    public static final String NETWORK_IDS = "networkids";
-    public static final String NETWORK_ID = "networkid";
-    public static final String SPECIFY_VLAN = "specifyvlan";
-    public static final String IS_DEFAULT = "isdefault";
-    public static final String IS_SYSTEM = "issystem";
-    public static final String AVAILABILITY = "availability";
-    public static final String NETWORKRATE = "networkrate";
-    public static final String HOST_TAGS = "hosttags";
-    public static final String SSH_KEYPAIR = "keypair";
-    public static final String HOST_CPU_CAPACITY = "hostcpucapacity";
-    public static final String HOST_CPU_NUM = "hostcpunum";
-    public static final String HOST_MEM_CAPACITY = "hostmemcapacity";
-    public static final String HOST_MAC = "hostmac";
-    public static final String HOST_TAG = "hosttag";
-    public static final String PXE_SERVER_TYPE = "pxeservertype";
-    public static final String LINMIN_USERNAME = "linminusername";
-    public static final String LINMIN_PASSWORD = "linminpassword";
-    public static final String LINMIN_APID = "linminapid";
-    public static final String DHCP_SERVER_TYPE = "dhcpservertype";
-    public static final String LINK_LOCAL_IP = "linklocalip";
-    public static final String LINK_LOCAL_MAC_ADDRESS = "linklocalmacaddress";
-    public static final String LINK_LOCAL_MAC_NETMASK = "linklocalnetmask";
-    public static final String LINK_LOCAL_NETWORK_ID = "linklocalnetworkid";
-    public static final String PRIVATE_MAC_ADDRESS = "privatemacaddress";
-    public static final String PRIVATE_NETMASK = "privatenetmask";
-    public static final String PRIVATE_NETWORK_ID = "privatenetworkid";
-    public static final String ALLOCATION_STATE = "allocationstate";
-    public static final String MANAGED_STATE = "managedstate";
-    public static final String STORAGE_ID = "storageid";
-    public static final String PING_STORAGE_SERVER_IP = "pingstorageserverip";
-    public static final String PING_DIR = "pingdir";
-    public static final String TFTP_DIR = "tftpdir";
-    public static final String PING_CIFS_USERNAME = "pingcifsusername";
-    public static final String PING_CIFS_PASSWORD = "pingcifspassword";
-    public static final String CHECKSUM = "checksum";
-    public static final String NETWORK_DEVICE_TYPE = "networkdevicetype";
-    public static final String NETWORK_DEVICE_PARAMETER_LIST = "networkdeviceparameterlist";
-    public static final String ZONE_TOKEN = "zonetoken";
-    public static final String DHCP_PROVIDER = "dhcpprovider";
-    public static final String RESULT = "success";
-    public static final String LUN_ID = "lunId";
-    public static final String IQN = "iqn";
-    public static final String AGGREGATE_NAME = "aggregatename";
-    public static final String POOL_NAME = "poolname";
-    public static final String VOLUME_NAME = "volumename";
-    public static final String SNAPSHOT_POLICY = "snapshotpolicy";
-    public static final String SNAPSHOT_RESERVATION = "snapshotreservation";
-    public static final String IP_NETWORK_LIST = "iptonetworklist";
-    public static final String PARAM_LIST = "param";
-    public static final String FOR_LOAD_BALANCING = "forloadbalancing";
-    public static final String KEYBOARD = "keyboard";
-    public static final String OPEN_FIREWALL = "openfirewall";
-    public static final String TEMPLATE_TAG = "templatetag";
-    public static final String HYPERVISOR_VERSION = "hypervisorversion";
-    public static final String MAX_GUESTS_LIMIT = "maxguestslimit";
-    public static final String PROJECT_ID = "projectid";
-    public static final String PROJECT_IDS = "projectids";
-    public static final String PROJECT = "project";
-    public static final String ROLE = "role";
-    public static final String USER = "user";
-    public static final String ACTIVE_ONLY = "activeonly";
-    public static final String TOKEN = "token";
-    public static final String ACCEPT = "accept";
-    public static final String SORT_KEY = "sortkey";
-    public static final String ACCOUNT_DETAILS = "accountdetails";
-    public static final String SERVICE_PROVIDER_LIST = "serviceproviderlist";
-    public static final String SERVICE_CAPABILITY_LIST = "servicecapabilitylist";
-    public static final String CAN_CHOOSE_SERVICE_CAPABILITY = "canchooseservicecapability";
-    public static final String PROVIDER = "provider";
-    public static final String NETWORK_SPEED = "networkspeed";
-    public static final String BROADCAST_DOMAIN_RANGE = "broadcastdomainrange";
-    public static final String ISOLATION_METHODS = "isolationmethods";
-    public static final String PHYSICAL_NETWORK_ID = "physicalnetworkid";
-    public static final String DEST_PHYSICAL_NETWORK_ID = "destinationphysicalnetworkid";
-    public static final String ENABLED = "enabled";
-    public static final String SERVICE_NAME = "servicename";
-    public static final String DHCP_RANGE = "dhcprange";
-    public static final String UUID = "uuid";
-    public static final String SECURITY_GROUP_EANBLED = "securitygroupenabled";
-    public static final String LOCAL_STORAGE_ENABLED = "localstorageenabled";
-    public static final String GUEST_IP_TYPE = "guestiptype";
-    public static final String XEN_NETWORK_LABEL = "xennetworklabel";
-    public static final String KVM_NETWORK_LABEL = "kvmnetworklabel";
-    public static final String VMWARE_NETWORK_LABEL = "vmwarenetworklabel";
-    public static final String NETWORK_SERVICE_PROVIDER_ID = "nspid";
-    public static final String SERVICE_LIST = "servicelist";
-    public static final String CAN_ENABLE_INDIVIDUAL_SERVICE = "canenableindividualservice";
-    public static final String SUPPORTED_SERVICES = "supportedservices";
-    public static final String NSP_ID = "nspid";
-    public static final String ACL_TYPE = "acltype";
-    public static final String SUBDOMAIN_ACCESS = "subdomainaccess";
-    public static final String LOAD_BALANCER_DEVICE_ID = "lbdeviceid";
-    public static final String LOAD_BALANCER_DEVICE_NAME = "lbdevicename";
-    public static final String LOAD_BALANCER_DEVICE_STATE = "lbdevicestate";
-    public static final String LOAD_BALANCER_DEVICE_CAPACITY = "lbdevicecapacity";
-    public static final String LOAD_BALANCER_DEVICE_DEDICATED = "lbdevicededicated";
-    public static final String FIREWALL_DEVICE_ID = "fwdeviceid";
-    public static final String FIREWALL_DEVICE_NAME = "fwdevicename";
-    public static final String FIREWALL_DEVICE_STATE = "fwdevicestate";
-    public static final String FIREWALL_DEVICE_CAPACITY = "fwdevicecapacity";
-    public static final String FIREWALL_DEVICE_DEDICATED = "fwdevicededicated";
-    public static final String SERVICE = "service";
-    public static final String ASSOCIATED_NETWORK_ID = "associatednetworkid";
-    public static final String ASSOCIATED_NETWORK_NAME = "associatednetworkname";
-    public static final String SOURCE_NAT_SUPPORTED = "sourcenatsupported";
-    public static final String RESOURCE_STATE = "resourcestate";
-    public static final String PROJECT_INVITE_REQUIRED = "projectinviterequired";
-    public static final String RESTART_REQUIRED = "restartrequired";
-    public static final String ALLOW_USER_CREATE_PROJECTS = "allowusercreateprojects";
-    public static final String CONSERVE_MODE = "conservemode";
-    public static final String TRAFFIC_TYPE_IMPLEMENTOR = "traffictypeimplementor";
-    public static final String KEYWORD = "keyword";
-    public static final String LIST_ALL = "listall";
-    public static final String SPECIFY_IP_RANGES = "specifyipranges";
-    public static final String IS_SOURCE_NAT = "issourcenat";
-    public static final String IS_STATIC_NAT = "isstaticnat";
-    public static final String SORT_BY = "sortby";
-    public static final String CHANGE_CIDR = "changecidr";
-    public static final String PURPOSE = "purpose";
-    public static final String IS_TAGGED = "istagged";
-    public static final String INSTANCE_NAME = "instancename";
-    public static final String START_VM = "startvm";
-    public static final String HA_HOST = "hahost";
-    public static final String CUSTOM_DISK_OFF_MAX_SIZE = "customdiskofferingmaxsize";
-    public static final String DEFAULT_ZONE_ID = "defaultzoneid";
-    public static final String GUID = "guid";
-
-    public static final String EXTERNAL_SWITCH_MGMT_DEVICE_ID = "vsmdeviceid";
-    public static final String EXTERNAL_SWITCH_MGMT_DEVICE_NAME = "vsmdevicename";
-    public static final String EXTERNAL_SWITCH_MGMT_DEVICE_STATE = "vsmdevicestate";
-    // Would we need to have a capacity field for Cisco N1KV VSM? Max hosts managed by it perhaps? May remove this later.
-    public static final String EXTERNAL_SWITCH_MGMT_DEVICE_CAPACITY = "vsmdevicecapacity";
-    public static final String CISCO_NEXUS_VSM_NAME = "vsmname";
-    public static final String VSM_USERNAME = "vsmusername";
-    public static final String VSM_PASSWORD = "vsmpassword";
-    public static final String VSM_IPADDRESS = "vsmipaddress";
-    public static final String VSM_MGMT_VLAN_ID = "vsmmgmtvlanid";
-    public static final String VSM_PKT_VLAN_ID = "vsmpktvlanid";
-    public static final String VSM_CTRL_VLAN_ID = "vsmctrlvlanid";
-    public static final String VSM_STORAGE_VLAN_ID = "vsmstoragevlanid";
-    public static final String VSM_DOMAIN_ID = "vsmdomainid";
-    public static final String VSM_CONFIG_MODE = "vsmconfigmode";
-    public static final String VSM_CONFIG_STATE = "vsmconfigstate";
-    public static final String VSM_DEVICE_STATE = "vsmdevicestate";
-    public static final String ADD_VSM_FLAG = "addvsmflag";
-    public static final String VPC_OFF_ID = "vpcofferingid";
-    public static final String NETWORK = "network";
-    public static final String VPC_ID = "vpcid";
-    public static final String GATEWAY_ID = "gatewayid";
-    public static final String CAN_USE_FOR_DEPLOY = "canusefordeploy";
-    public static final String RESOURCE_IDS = "resourceids";
-    public static final String RESOURCE_ID = "resourceid";
-    public static final String CUSTOMER = "customer";
-    public static final String S2S_VPN_GATEWAY_ID = "s2svpngatewayid";
-    public static final String S2S_CUSTOMER_GATEWAY_ID = "s2scustomergatewayid";
-    public static final String IPSEC_PSK = "ipsecpsk";
-    public static final String GUEST_IP = "guestip";
-    public static final String REMOVED = "removed";
-    public static final String IKE_POLICY = "ikepolicy";
-    public static final String ESP_POLICY = "esppolicy";
-    public static final String IKE_LIFETIME = "ikelifetime";
-    public static final String ESP_LIFETIME = "esplifetime";
-    public static final String DPD = "dpd";
-    public static final String FOR_VPC = "forvpc";
-    public static final String NICIRA_NVP_DEVICE_ID = "nvpdeviceid";
-    public static final String NICIRA_NVP_TRANSPORT_ZONE_UUID = "transportzoneuuid";
-    public static final String NICIRA_NVP_DEVICE_NAME = "niciradevicename";
-	public static final String NICIRA_NVP_GATEWAYSERVICE_UUID = "l3gatewayserviceuuid";
-    
-    public static final String SOURCE = "source";
-    public static final String COUNTER_ID = "counterid";
-    public static final String AGGR_OPERATOR = "aggroperator";
-    public static final String AGGR_FUNCTION = "aggrfunction";
-    public static final String AGGR_VALUE = "aggrvalue";
-    public static final String THRESHOLD = "threshold";
-    public static final String RELATIONAL_OPERATOR = "relationaloperator";
-    public static final String OTHER_DEPLOY_PARAMS = "otherdeployparams";
-    public static final String MIN_MEMBERS = "minmembers";
-    public static final String MAX_MEMBERS = "maxmembers";
-    public static final String AUTOSCALE_VM_DESTROY_TIME = "destroyvmgraceperiod";
-    public static final String VMPROFILE_ID = "vmprofileid";
-    public static final String VMGROUP_ID = "vmgroupid";
-    public static final String CS_URL = "csurl";
-    public static final String SCALEUP_POLICY_IDS = "scaleuppolicyids";
-    public static final String SCALEDOWN_POLICY_IDS = "scaledownpolicyids";
-    public static final String SCALEUP_POLICIES = "scaleuppolicies";
-    public static final String SCALEDOWN_POLICIES = "scaledownpolicies";
-    public static final String INTERVAL = "interval";
-    public static final String QUIETTIME = "quiettime";
-    public static final String ACTION = "action";
-    public static final String CONDITION_ID = "conditionid";
-    public static final String CONDITION_IDS = "conditionids";
-    public static final String COUNTERPARAM_LIST = "counterparam";
-    public static final String AUTOSCALE_USER_ID = "autoscaleuserid";
-
-    public enum HostDetails {
-        all, capacity, events, stats, min;
-    }
-
-    public enum VMDetails {
-        all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min;
-    }
-    
-    public enum LDAPParams {
-        hostname, port, usessl, queryfilter, searchbase, dn, passwd, truststore, truststorepass;
-
-        @Override
-        public String toString() {
-            return "ldap." + name();
-        }
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fc3bc37/api/src/com/cloud/api/BaseAsyncCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/BaseAsyncCmd.java b/api/src/com/cloud/api/BaseAsyncCmd.java
deleted file mode 100644
index cf6d0bd..0000000
--- a/api/src/com/cloud/api/BaseAsyncCmd.java
+++ /dev/null
@@ -1,134 +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.api;
-
-import com.cloud.api.response.AsyncJobResponse;
-import com.cloud.async.AsyncJob;
-import com.cloud.user.User;
-import com.cloud.user.UserContext;
-
-/**
- * queryAsyncJobResult API command.
- */
-public abstract class BaseAsyncCmd extends BaseCmd {
-    
-    public static final String ipAddressSyncObject = "ipaddress";
-    public static final String networkSyncObject = "network";
-    public static final String vpcSyncObject = "vpc";
-    public static final String snapshotHostSyncObject = "snapshothost";
-
-    private AsyncJob job;
-
-    @Parameter(name = "starteventid", type = CommandType.LONG)
-    private Long startEventId;
-
-    /**
-     * For proper tracking of async commands through the system, events must be generated when the command is
-     * scheduled, started, and completed. Commands should specify the type of event so that when the scheduled,
-     * started, and completed events are saved to the events table, they have the proper type information.
-     * 
-     * @return a string representing the type of event, e.g. VM.START, VOLUME.CREATE.
-     */
-    public abstract String getEventType();
-
-    /**
-     * For proper tracking of async commands through the system, events must be generated when the command is
-     * scheduled, started, and completed. Commands should specify a description for these events so that when
-     * the scheduled, started, and completed events are saved to the events table, they have a meaningful description.
-     * 
-     * @return a string representing a description of the event
-     */
-    public abstract String getEventDescription();
-
-    public ResponseObject getResponse(long jobId) {
-        AsyncJobResponse response = new AsyncJobResponse();
-
-        response.setJobId(jobId);
-        response.setResponseName(getCommandName());
-        return response;
-    }
-
-    public void setJob(AsyncJob job) {
-        this.job = job;
-    }
-
-    public Long getStartEventId() {
-        return startEventId;
-    }
-
-    public void setStartEventId(Long startEventId) {
-        this.startEventId = startEventId;
-    }
-
-    /**
-     * Async commands that want to be tracked as part of the listXXX commands need to
-     * provide implementations of the two following methods, getInstanceId() and getInstanceType()
-     * 
-     * getObjectId() should return the id of the object the async command is executing on
-     * getObjectType() should return a type from the AsyncJob.Type enumeration
-     */
-    public Long getInstanceId() {
-        return null;
-    }
-
-    public AsyncJob.Type getInstanceType() {
-        return AsyncJob.Type.None;
-    }
-
-    public String getSyncObjType() {
-        return null;
-    }
-
-    public Long getSyncObjId() {
-        return null;
-    }
-
-    public AsyncJob getJob() {
-        return job;
-    }
-
-    protected long saveStartedEvent() {
-        return saveStartedEvent(getEventType(), "Executing job for " + getEventDescription(), getStartEventId());
-    }
-
-    protected long saveStartedEvent(String eventType, String description, Long startEventId) {
-        UserContext ctx = UserContext.current();
-        Long userId = ctx.getCallerUserId();
-        userId = (userId == null) ? User.UID_SYSTEM : userId;
-        Long startEvent = startEventId;
-        if (startEvent == null) {
-            startEvent = 0L;
-        }
-        return _mgr.saveStartedEvent((userId == null) ? User.UID_SYSTEM : userId, getEntityOwnerId(), eventType, description, startEvent);
-    }
-
-    protected long saveCompletedEvent(String level, String description) {
-        return saveCompletedEvent(level, getEventType(), description, getStartEventId());
-    }
-
-    protected long saveCompletedEvent(String level, String eventType, String description, Long startEventId) {
-        UserContext ctx = UserContext.current();
-        Long userId = ctx.getCallerUserId();
-        userId = (userId == null) ? User.UID_SYSTEM : userId;
-        Long startEvent = startEventId;
-        if (startEvent == null) {
-            startEvent = 0L;
-        }
-        return _mgr.saveCompletedEvent((userId == null) ? User.UID_SYSTEM : userId, getEntityOwnerId(), level, eventType, description, startEvent);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fc3bc37/api/src/com/cloud/api/BaseAsyncCreateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/BaseAsyncCreateCmd.java b/api/src/com/cloud/api/BaseAsyncCreateCmd.java
deleted file mode 100644
index 586c9c9..0000000
--- a/api/src/com/cloud/api/BaseAsyncCreateCmd.java
+++ /dev/null
@@ -1,55 +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.api;
-
-import com.cloud.api.response.CreateCmdResponse;
-import com.cloud.exception.ResourceAllocationException;
-
-public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {
-    @Parameter(name = "id", type = CommandType.LONG)
-    private Long id;
-
-    public abstract void create() throws ResourceAllocationException;
-
-    public Long getEntityId() {
-        return id;
-    }
-
-    public void setEntityId(Long id) {
-        this.id = id;
-    }
-
-    public abstract String getEntityTable();
-
-    public String getResponse(long jobId, long objectId, String objectEntityTable) {
-        CreateCmdResponse response = new CreateCmdResponse();
-        response.setJobId(jobId);
-        response.setId(objectId);
-        response.setIdEntityTable(objectEntityTable);
-        response.setResponseName(getCommandName());
-        return _responseGenerator.toSerializedString(response, getResponseType());
-    }
-
-    public String getCreateEventType() {
-        return null;
-    }
-
-    public String getCreateEventDescription() {
-        return null;
-    }
-
-}


Mime
View raw message