Updated Branches: refs/heads/api_limit dcbb0ecef -> 0b69d9449
Merge branch 'master' into api_limit Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0b69d944 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0b69d944 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0b69d944 Branch: refs/heads/api_limit Commit: 0b69d9449a687f696c54e9dfa33288aa08c722d1 Parents: 8d98daa 1b8e172 Author: Min Chen <[email protected]> Authored: Thu Jan 10 09:51:41 2013 -0800 Committer: Min Chen <[email protected]> Committed: Thu Jan 10 09:51:41 2013 -0800 ---------------------------------------------------------------------- .../api/commands/CreatePrivateNetworkCmd.java | 7 +- .../cloud/api/commands/DestroyConsoleProxyCmd.java | 2 +- .../commands/ListRecurringSnapshotScheduleCmd.java | 2 +- api/src/com/cloud/exception/CloudException.java | 2 - .../apache/cloudstack/api/BaseAsyncCreateCmd.java | 15 ++- api/src/org/apache/cloudstack/api/BaseCmd.java | 2 - .../org/apache/cloudstack/api/BaseResponse.java | 6 +- .../command/admin/autoscale/CreateCounterCmd.java | 6 +- .../network/AddNetworkServiceProviderCmd.java | 5 +- .../admin/network/CreatePhysicalNetworkCmd.java | 5 +- .../router/CreateVirtualRouterElementCmd.java | 6 +- .../api/command/admin/usage/AddTrafficTypeCmd.java | 5 +- .../command/admin/vpc/CreatePrivateGatewayCmd.java | 5 +- .../command/admin/vpc/CreateVPCOfferingCmd.java | 5 +- .../command/user/address/AssociateIPAddrCmd.java | 4 +- .../user/autoscale/CreateAutoScalePolicyCmd.java | 5 +- .../user/autoscale/CreateAutoScaleVmGroupCmd.java | 5 +- .../autoscale/CreateAutoScaleVmProfileCmd.java | 6 +- .../command/user/autoscale/CreateConditionCmd.java | 6 +- .../user/firewall/CreateFirewallRuleCmd.java | 4 +- .../user/firewall/CreatePortForwardingRuleCmd.java | 4 +- .../loadbalancer/CreateLBStickinessPolicyCmd.java | 5 +- .../loadbalancer/CreateLoadBalancerRuleCmd.java | 4 +- .../user/nat/CreateIpForwardingRuleCmd.java | 4 +- .../command/user/network/CreateNetworkACLCmd.java | 5 +- .../api/command/user/project/CreateProjectCmd.java | 4 +- .../command/user/snapshot/CreateSnapshotCmd.java | 4 +- .../command/user/template/CreateTemplateCmd.java | 7 +- .../api/command/user/vm/DeployVMCmd.java | 4 +- .../api/command/user/volume/CreateVolumeCmd.java | 4 +- .../api/command/user/vpc/CreateStaticRouteCmd.java | 5 +- .../api/command/user/vpc/CreateVPCCmd.java | 6 +- .../api/command/user/vpn/AddVpnUserCmd.java | 4 +- .../command/user/vpn/CreateRemoteAccessVpnCmd.java | 9 +- .../command/user/vpn/CreateVpnConnectionCmd.java | 4 +- .../user/vpn/CreateVpnCustomerGatewayCmd.java | 3 - .../api/command/user/vpn/CreateVpnGatewayCmd.java | 4 - .../command/user/vpn/DeleteVpnConnectionCmd.java | 3 - .../user/vpn/DeleteVpnCustomerGatewayCmd.java | 3 - .../api/command/user/vpn/DeleteVpnGatewayCmd.java | 3 - .../command/user/vpn/ResetVpnConnectionCmd.java | 3 - .../user/vpn/UpdateVpnCustomerGatewayCmd.java | 6 +- .../cloudstack/api/response/CapacityResponse.java | 1 - .../cloudstack/api/response/CreateCmdResponse.java | 18 +--- .../api/response/ResourceCountResponse.java | 1 - .../apache/cloudstack/api/response/S3Response.java | 9 +- .../cloudstack/discovery/ApiDiscoveryService.java | 6 +- client/tomcatconf/components.xml.in | 3 - .../discovery/ApiDiscoveryServiceImpl.java | 51 +++------- server/src/com/cloud/api/ApiGsonHelper.java | 2 - .../src/com/cloud/api/ApiResponseGsonHelper.java | 4 +- server/src/com/cloud/api/ApiResponseHelper.java | 2 +- server/src/com/cloud/api/ApiServer.java | 40 ++++---- server/src/com/cloud/api/IdentityTypeAdapter.java | 80 --------------- .../cloud/api/response/ApiResponseSerializer.java | 46 ++------- .../router/VirtualNetworkApplianceManagerImpl.java | 37 ++++--- .../com/cloud/server/ConfigurationServerImpl.java | 2 - .../src/com/cloud/servlet/CloudStartupServlet.java | 2 +- test/integration/smoke/test_iso.py | 8 +- utils/src/com/cloud/utils/IdentityProxy.java | 60 ----------- .../utils/exception/RuntimeCloudException.java | 1 - 61 files changed, 140 insertions(+), 434 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0b69d944/api/src/org/apache/cloudstack/api/BaseCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0b69d944/server/src/com/cloud/api/ApiServer.java ---------------------------------------------------------------------- diff --cc server/src/com/cloud/api/ApiServer.java index 2bb7fdd,17a2b29..bf21664 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@@ -150,12 -145,8 +147,10 @@@ public class ApiServer implements HttpR @Inject private DomainManager _domainMgr = null; @Inject private AsyncJobManager _asyncMgr = null; + @Inject(adapter = APILimitChecker.class) + protected Adapters<APILimitChecker> _apiLimitCheckers; @Inject(adapter = APIAccessChecker.class) protected Adapters<APIAccessChecker> _apiAccessCheckers; - @Inject(adapter = ApiDiscoveryService.class) - protected Adapters<ApiDiscoveryService> _apiDiscoveryServices; private Account _systemAccount = null; private User _systemUser = null;
