Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a390b273 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a390b273 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a390b273 Branch: refs/heads/api_refactoring Commit: a390b273ae18331e43363af468de94be4c265a9c Parents: 3d34473 b16dde6 Author: Min Chen <[email protected]> Authored: Tue Dec 18 10:07:51 2012 -0800 Committer: Min Chen <[email protected]> Committed: Tue Dec 18 10:07:51 2012 -0800 ---------------------------------------------------------------------- api/src/com/cloud/dao/EntityManager.java | 2 +- .../cloudstack/api/BaseListDomainResourcesCmd.java | 7 +- .../api/BaseListProjectAndAccountResourcesCmd.java | 6 +- .../api/command/admin/user/CreateUserCmd.java | 6 +- .../api/command/admin/user/DeleteUserCmd.java | 4 +- .../api/command/admin/user/DisableUserCmd.java | 5 +- .../api/command/admin/user/EnableUserCmd.java | 5 +- .../api/command/admin/user/ListUsersCmd.java | 5 +- .../api/command/admin/user/LockUserCmd.java | 5 +- .../api/command/admin/user/RegisterCmd.java | 6 +- .../api/command/admin/user/UpdateUserCmd.java | 5 +- .../api/command/user/user/AddVpnUserCmd.java | 11 +- .../api/command/user/user/ListVpnUsersCmd.java | 5 +- .../api/command/user/user/RemoveVpnUserCmd.java | 12 +- .../cloudstack/api/response/ProjectResponse.java | 3 + .../api/response/ResourceLimitResponse.java | 3 + .../cloudstack/api/response/UserResponse.java | 7 +- .../cloudstack/api/response/VpnUsersResponse.java | 3 + server/src/com/cloud/api/ApiDispatcher.java | 142 ++++++++++----- server/src/com/cloud/dao/EntityManagerImpl.java | 5 +- utils/src/com/cloud/utils/db/GenericDao.java | 3 + utils/src/com/cloud/utils/db/GenericDaoBase.java | 8 + 22 files changed, 159 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a390b273/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a390b273/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a390b273/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java ----------------------------------------------------------------------
