From 5d998a616bdce93375794439e4a8171bf946b414 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Dec 2012 11:32:10 -0800 Subject: [PATCH] api_refactor: move forgotten apis, uncomment and fix mappings Signed-off-by: Rohit Yadav --- .../api/admin/account/command}/LockAccountCmd.java | 2 +- .../cloudstack/api/admin/user/command}/LockUserCmd.java | 2 +- .../user/firewall/command}/UpdatePortForwardingRuleCmd.java | 2 +- client/tomcatconf/commands.properties.in | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/account/command}/LockAccountCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/user/command}/LockUserCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/firewall/command}/UpdatePortForwardingRuleCmd.java (98%) diff --git a/api/src/com/cloud/api/commands/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/account/command/LockAccountCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/LockAccountCmd.java rename to api/src/org/apache/cloudstack/api/admin/account/command/LockAccountCmd.java index 9cb075f9efb..a8a06f089df 100644 --- a/api/src/com/cloud/api/commands/LockAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/account/command/LockAccountCmd.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/LockUserCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/LockUserCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/LockUserCmd.java rename to api/src/org/apache/cloudstack/api/admin/user/command/LockUserCmd.java index 7ce4efe650c..8215fd5734e 100644 --- a/api/src/com/cloud/api/commands/LockUserCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/user/command/LockUserCmd.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/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/user/firewall/command/UpdatePortForwardingRuleCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java rename to api/src/org/apache/cloudstack/api/user/firewall/command/UpdatePortForwardingRuleCmd.java index 52668973cb3..654e6af6259 100644 --- a/api/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/user/firewall/command/UpdatePortForwardingRuleCmd.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.user.firewall.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index db5a13438d6..d03937fa979 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -24,7 +24,7 @@ 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 +lockAccount=org.apache.cloudstack.api.admin.account.command.LockAccountCmd;7 listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15 markDefaultZoneForAccount=org.apache.cloudstack.api.admin.zone.command.MarkDefaultZoneForAccountCmd;1 @@ -33,7 +33,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 +lockUser=org.apache.cloudstack.api.admin.user.command.LockUserCmd;7 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 @@ -132,7 +132,7 @@ listPublicIpAddresses=org.apache.cloudstack.api.user.address.command.ListPublicI listPortForwardingRules=org.apache.cloudstack.api.user.firewall.command.ListPortForwardingRulesCmd;15 createPortForwardingRule=org.apache.cloudstack.api.user.firewall.command.CreatePortForwardingRuleCmd;15 deletePortForwardingRule=org.apache.cloudstack.api.user.firewall.command.DeletePortForwardingRuleCmd;15 -#### updatePortForwardingRule=com.cloud.api.commands.UpdatePortForwardingRuleCmd;15 +updatePortForwardingRule=org.apache.cloudstack.api.user.firewall.command.UpdatePortForwardingRuleCmd;15 #### NAT commands enableStaticNat=org.apache.cloudstack.api.user.nat.command.EnableStaticNatCmd;15