You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/27 00:57:24 UTC

[7/8] git commit: Rename Implementation annotation to APICommand

Rename Implementation annotation to APICommand

Signed-off-by: Rohit Yadav <bh...@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/7a7fe583
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7a7fe583
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7a7fe583

Branch: refs/heads/api_refactoring
Commit: 7a7fe583e0a57b4b4c82200127037961eee14e1c
Parents: a18464d
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Dec 26 15:55:34 2012 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Dec 26 15:55:34 2012 -0800

----------------------------------------------------------------------
 api/src/com/cloud/api/commands/AddS3Cmd.java       |    4 +-
 .../api/commands/CreatePrivateNetworkCmd.java      |   10 +---
 .../cloud/api/commands/DestroyConsoleProxyCmd.java |   10 +---
 .../commands/ListRecurringSnapshotScheduleCmd.java |    4 +-
 api/src/com/cloud/api/commands/ListS3sCmd.java     |    4 +-
 .../commands/ListTemplateOrIsoPermissionsCmd.java  |    4 +-
 api/src/org/apache/cloudstack/api/APICommand.java  |   37 +++++++++++++++
 .../org/apache/cloudstack/api/Implementation.java  |   37 ---------------
 .../command/admin/account/CreateAccountCmd.java    |    9 +--
 .../command/admin/account/DeleteAccountCmd.java    |   10 +---
 .../command/admin/account/DisableAccountCmd.java   |   10 +---
 .../command/admin/account/EnableAccountCmd.java    |    4 +-
 .../api/command/admin/account/LockAccountCmd.java  |    4 +-
 .../command/admin/account/UpdateAccountCmd.java    |    4 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |    4 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |    4 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |    9 +--
 .../command/admin/cluster/DeleteClusterCmd.java    |    4 +-
 .../api/command/admin/cluster/ListClustersCmd.java |    4 +-
 .../command/admin/cluster/UpdateClusterCmd.java    |    4 +-
 .../api/command/admin/config/ListCfgsByCmd.java    |    4 +-
 .../config/ListHypervisorCapabilitiesCmd.java      |    4 +-
 .../api/command/admin/config/UpdateCfgCmd.java     |    4 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java    |    4 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |    9 +--
 .../api/command/admin/domain/DeleteDomainCmd.java  |   10 +---
 .../admin/domain/ListDomainChildrenCmd.java        |    4 +-
 .../api/command/admin/domain/ListDomainsCmd.java   |    4 +-
 .../api/command/admin/domain/UpdateDomainCmd.java  |    9 +--
 .../api/command/admin/host/AddHostCmd.java         |    4 +-
 .../command/admin/host/AddSecondaryStorageCmd.java |    9 +--
 .../command/admin/host/CancelMaintenanceCmd.java   |    4 +-
 .../api/command/admin/host/DeleteHostCmd.java      |    4 +-
 .../api/command/admin/host/ListHostsCmd.java       |    5 +-
 .../admin/host/PrepareForMaintenanceCmd.java       |    4 +-
 .../api/command/admin/host/ReconnectHostCmd.java   |    4 +-
 .../api/command/admin/host/UpdateHostCmd.java      |    4 +-
 .../command/admin/host/UpdateHostPasswordCmd.java  |    4 +-
 .../api/command/admin/ldap/LDAPConfigCmd.java      |    4 +-
 .../api/command/admin/ldap/LDAPRemoveCmd.java      |    4 +-
 .../command/admin/network/AddNetworkDeviceCmd.java |    4 +-
 .../network/AddNetworkServiceProviderCmd.java      |    4 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |    9 +--
 .../admin/network/CreatePhysicalNetworkCmd.java    |    4 +-
 .../network/CreateStorageNetworkIpRangeCmd.java    |    4 +-
 .../admin/network/DeleteNetworkDeviceCmd.java      |    4 +-
 .../admin/network/DeleteNetworkOfferingCmd.java    |    4 +-
 .../network/DeleteNetworkServiceProviderCmd.java   |    4 +-
 .../admin/network/DeletePhysicalNetworkCmd.java    |   10 +---
 .../network/DeleteStorageNetworkIpRangeCmd.java    |   10 +---
 .../admin/network/ListNetworkDeviceCmd.java        |    4 +-
 .../network/ListNetworkServiceProvidersCmd.java    |    4 +-
 .../admin/network/ListPhysicalNetworksCmd.java     |    4 +-
 .../network/ListStorageNetworkIpRangeCmd.java      |   10 +---
 .../network/ListSupportedNetworkServicesCmd.java   |    4 +-
 .../admin/network/UpdateNetworkOfferingCmd.java    |    9 +--
 .../network/UpdateNetworkServiceProviderCmd.java   |    4 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java    |    4 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |   10 +---
 .../admin/offering/CreateDiskOfferingCmd.java      |    4 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |    4 +-
 .../admin/offering/DeleteDiskOfferingCmd.java      |    4 +-
 .../admin/offering/DeleteServiceOfferingCmd.java   |    9 +--
 .../admin/offering/UpdateDiskOfferingCmd.java      |    4 +-
 .../admin/offering/UpdateServiceOfferingCmd.java   |    9 +--
 .../api/command/admin/pod/CreatePodCmd.java        |    9 +--
 .../api/command/admin/pod/DeletePodCmd.java        |    4 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |    4 +-
 .../api/command/admin/pod/UpdatePodCmd.java        |    9 +--
 .../api/command/admin/resource/ListAlertsCmd.java  |    4 +-
 .../command/admin/resource/ListCapacityCmd.java    |    4 +-
 .../admin/resource/UploadCustomCertificateCmd.java |   10 +---
 .../router/ConfigureVirtualRouterElementCmd.java   |    4 +-
 .../router/CreateVirtualRouterElementCmd.java      |   11 +---
 .../api/command/admin/router/DestroyRouterCmd.java |    4 +-
 .../api/command/admin/router/ListRoutersCmd.java   |    4 +-
 .../admin/router/ListVirtualRouterElementsCmd.java |    4 +-
 .../api/command/admin/router/RebootRouterCmd.java  |   10 +---
 .../api/command/admin/router/StartRouterCmd.java   |   10 +---
 .../api/command/admin/router/StopRouterCmd.java    |    4 +-
 .../api/command/admin/router/UpgradeRouterCmd.java |    9 +--
 .../CancelPrimaryStorageMaintenanceCmd.java        |    4 +-
 .../admin/storagepool/CreateStoragePoolCmd.java    |    9 +--
 .../command/admin/storagepool/DeletePoolCmd.java   |    9 +--
 .../admin/storagepool/ListStoragePoolsCmd.java     |    4 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java    |    4 +-
 .../admin/storagepool/UpdateStoragePoolCmd.java    |    9 +--
 .../api/command/admin/swift/AddSwiftCmd.java       |    9 +--
 .../api/command/admin/swift/ListSwiftsCmd.java     |    4 +-
 .../command/admin/systemvm/DestroySystemVmCmd.java |   10 +---
 .../command/admin/systemvm/ListSystemVMsCmd.java   |    4 +-
 .../command/admin/systemvm/MigrateSystemVMCmd.java |    4 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |    4 +-
 .../command/admin/systemvm/StartSystemVMCmd.java   |    4 +-
 .../command/admin/systemvm/StopSystemVmCmd.java    |   10 +---
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    9 +--
 .../command/admin/template/PrepareTemplateCmd.java |    4 +-
 .../api/command/admin/usage/AddTrafficTypeCmd.java |    4 +-
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |    4 +-
 .../usage/ListTrafficTypeImplementorsCmd.java      |    9 +--
 .../command/admin/usage/ListTrafficTypesCmd.java   |    4 +-
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |    4 +-
 .../api/command/admin/user/CreateUserCmd.java      |    4 +-
 .../api/command/admin/user/DeleteUserCmd.java      |    4 +-
 .../api/command/admin/user/DisableUserCmd.java     |    4 +-
 .../api/command/admin/user/EnableUserCmd.java      |    9 +--
 .../api/command/admin/user/GetUserCmd.java         |    4 +-
 .../api/command/admin/user/ListUsersCmd.java       |    4 +-
 .../api/command/admin/user/LockUserCmd.java        |    4 +-
 .../api/command/admin/user/RegisterCmd.java        |    4 +-
 .../api/command/admin/user/UpdateUserCmd.java      |    9 +--
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |    9 +--
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |    4 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |    4 +-
 .../api/command/admin/vm/AssignVMCmd.java          |    9 +--
 .../api/command/admin/vm/MigrateVMCmd.java         |   10 +---
 .../api/command/admin/vm/RecoverVMCmd.java         |    4 +-
 .../command/admin/vpc/CreatePrivateGatewayCmd.java |    4 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   10 +---
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |    4 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |    4 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |   10 +---
 .../api/command/admin/zone/CreateZoneCmd.java      |    4 +-
 .../api/command/admin/zone/DeleteZoneCmd.java      |    9 +--
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |    4 +-
 .../api/command/admin/zone/UpdateZoneCmd.java      |    9 +--
 .../user/account/AddAccountToProjectCmd.java       |   10 +---
 .../user/account/DeleteAccountFromProjectCmd.java  |   10 +---
 .../api/command/user/account/ListAccountsCmd.java  |    4 +-
 .../user/account/ListProjectAccountsCmd.java       |    4 +-
 .../command/user/address/AssociateIPAddrCmd.java   |    4 +-
 .../user/address/DisassociateIPAddrCmd.java        |   10 +---
 .../user/address/ListPublicIpAddressesCmd.java     |    4 +-
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |   10 +---
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |   10 +---
 .../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  |   10 +---
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |    4 +-
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |    4 +-
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |    4 +-
 .../command/user/autoscale/ListConditionsCmd.java  |    4 +-
 .../command/user/autoscale/ListCountersCmd.java    |    4 +-
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |    4 +-
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |   10 +---
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |   10 +---
 .../command/user/config/ListCapabilitiesCmd.java   |    4 +-
 .../api/command/user/event/ListEventTypesCmd.java  |    4 +-
 .../api/command/user/event/ListEventsCmd.java      |    4 +-
 .../user/firewall/CreateFirewallRuleCmd.java       |    4 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |   11 +---
 .../user/firewall/DeleteFirewallRuleCmd.java       |   10 +---
 .../user/firewall/DeletePortForwardingRuleCmd.java |   10 +---
 .../user/firewall/ListFirewallRulesCmd.java        |    4 +-
 .../user/firewall/ListPortForwardingRulesCmd.java  |    4 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |    4 +-
 .../user/guest/ListGuestOsCategoriesCmd.java       |    4 +-
 .../api/command/user/guest/ListGuestOsCmd.java     |    4 +-
 .../api/command/user/iso/AttachIsoCmd.java         |    4 +-
 .../api/command/user/iso/DeleteIsoCmd.java         |    4 +-
 .../api/command/user/iso/DetachIsoCmd.java         |    4 +-
 .../api/command/user/iso/ExtractIsoCmd.java        |   10 +---
 .../api/command/user/iso/ListIsosCmd.java          |    4 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |    9 +--
 .../api/command/user/iso/UpdateIsoCmd.java         |    4 +-
 .../command/user/iso/UpdateIsoPermissionsCmd.java  |    4 +-
 .../api/command/user/job/ListAsyncJobsCmd.java     |    4 +-
 .../command/user/job/QueryAsyncJobResultCmd.java   |    4 +-
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |    4 +-
 .../loadbalancer/CreateLBStickinessPolicyCmd.java  |    4 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |    4 +-
 .../loadbalancer/DeleteLBStickinessPolicyCmd.java  |    4 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |   10 +---
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |    4 +-
 .../ListLoadBalancerRuleInstancesCmd.java          |    4 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |    4 +-
 .../RemoveFromLoadBalancerRuleCmd.java             |   10 +---
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |   10 +---
 .../user/nat/CreateIpForwardingRuleCmd.java        |    4 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java        |    4 +-
 .../api/command/user/nat/DisableStaticNatCmd.java  |    4 +-
 .../api/command/user/nat/EnableStaticNatCmd.java   |    4 +-
 .../command/user/nat/ListIpForwardingRulesCmd.java |    4 +-
 .../command/user/network/CreateNetworkACLCmd.java  |    4 +-
 .../api/command/user/network/CreateNetworkCmd.java |    4 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |    4 +-
 .../api/command/user/network/DeleteNetworkCmd.java |   10 +---
 .../command/user/network/ListNetworkACLsCmd.java   |    4 +-
 .../user/network/ListNetworkOfferingsCmd.java      |    4 +-
 .../api/command/user/network/ListNetworksCmd.java  |    4 +-
 .../command/user/network/RestartNetworkCmd.java    |   10 +---
 .../api/command/user/network/UpdateNetworkCmd.java |    4 +-
 .../user/offering/ListDiskOfferingsCmd.java        |    4 +-
 .../user/offering/ListServiceOfferingsCmd.java     |    4 +-
 .../command/user/project/ActivateProjectCmd.java   |   10 +---
 .../api/command/user/project/CreateProjectCmd.java |   10 +---
 .../api/command/user/project/DeleteProjectCmd.java |    4 +-
 .../user/project/DeleteProjectInvitationCmd.java   |    4 +-
 .../user/project/ListProjectInvitationsCmd.java    |    4 +-
 .../api/command/user/project/ListProjectsCmd.java  |    4 +-
 .../command/user/project/SuspendProjectCmd.java    |   10 +---
 .../api/command/user/project/UpdateProjectCmd.java |    4 +-
 .../user/project/UpdateProjectInvitationCmd.java   |   10 +---
 .../user/resource/GetCloudIdentifierCmd.java       |    4 +-
 .../command/user/resource/ListHypervisorsCmd.java  |    4 +-
 .../user/resource/ListResourceLimitsCmd.java       |    4 +-
 .../user/resource/UpdateResourceCountCmd.java      |    9 +--
 .../user/resource/UpdateResourceLimitCmd.java      |    9 +--
 .../AuthorizeSecurityGroupEgressCmd.java           |   11 ++---
 .../AuthorizeSecurityGroupIngressCmd.java          |    4 +-
 .../user/securitygroup/CreateSecurityGroupCmd.java |    4 +-
 .../user/securitygroup/DeleteSecurityGroupCmd.java |    4 +-
 .../user/securitygroup/ListSecurityGroupsCmd.java  |    4 +-
 .../RevokeSecurityGroupEgressCmd.java              |   10 +---
 .../RevokeSecurityGroupIngressCmd.java             |    4 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |   11 +---
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |    9 +--
 .../command/user/snapshot/DeleteSnapshotCmd.java   |   10 +---
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |    4 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |    4 +-
 .../command/user/snapshot/ListSnapshotsCmd.java    |    4 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |    4 +-
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |    4 +-
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |    4 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |    4 +-
 .../api/command/user/tag/CreateTagsCmd.java        |    4 +-
 .../api/command/user/tag/DeleteTagsCmd.java        |    4 +-
 .../api/command/user/tag/ListTagsCmd.java          |    4 +-
 .../api/command/user/template/CopyTemplateCmd.java |    4 +-
 .../command/user/template/CreateTemplateCmd.java   |   10 +---
 .../command/user/template/DeleteTemplateCmd.java   |   10 +---
 .../command/user/template/ExtractTemplateCmd.java  |   10 +---
 .../command/user/template/ListTemplatesCmd.java    |    4 +-
 .../command/user/template/RegisterTemplateCmd.java |    4 +-
 .../command/user/template/UpdateTemplateCmd.java   |    4 +-
 .../template/UpdateTemplatePermissionsCmd.java     |    4 +-
 .../api/command/user/vm/DeployVMCmd.java           |   11 +---
 .../api/command/user/vm/DestroyVMCmd.java          |   10 +---
 .../api/command/user/vm/GetVMPasswordCmd.java      |    4 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |    4 +-
 .../api/command/user/vm/RebootVMCmd.java           |    4 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java    |    4 +-
 .../api/command/user/vm/RestoreVMCmd.java          |    4 +-
 .../cloudstack/api/command/user/vm/StartVMCmd.java |   10 +---
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |   10 +---
 .../api/command/user/vm/UpdateVMCmd.java           |    4 +-
 .../api/command/user/vm/UpgradeVMCmd.java          |    9 +--
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |    9 +--
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |    9 +--
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |    4 +-
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |    9 +--
 .../api/command/user/volume/AttachVolumeCmd.java   |    4 +-
 .../api/command/user/volume/CreateVolumeCmd.java   |    4 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    4 +-
 .../api/command/user/volume/DetachVolumeCmd.java   |   10 +---
 .../api/command/user/volume/ExtractVolumeCmd.java  |    4 +-
 .../api/command/user/volume/ListVolumesCmd.java    |    9 +---
 .../api/command/user/volume/MigrateVolumeCmd.java  |    4 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |   10 +---
 .../api/command/user/vpc/CreateStaticRouteCmd.java |    4 +-
 .../api/command/user/vpc/CreateVPCCmd.java         |    4 +-
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |   10 +---
 .../api/command/user/vpc/DeleteVPCCmd.java         |   10 +---
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |    4 +-
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |    4 +-
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |    4 +-
 .../api/command/user/vpc/ListVPCsCmd.java          |    4 +-
 .../api/command/user/vpc/RestartVPCCmd.java        |   10 +---
 .../api/command/user/vpc/UpdateVPCCmd.java         |    4 +-
 .../api/command/user/vpn/AddVpnUserCmd.java        |    4 +-
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |   11 +---
 .../command/user/vpn/CreateVpnConnectionCmd.java   |   11 +---
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |    4 +-
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |    4 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |    4 +-
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |   10 +---
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |   10 +---
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |   10 +---
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |    4 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java    |    4 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |    4 +-
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |    4 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java      |    4 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |    4 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java    |   10 +---
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |   10 +---
 .../api/command/user/zone/ListZonesByCmd.java      |    4 +-
 .../cloud/api/commands/netapp/AssociateLunCmd.java |    4 +-
 .../cloud/api/commands/netapp/CreateLunCmd.java    |    4 +-
 .../commands/netapp/CreateVolumeOnFilerCmd.java    |    4 +-
 .../api/commands/netapp/CreateVolumePoolCmd.java   |    4 +-
 .../api/commands/netapp/DeleteVolumePoolCmd.java   |    4 +-
 .../cloud/api/commands/netapp/DestroyLunCmd.java   |    4 +-
 .../commands/netapp/DestroyVolumeOnFilerCmd.java   |    9 +--
 .../api/commands/netapp/DissociateLunCmd.java      |    9 +--
 .../com/cloud/api/commands/netapp/ListLunsCmd.java |    4 +-
 .../api/commands/netapp/ListVolumePoolsCmd.java    |    4 +-
 .../api/commands/netapp/ListVolumesOnFilerCmd.java |    9 +--
 .../api/commands/netapp/ModifyVolumePoolCmd.java   |    4 +-
 .../com/cloud/api/commands/ConfigureSimulator.java |    4 +-
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |    4 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java      |    4 +-
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   11 +---
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |    4 +-
 .../api/commands/AddExternalLoadBalancerCmd.java   |    5 +-
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |   11 +---
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |   12 +----
 .../commands/DeleteExternalLoadBalancerCmd.java    |   11 +---
 .../api/commands/DeleteF5LoadBalancerCmd.java      |    4 +-
 .../api/commands/ListExternalLoadBalancersCmd.java |   10 +---
 .../commands/ListF5LoadBalancerNetworksCmd.java    |    4 +-
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |   12 +----
 .../cloud/api/commands/AddExternalFirewallCmd.java |    4 +-
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |    4 +-
 .../api/commands/ConfigureSrxFirewallCmd.java      |    5 +-
 .../api/commands/DeleteExternalFirewallCmd.java    |    4 +-
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |    4 +-
 .../api/commands/ListExternalFirewallsCmd.java     |    4 +-
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   12 +----
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |   12 +----
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   12 +----
 .../ConfigureNetscalerLoadBalancerCmd.java         |   12 +----
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |    4 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java      |    4 +-
 .../commands/ListNetscalerLoadBalancersCmd.java    |    4 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |   11 +---
 .../api/commands/DeleteNiciraNvpDeviceCmd.java     |    4 +-
 .../commands/ListNiciraNvpDeviceNetworksCmd.java   |    4 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java      |   12 +----
 .../cloud/api/commands/AddTrafficMonitorCmd.java   |    9 +--
 .../api/commands/DeleteTrafficMonitorCmd.java      |    4 +-
 .../api/commands/GenerateUsageRecordsCmd.java      |    9 +--
 .../com/cloud/api/commands/GetUsageRecordsCmd.java |    4 +-
 .../cloud/api/commands/ListTrafficMonitorsCmd.java |    4 +-
 .../com/cloud/api/commands/ListUsageTypesCmd.java  |    4 +-
 server/src/com/cloud/api/doc/ApiXmlDocWriter.java  |   14 ++----
 341 files changed, 830 insertions(+), 1272 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/com/cloud/api/commands/AddS3Cmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/AddS3Cmd.java b/api/src/com/cloud/api/commands/AddS3Cmd.java
