From e07106db0bada572912f6f114589d86a553199b0 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 5 Dec 2012 14:31:31 -0800 Subject: [PATCH] api_refactor: usage apis to admin.usage pkg Signed-off-by: Rohit Yadav --- api/src/com/cloud/network/NetworkService.java | 2 +- .../admin/usage/command}/ListTrafficTypeImplementorsCmd.java | 2 +- .../api/admin/usage/command}/UpdateTrafficTypeCmd.java | 2 +- client/tomcatconf/commands.properties.in | 4 ++-- server/src/com/cloud/network/NetworkManagerImpl.java | 2 +- server/test/com/cloud/network/MockNetworkManagerImpl.java | 2 +- server/test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/usage/command}/ListTrafficTypeImplementorsCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/usage/command}/UpdateTrafficTypeCmd.java (98%) diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java index b71b86703fb..b5ba1e3e84d 100755 --- a/api/src/com/cloud/network/NetworkService.java +++ b/api/src/com/cloud/network/NetworkService.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; -import com.cloud.api.commands.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; diff --git a/api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java rename to api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java index ed1ec439be7..1a7db85d562 100755 --- a/api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.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.usage.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java rename to api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java index 2a24372996e..cca4d3d0ba7 100644 --- a/api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.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.usage.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 4731bfc0031..3df1ca664db 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -360,8 +360,8 @@ updateNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.Upd addTrafficType=org.apache.cloudstack.api.admin.usage.command.AddTrafficTypeCmd;1 deleteTrafficType=org.apache.cloudstack.api.admin.usage.command.DeleteTrafficTypeCmd;1 listTrafficTypes=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypesCmd;1 -updateTrafficType=com.cloud.api.commands.UpdateTrafficTypeCmd;1 -listTrafficTypeImplementors=com.cloud.api.commands.ListTrafficTypeImplementorsCmd;1 +updateTrafficType=org.apache.cloudstack.api.admin.usage.command.UpdateTrafficTypeCmd;1 +listTrafficTypeImplementors=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;1 #### Storage Network commands createStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;1 diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index a4511414149..542efa7e7b6 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; import org.apache.log4j.Logger; @@ -58,7 +59,6 @@ import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.agent.api.to.NicTO; import com.cloud.alert.AlertManager; import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; -import com.cloud.api.commands.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java index fef1eb0faa0..99e491f60b3 100755 --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java @@ -25,9 +25,9 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; -import com.cloud.api.commands.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan; diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 344b59e3913..8a7866e88cb 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -25,12 +25,12 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity.ACLType; import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; -import com.cloud.api.commands.ListTrafficTypeImplementorsCmd; import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan;