From 1b1d91dc4fa6fd0f4fca5b0b74ab9bfce7127a49 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Dec 2012 10:25:20 -0800 Subject: [PATCH] api_refactor: move admin level account apis to admin pkg Signed-off-by: Rohit Yadav --- api/src/com/cloud/user/AccountService.java | 2 +- .../api/admin/account/command}/CreateAccountCmd.java | 2 +- .../api/admin/account/command}/DeleteAccountCmd.java | 2 +- .../api/admin/account/command}/UpdateAccountCmd.java | 2 +- client/tomcatconf/commands.properties.in | 6 +++--- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- server/test/com/cloud/user/MockAccountManagerImpl.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/account/command}/CreateAccountCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/account/command}/DeleteAccountCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/account/command}/UpdateAccountCmd.java (98%) diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java index 8be8e9ec325..fe68c3e3729 100755 --- a/api/src/com/cloud/user/AccountService.java +++ b/api/src/com/cloud/user/AccountService.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; import com.cloud.api.commands.RegisterCmd; -import com.cloud.api.commands.UpdateAccountCmd; +import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/api/commands/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/account/command/CreateAccountCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateAccountCmd.java rename to api/src/org/apache/cloudstack/api/admin/account/command/CreateAccountCmd.java index d1d3996ddfa..99ff4c253b3 100755 --- a/api/src/com/cloud/api/commands/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/account/command/CreateAccountCmd.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.account.command; import java.util.Collection; import java.util.Map; diff --git a/api/src/com/cloud/api/commands/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/account/command/DeleteAccountCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteAccountCmd.java rename to api/src/org/apache/cloudstack/api/admin/account/command/DeleteAccountCmd.java index 47c3475fbc2..d00d7c8f920 100755 --- a/api/src/com/cloud/api/commands/DeleteAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/account/command/DeleteAccountCmd.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.account.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/account/command/UpdateAccountCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateAccountCmd.java rename to api/src/org/apache/cloudstack/api/admin/account/command/UpdateAccountCmd.java index ad4cbd5f527..9bb095e012b 100755 --- a/api/src/com/cloud/api/commands/UpdateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/account/command/UpdateAccountCmd.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.account.command; import java.util.Collection; import java.util.Map; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index a0ac700dca4..decd4752883 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -19,9 +19,9 @@ ### Please standardize naming conventions to camel-case (even for acronyms). ### Account commands -createAccount=com.cloud.api.commands.CreateAccountCmd;3 -deleteAccount=com.cloud.api.commands.DeleteAccountCmd;3 -updateAccount=com.cloud.api.commands.UpdateAccountCmd;3 +createAccount=org.apache.cloudstack.api.admin.account.command.CreateAccountCmd;3 +deleteAccount=org.apache.cloudstack.api.admin.account.command.DeleteAccountCmd;3 +updateAccount=org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;3 disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd;7 enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7 ###lockAccount=com.cloud.api.commands.LockAccountCmd;7 diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 59b7584d6b8..ae5be6662e6 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -48,7 +48,7 @@ import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; import com.cloud.api.commands.RegisterCmd; -import com.cloud.api.commands.UpdateAccountCmd; +import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd; import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index 3b1adc6609a..484a2cc57ae 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -28,7 +28,7 @@ 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.RegisterCmd; -import com.cloud.api.commands.UpdateAccountCmd; +import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd; import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; import com.cloud.api.view.vo.ControlledViewEntity; import com.cloud.domain.Domain;