index 8ef6c98..ec5534a 100644
--- a/api/src/com/cloud/api/commands/AddS3Cmd.java
+++ b/api/src/com/cloud/api/commands/AddS3Cmd.java
@@ -32,7 +32,7 @@ import static org.apache.cloudstack.api.BaseCmd.CommandType.BOOLEAN;
 import static com.cloud.user.Account.ACCOUNT_ID_SYSTEM;
 
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import com.cloud.api.response.S3Response;
@@ -44,7 +44,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.storage.S3;
 
-@Implementation(description = "Adds S3", responseObject = S3Response.class, since = "4.0.0")
+@APICommand(description = "Adds S3", responseObject = S3Response.class, since = "4.0.0")
 public final class AddS3Cmd extends BaseCmd {
 
     private static String COMMAND_NAME = "adds3response";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java b/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java
index 92dc5a6..92c7ac5 100644
--- a/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java
+++ b/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java
@@ -16,17 +16,13 @@
 // under the License.
 package com.cloud.api.commands;
 
+import org.apache.cloudstack.api.*;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
 import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCreateCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.NetworkResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
@@ -35,7 +31,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.network.Network;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Creates a private network", responseObject=NetworkResponse.class)
+@APICommand(description="Creates a private network", responseObject=NetworkResponse.class)
 public class CreatePrivateNetworkCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreatePrivateNetworkCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java
index ef9be6b..17bafb1 100644
--- a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java
+++ b/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java
@@ -16,20 +16,16 @@
 // under the License.
 package com.cloud.api.commands;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Destroys console proxy", responseObject=SuccessResponse.class)
+@APICommand(description="Destroys console proxy", responseObject=SuccessResponse.class)
 public class DestroyConsoleProxyCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DestroyConsoleProxyCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
index 7fb6e06..41f28f9 100644
--- a/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
+++ b/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
@@ -19,15 +19,15 @@ package com.cloud.api.commands;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.SnapshotScheduleResponse;
 import com.cloud.storage.snapshot.SnapshotSchedule;
 
-@Implementation(description="Lists recurring snapshot schedule", responseObject=SnapshotScheduleResponse.class)
+@APICommand(description="Lists recurring snapshot schedule", responseObject=SnapshotScheduleResponse.class)
 public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
     private static final String s_name = "listrecurringsnapshotscheduleresponse";
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/com/cloud/api/commands/ListS3sCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListS3sCmd.java b/api/src/com/cloud/api/commands/ListS3sCmd.java
index 86c8c53..714ad8e 100644
--- a/api/src/com/cloud/api/commands/ListS3sCmd.java
+++ b/api/src/com/cloud/api/commands/ListS3sCmd.java
@@ -24,8 +24,8 @@ import static org.apache.cloudstack.api.BaseCmd.CommandType.LONG;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ListResponse;
@@ -37,7 +37,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.storage.S3;
 
-@Implementation(description = "Lists S3s", responseObject = S3Response.class, since = "4.0.0")
+@APICommand(description = "Lists S3s", responseObject = S3Response.class, since = "4.0.0")
 public final class ListS3sCmd extends BaseListCmd {
 
     private static final String COMMAND_NAME = "lists3sresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java b/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java
index 10eeea2..54bbace 100644
--- a/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java
@@ -18,18 +18,18 @@ package com.cloud.api.commands;
 
 import java.util.List;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="List template visibility and all accounts that have permissions to view this template.", responseObject=TemplatePermissionsResponse.class)
+@APICommand(description="List template visibility and all accounts that have permissions to view this template.", responseObject=TemplatePermissionsResponse.class)
 public class ListTemplateOrIsoPermissionsCmd extends BaseCmd {
     public Logger s_logger = getLogger();
     protected String s_name = "listtemplatepermissionsresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/APICommand.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/APICommand.java b/api/src/org/apache/cloudstack/api/APICommand.java
new file mode 100644
index 0000000..7c185b1
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/APICommand.java
@@ -0,0 +1,37 @@
+// 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 org.apache.cloudstack.api;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ TYPE })
+public @interface APICommand {
+    Class<? extends BaseResponse> responseObject();
+
+    String description() default "";
+
+    String usage() default "";
+
+    boolean includeInApiDoc() default true;
+
+    String since() default "";
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/Implementation.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/Implementation.java b/api/src/org/apache/cloudstack/api/Implementation.java
deleted file mode 100644
index b1c1b77..0000000
--- a/api/src/org/apache/cloudstack/api/Implementation.java
+++ /dev/null
@@ -1,37 +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 org.apache.cloudstack.api;
-
-import static java.lang.annotation.ElementType.TYPE;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ TYPE })
-public @interface Implementation {
-    Class<? extends BaseResponse> responseObject();
-
-    String description() default "";
-
-    String usage() default "";
-
-    boolean includeInApiDoc() default true;
-
-    String since() default "";
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 27292ac..45fed67 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
@@ -19,13 +19,10 @@ package org.apache.cloudstack.api.command.admin.account;
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.UserResponse;
@@ -33,7 +30,7 @@ import com.cloud.user.Account;
 import com.cloud.user.UserAccount;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Creates an account", responseObject=UserResponse.class)
+@APICommand(description="Creates an account", responseObject=UserResponse.class)
 public class CreateAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 d1f39bb..faa01f1 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
@@ -16,14 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.account;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.async.AsyncJob;
@@ -32,7 +28,7 @@ import com.cloud.user.Account;
 import com.cloud.user.User;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Deletes a account, and all users associated with this account", responseObject=SuccessResponse.class)
+@APICommand(description="Deletes a account, and all users associated with this account", responseObject=SuccessResponse.class)
 public class DeleteAccountCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAccountCmd.class.getName());
     private static final String s_name = "deleteaccountresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 9e266b4..ffde50a 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
@@ -16,14 +16,10 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.account;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 
@@ -34,7 +30,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Disables an account", responseObject=AccountResponse.class)
+@APICommand(description="Disables an account", responseObject=AccountResponse.class)
 public class DisableAccountCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName());
     private static final String s_name = "disableaccountresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 35476a3..dba2007 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
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
@@ -28,7 +28,7 @@ import org.apache.cloudstack.api.response.DomainResponse;
 
 import com.cloud.user.Account;
 
