From ceddaf122cdd857cd8269184dc0a478962095d35 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 5 Dec 2012 14:55:58 -0800 Subject: [PATCH] api_refactor: refactor user apis Signed-off-by: Rohit Yadav --- api/src/com/cloud/user/AccountService.java | 6 +++--- .../api/admin/user/command}/CreateUserCmd.java | 2 +- .../api/admin/user/command}/DeleteUserCmd.java | 2 +- .../api/admin/user/command}/DisableUserCmd.java | 2 +- .../api/admin/user/command}/EnableUserCmd.java | 2 +- .../api/admin/user/command}/GetUserCmd.java | 2 +- .../api/admin/user/command}/ListUsersCmd.java | 2 +- .../api/admin/user/command}/UpdateUserCmd.java | 2 +- client/tomcatconf/commands.properties.in | 14 +++++++------- server/src/com/cloud/user/AccountManagerImpl.java | 6 +++--- .../com/cloud/user/MockAccountManagerImpl.java | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/CreateUserCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/DeleteUserCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/DisableUserCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/EnableUserCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/GetUserCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/ListUsersCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/UpdateUserCmd.java (98%) diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java index 001d498e2dc..8be8e9ec325 100755 --- a/api/src/com/cloud/user/AccountService.java +++ b/api/src/com/cloud/user/AccountService.java @@ -21,12 +21,12 @@ import java.util.Map; import com.cloud.acl.ControlledEntity; import com.cloud.acl.SecurityChecker.AccessType; -import com.cloud.api.commands.DeleteUserCmd; +import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; +import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; -import com.cloud.api.commands.ListUsersCmd; +import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; import com.cloud.api.commands.RegisterCmd; import com.cloud.api.commands.UpdateAccountCmd; -import com.cloud.api.commands.UpdateUserCmd; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/api/commands/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java index 95b11dc92c1..a4b3bcac45c 100644 --- a/api/src/com/cloud/api/commands/CreateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java index 0f913e8eb23..5bdbfe7754f 100644 --- a/api/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DisableUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java index c4997c2169b..37589915a2c 100644 --- a/api/src/com/cloud/api/commands/DisableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/EnableUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java index 6c445f789b2..92545fb68cb 100644 --- a/api/src/com/cloud/api/commands/EnableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/GetUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/GetUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java index 4628f1cd264..5cfc27ab499 100644 --- a/api/src/com/cloud/api/commands/GetUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListUsersCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java index 23054941d3e..6314e5e0d01 100644 --- a/api/src/com/cloud/api/commands/ListUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java index fbe062e1d00..c77db3320ef 100644 --- a/api/src/com/cloud/api/commands/UpdateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.user.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 3df1ca664db..98687108988 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -29,14 +29,14 @@ listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15 markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1 #### User commands -createUser=com.cloud.api.commands.CreateUserCmd;3 -deleteUser=com.cloud.api.commands.DeleteUserCmd;3 -updateUser=com.cloud.api.commands.UpdateUserCmd;3 -listUsers=com.cloud.api.commands.ListUsersCmd;7 +createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3 +deleteUser=org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;3 +updateUser=org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;3 +listUsers=org.apache.cloudstack.api.admin.user.command.ListUsersCmd;7 ####lockUser=com.cloud.api.commands.LockUserCmd;7 -disableUser=com.cloud.api.commands.DisableUserCmd;7 -enableUser=com.cloud.api.commands.EnableUserCmd;7 -getUser=com.cloud.api.commands.GetUserCmd;1 +disableUser=org.apache.cloudstack.api.admin.user.command.DisableUserCmd;7 +enableUser=org.apache.cloudstack.api.admin.user.command.EnableUserCmd;7 +getUser=org.apache.cloudstack.api.admin.user.command.GetUserCmd;1 #### Domain commands createDomain=com.cloud.api.commands.CreateDomainCmd;1 diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 5a1f8405d44..ab04a9c6191 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -36,6 +36,7 @@ import javax.crypto.spec.SecretKeySpec; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -43,12 +44,11 @@ import com.cloud.acl.ControlledEntity; import com.cloud.acl.SecurityChecker; import com.cloud.acl.SecurityChecker.AccessType; import com.cloud.api.ApiDBUtils; -import com.cloud.api.commands.DeleteUserCmd; +import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; -import com.cloud.api.commands.ListUsersCmd; import com.cloud.api.commands.RegisterCmd; import com.cloud.api.commands.UpdateAccountCmd; -import com.cloud.api.commands.UpdateUserCmd; +import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ResourceLimit; diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index d464fc85ca2..b8d9043e27f 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -24,12 +24,12 @@ import javax.naming.ConfigurationException; import com.cloud.acl.ControlledEntity; import com.cloud.acl.SecurityChecker.AccessType; -import com.cloud.api.commands.DeleteUserCmd; +import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; +import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; -import com.cloud.api.commands.ListUsersCmd; import com.cloud.api.commands.RegisterCmd; import com.cloud.api.commands.UpdateAccountCmd; -import com.cloud.api.commands.UpdateUserCmd; +import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.PermissionDeniedException;