-@Implementation(description="Enables an account", responseObject=AccountResponse.class)
+@APICommand(description="Enables an account", responseObject=AccountResponse.class)
 public class EnableAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName());
     private static final String s_name = "enableaccountresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 c5e7871..8ff9dd4 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
@@ -20,14 +20,14 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 
 import com.cloud.user.Account;
 
-@Implementation(description="Locks an account", responseObject=AccountResponse.class)
+@APICommand(description="Locks an account", responseObject=AccountResponse.class)
 public class LockAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 e9bf76d..f8e41f7 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
@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
@@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.DomainResponse;
 
 import com.cloud.user.Account;
 
-@Implementation(description="Updates account information for the authenticated user", responseObject=AccountResponse.class)
+@APICommand(description="Updates account information for the authenticated user", responseObject=AccountResponse.class)
 public class UpdateAccountCmd extends BaseCmd{
     public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName());
     private static final String s_name = "updateaccountresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 c68ed9f..4fb69a8 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
@@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.CounterResponse;
@@ -31,7 +31,7 @@ import com.cloud.event.EventTypes;
 import com.cloud.network.as.Counter;
 import com.cloud.user.Account;
 
-@Implementation(description = "Adds metric counter", responseObject = CounterResponse.class)
+@APICommand(description = "Adds metric counter", responseObject = CounterResponse.class)
 public class CreateCounterCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateCounterCmd.class.getName());
     private static final String s_name = "counterresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 0cde5cd..836d18c 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
@@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.CounterResponse;
@@ -32,7 +32,7 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.user.Account;
 
-@Implementation(description = "Deletes a counter", responseObject = SuccessResponse.class)
+@APICommand(description = "Deletes a counter", responseObject = SuccessResponse.class)
 public class DeleteCounterCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteCounterCmd.class.getName());
     private static final String s_name = "deletecounterresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 d9564de..543ee29 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,13 +20,10 @@ package org.apache.cloudstack.api.command.admin.cluster;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
@@ -37,7 +34,7 @@ import com.cloud.exception.ResourceInUseException;
 import com.cloud.org.Cluster;
 import com.cloud.user.Account;
 
-@Implementation(description="Adds a new cluster", responseObject=ClusterResponse.class)
+@APICommand(description="Adds a new cluster", responseObject=ClusterResponse.class)
 public class AddClusterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 23a80fa..1f90696 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
@@ -20,14 +20,14 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 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 com.cloud.user.Account;
 
-@Implementation(description="Deletes a cluster.", responseObject=SuccessResponse.class)
+@APICommand(description="Deletes a cluster.", responseObject=SuccessResponse.class)
 public class DeleteClusterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteClusterCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 4ff55ac..4830f6f 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
@@ -25,7 +25,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ListResponse;
@@ -34,7 +34,7 @@ import org.apache.cloudstack.api.response.ZoneResponse;
 import com.cloud.org.Cluster;
 import com.cloud.utils.Pair;
 
-@Implementation(description="Lists clusters.", responseObject=ClusterResponse.class)
+@APICommand(description="Lists clusters.", responseObject=ClusterResponse.class)
 public class ListClustersCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 fe1800a..59403cd 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
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ClusterResponse;
@@ -28,7 +28,7 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.org.Cluster;
 import com.cloud.user.Account;
 
-@Implementation(description="Updates an existing cluster", responseObject=ClusterResponse.class)
+@APICommand(description="Updates an existing cluster", responseObject=ClusterResponse.class)
 public class UpdateClusterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/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 c7ef773..590a6fb 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,18 +19,18 @@ package org.apache.cloudstack.api.command.admin.config;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.configuration.Configuration;
 import com.cloud.utils.Pair;
 
-@Implementation(description = "Lists all configurations.", responseObject = ConfigurationResponse.class)
+@APICommand(description = "Lists all configurations.", responseObject = ConfigurationResponse.class)
 public class ListCfgsByCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListCfgsByCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
index 9d8e59f..5884274 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
@@ -19,11 +19,11 @@ package org.apache.cloudstack.api.command.admin.config;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
 import org.apache.cloudstack.api.response.ListResponse;
@@ -31,7 +31,7 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.utils.Pair;
 
-@Implementation(description="Lists all hypervisor capabilities.", responseObject=HypervisorCapabilitiesResponse.class, since="3.0.0")
+@APICommand(description="Lists all hypervisor capabilities.", responseObject=HypervisorCapabilitiesResponse.class, since="3.0.0")
 public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index ced4b79..5cf4246 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -20,14 +20,14 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import com.cloud.configuration.Configuration;
 import com.cloud.user.Account;
 
-@Implementation(description="Updates a configuration.", responseObject=ConfigurationResponse.class)
+@APICommand(description="Updates a configuration.", responseObject=ConfigurationResponse.class)
 public class UpdateCfgCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateCfgCmd.class.getName());
     private static final String s_name = "updateconfigurationresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
index 4fc9a83..cc380dd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
@@ -28,7 +28,7 @@ import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.user.Account;
 
-@Implementation(description="Updates a hypervisor capabilities.", responseObject=ServiceOfferingResponse.class, since="3.0.0")
+@APICommand(description="Updates a hypervisor capabilities.", responseObject=ServiceOfferingResponse.class, since="3.0.0")
 public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName());
     private static final String s_name = "updatehypervisorcapabilitiesresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
index 269df58..6ae3161 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
@@ -16,19 +16,16 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.domain;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.DomainResponse;
 import com.cloud.domain.Domain;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Creates a domain", responseObject=DomainResponse.class)
+@APICommand(description="Creates a domain", responseObject=DomainResponse.class)
 public class CreateDomainCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateDomainCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
index dc5ae7a..d63475a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
@@ -16,22 +16,18 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.domain;
 
+import org.apache.cloudstack.api.*;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.domain.Domain;
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Deletes a specified domain", responseObject=SuccessResponse.class)
+@APICommand(description="Deletes a specified domain", responseObject=SuccessResponse.class)
 public class DeleteDomainCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteDomainCmd.class.getName());
     private static final String s_name = "deletedomainresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
index 166a09f..7c4b022 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
@@ -23,14 +23,14 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.domain.Domain;
 import com.cloud.utils.Pair;
 
-@Implementation(description="Lists all children domains belonging to a specified domain", responseObject=DomainResponse.class)
+@APICommand(description="Lists all children domains belonging to a specified domain", responseObject=DomainResponse.class)
 public class ListDomainChildrenCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListDomainChildrenCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
index 0d4c57d..4e0ac9c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
@@ -23,14 +23,14 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import com.cloud.domain.Domain;
 import com.cloud.utils.Pair;
 
-@Implementation(description="Lists domains and provides detailed information for listed domains", responseObject=DomainResponse.class)
+@APICommand(description="Lists domains and provides detailed information for listed domains", responseObject=DomainResponse.class)
 public class ListDomainsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListDomainsCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
index fa15f47..86a160f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
@@ -16,19 +16,16 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.domain;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.DomainResponse;
 import com.cloud.domain.Domain;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Updates a domain with a new name", responseObject=DomainResponse.class)
+@APICommand(description="Updates a domain with a new name", responseObject=DomainResponse.class)
 public class UpdateDomainCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateDomainCmd.class.getName());
     private static final String s_name = "updatedomainresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
index 76832e0..c0d774a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ClusterResponse;
@@ -35,7 +35,7 @@ import com.cloud.exception.DiscoveryException;
 import com.cloud.host.Host;
 import com.cloud.user.Account;
 
-@Implementation(description="Adds a new host.", responseObject=HostResponse.class)
+@APICommand(description="Adds a new host.", responseObject=HostResponse.class)
 public class AddHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
index 01ca392..faa214d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
@@ -18,20 +18,17 @@ package org.apache.cloudstack.api.command.admin.host;
 
 import java.util.List;
 
+import org.apache.cloudstack.api.*;
 import org.apache.log4j.Logger;
 
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.host.Host;
 import com.cloud.user.Account;
 
-@Implementation(description="Adds secondary storage.", responseObject=HostResponse.class)
+@APICommand(description="Adds secondary storage.", responseObject=HostResponse.class)
 public class AddSecondaryStorageCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddSecondaryStorageCmd.class.getName());
     private static final String s_name = "addsecondarystorageresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
index 35b7789..3c5d5aa 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -31,7 +31,7 @@ import com.cloud.host.Host;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Cancels host maintenance.", responseObject=HostResponse.class)
+@APICommand(description="Cancels host maintenance.", responseObject=HostResponse.class)
 public class CancelMaintenanceCmd extends BaseAsyncCmd  {
     public static final Logger s_logger = Logger.getLogger(CancelMaintenanceCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
index c11bbcf..609b493 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
@@ -21,13 +21,13 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.user.Account;
 
-@Implementation(description = "Deletes a host.", responseObject = SuccessResponse.class)
+@APICommand(description = "Deletes a host.", responseObject = SuccessResponse.class)
 public class DeleteHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
index 881b1f2..ec20ee6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -20,15 +20,14 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ClusterResponse;
-import org.apache.cloudstack.api.response.DomainRouterResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.PodResponse;
@@ -39,7 +38,7 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.host.Host;
 import com.cloud.utils.Pair;
 
-@Implementation(description="Lists hosts.", responseObject=HostResponse.class)
+@APICommand(description="Lists hosts.", responseObject=HostResponse.class)
 public class ListHostsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListHostsCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
index 6eacba5..a6ff9db 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -31,7 +31,7 @@ import com.cloud.host.Host;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Prepares a host for maintenance.", responseObject=HostResponse.class)
+@APICommand(description="Prepares a host for maintenance.", responseObject=HostResponse.class)
 public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(PrepareForMaintenanceCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
index 1cabc20..e232b1d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -31,7 +31,7 @@ import com.cloud.host.Host;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Reconnects a host.", responseObject=HostResponse.class)
+@APICommand(description="Reconnects a host.", responseObject=HostResponse.class)
 public class ReconnectHostCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index 9de6107..e729d7d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
@@ -30,7 +30,7 @@ import org.apache.cloudstack.api.response.HostResponse;
 import com.cloud.host.Host;
 import com.cloud.user.Account;
 
-@Implementation(description="Updates a host.", responseObject=HostResponse.class)
+@APICommand(description="Updates a host.", responseObject=HostResponse.class)
 public class UpdateHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateHostCmd.class.getName());
     private static final String s_name = "updatehostresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
index e0f2f5d..6a02c3e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
@@ -20,14 +20,14 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import com.cloud.user.Account;
 
-@Implementation(description = "Update password of a host/pool on management server.", responseObject = SuccessResponse.class)
+@APICommand(description = "Update password of a host/pool on management server.", responseObject = SuccessResponse.class)
 public class UpdateHostPasswordCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateHostPasswordCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
index d5e0d2f..4862df0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.LDAPConfigResponse;
@@ -33,7 +33,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 
-@Implementation(description="Configure the LDAP context for this site.", responseObject=LDAPConfigResponse.class, since="3.0.0")
+@APICommand(description="Configure the LDAP context for this site.", responseObject=LDAPConfigResponse.class, since="3.0.0")
 public class LDAPConfigCmd extends BaseCmd  {
     public static final Logger s_logger = Logger.getLogger(LDAPConfigCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java
index 666e154..f7fb2b8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java
@@ -17,15 +17,15 @@
 package org.apache.cloudstack.api.command.admin.ldap;
 
 
+import org.apache.cloudstack.api.APICommand;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.response.LDAPConfigResponse;
 import org.apache.cloudstack.api.response.LDAPRemoveResponse;
 import com.cloud.user.Account;
 
-@Implementation(description="Remove the LDAP context for this site.", responseObject=LDAPConfigResponse.class, since="3.0.1")
+@APICommand(description="Remove the LDAP context for this site.", responseObject=LDAPConfigResponse.class, since="3.0.1")
 public class LDAPRemoveCmd extends BaseCmd  {
     public static final Logger s_logger = Logger.getLogger(LDAPRemoveCmd.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
index 111cd8d..39efc64 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
@@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import com.cloud.exception.ConcurrentOperationException;
@@ -37,7 +37,7 @@ import org.apache.cloudstack.api.response.NetworkDeviceResponse;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@Implementation(description="Adds a network device of one of the following types: ExternalDhcp, ExternalFirewall, ExternalLoadBalancer, PxeServer", responseObject = NetworkDeviceResponse.class)
+@APICommand(description="Adds a network device of one of the following types: ExternalDhcp, ExternalFirewall, ExternalLoadBalancer, PxeServer", responseObject = NetworkDeviceResponse.class)
 public class AddNetworkDeviceCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class);
     private static final String s_name = "addnetworkdeviceresponse";

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a7fe583/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
index d73be64..acff41e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
@@ -23,7 +23,7 @@ import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
@@ -35,7 +35,7 @@ import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
 
-@Implementation(description="Adds a network serviceProvider to a physical network", responseObject=ProviderResponse.class, since="3.0.0")
+@APICommand(description="Adds a network serviceProvider to a physical network", responseObject=ProviderResponse.class, since="3.0.0")
 public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName());