diff --git a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java similarity index 99% rename from server/src/com/cloud/server/api/response/ExternalFirewallResponse.java rename to api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java index c6c7c4b7172..30fe86f88da 100644 --- a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.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.server.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; diff --git a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java similarity index 98% rename from server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java rename to api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java index ccda410eeb8..6f80c1084f8 100644 --- a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.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.server.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; diff --git a/server/src/com/cloud/server/api/response/TrafficMonitorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java similarity index 98% rename from server/src/com/cloud/server/api/response/TrafficMonitorResponse.java rename to api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java index 95ab4453a26..366e5d631b0 100644 --- a/server/src/com/cloud/server/api/response/TrafficMonitorResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.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.server.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; diff --git a/server/src/com/cloud/server/api/response/UsageRecordResponse.java b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java similarity index 99% rename from server/src/com/cloud/server/api/response/UsageRecordResponse.java rename to api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java index 29c81a79dc6..9679575c046 100644 --- a/server/src/com/cloud/server/api/response/UsageRecordResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.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.server.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; diff --git a/server/src/com/cloud/server/api/response/UsageTypeResponse.java b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java similarity index 97% rename from server/src/com/cloud/server/api/response/UsageTypeResponse.java rename to api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java index ea834fc3b57..b21d26f3774 100644 --- a/server/src/com/cloud/server/api/response/UsageTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.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.server.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java index 5b931e1b4e7..69a21fc184c 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.ServerApiException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.network.element.F5ExternalLoadBalancerElementService; -import com.cloud.server.api.response.ExternalLoadBalancerResponse; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java index 029c502f079..3ee8d4865a5 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; import com.cloud.host.Host; import com.cloud.network.element.F5ExternalLoadBalancerElementService; -import com.cloud.server.api.response.ExternalLoadBalancerResponse; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; @APICommand(name = "listExternalLoadBalancers", description="Lists F5 external load balancer appliances added in a zone.", responseObject = HostResponse.class) @Deprecated // API supported for backward compatibility. diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index ef6d197f63e..735814c0fbc 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -80,7 +80,7 @@ import com.cloud.network.rules.LbStickinessMethod; import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType; import com.cloud.offering.NetworkOffering; import com.cloud.resource.ServerResource; -import com.cloud.server.api.response.ExternalLoadBalancerResponse; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.Inject; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java index 24c76753b47..951bc3cc3b1 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java @@ -30,7 +30,7 @@ import com.cloud.api.response.F5LoadBalancerResponse; import com.cloud.host.Host; import com.cloud.network.ExternalLoadBalancerDeviceVO; import com.cloud.network.Network; -import com.cloud.server.api.response.ExternalLoadBalancerResponse; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.utils.component.PluggableService; @SuppressWarnings("deprecation") diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java index c2f8f03354a..cda27fb8960 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.ServerApiException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.network.element.JuniperSRXFirewallElementService; -import com.cloud.server.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.user.Account; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java index f2c33bcb88e..65aa92ba818 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.response.ListResponse; import com.cloud.host.Host; import com.cloud.network.element.JuniperSRXFirewallElementService; -import com.cloud.server.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; @APICommand(name = "listExternalFirewalls", description="List external firewall appliances.", responseObject = ExternalFirewallResponse.class) public class ListExternalFirewallsCmd extends BaseListCmd { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java index 9853f7ec69e..0479648c099 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java @@ -82,7 +82,7 @@ import com.cloud.network.rules.StaticNat; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.resource.ServerResource; -import com.cloud.server.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.Inject; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java index 6d07d303128..d5f53843ca1 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java @@ -30,7 +30,7 @@ import com.cloud.api.response.SrxFirewallResponse; import com.cloud.host.Host; import com.cloud.network.ExternalFirewallDeviceVO; import com.cloud.network.Network; -import com.cloud.server.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.utils.component.PluggableService; public interface JuniperSRXFirewallElementService extends PluggableService { diff --git a/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java b/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java index f20e5b98432..98e893ef47d 100644 --- a/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java +++ b/server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java @@ -25,8 +25,8 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.network.NetworkUsageManager; import com.cloud.server.ManagementService; -import com.cloud.server.api.response.ExternalFirewallResponse; -import com.cloud.server.api.response.TrafficMonitorResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.TrafficMonitorResponse; import com.cloud.user.Account; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; @@ -92,8 +92,8 @@ public class AddTrafficMonitorCmd extends BaseCmd { try { ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); NetworkUsageManager networkUsageMgr = locator.getManager(NetworkUsageManager.class); - Host trafficMoinitor = networkUsageMgr.addTrafficMonitor(this); - TrafficMonitorResponse response = networkUsageMgr.getApiResponse(trafficMoinitor); + Host trafficMonitor = networkUsageMgr.addTrafficMonitor(this); + TrafficMonitorResponse response = networkUsageMgr.getApiResponse(trafficMonitor); response.setObjectName("trafficmonitor"); response.setResponseName(getCommandName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java index 434d81c4808..60afbd0a8f4 100644 --- a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java +++ b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java @@ -39,7 +39,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import com.cloud.projects.Project; import com.cloud.server.ManagementServerExt; -import com.cloud.server.api.response.UsageRecordResponse; +import org.apache.cloudstack.api.response.UsageRecordResponse; import com.cloud.storage.VMTemplateVO; import com.cloud.usage.UsageTypes; import com.cloud.usage.UsageVO; diff --git a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java index aba9ffd83a6..ccbcec95e5e 100644 --- a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java +++ b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java @@ -31,8 +31,8 @@ import org.apache.cloudstack.api.response.ListResponse; import com.cloud.host.Host; import com.cloud.network.NetworkUsageManager; import com.cloud.server.ManagementService; -import com.cloud.server.api.response.ExternalFirewallResponse; -import com.cloud.server.api.response.TrafficMonitorResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.TrafficMonitorResponse; import com.cloud.utils.component.ComponentLocator; @APICommand(name = "listTrafficMonitors", description="List traffic monitor Hosts.", responseObject = ExternalFirewallResponse.class) diff --git a/server/src/com/cloud/api/commands/ListUsageTypesCmd.java b/server/src/com/cloud/api/commands/ListUsageTypesCmd.java index 97526fb4067..dfa5dc1bb20 100644 --- a/server/src/com/cloud/api/commands/ListUsageTypesCmd.java +++ b/server/src/com/cloud/api/commands/ListUsageTypesCmd.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.response.ListResponse; import com.cloud.server.ManagementServerExt; -import com.cloud.server.api.response.UsageTypeResponse; +import org.apache.cloudstack.api.response.UsageTypeResponse; import com.cloud.user.Account; @APICommand(name = "listUsageTypes", description = "List Usage Types", responseObject = UsageTypeResponse.class) diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java index 1ad5fdc7565..42cdc745605 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java @@ -50,7 +50,6 @@ import com.cloud.dc.Vlan; import com.cloud.dc.VlanVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.VlanDao; -import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InsufficientNetworkCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -75,10 +74,8 @@ import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.dao.VpnUserDao; import com.cloud.network.rules.FirewallRule; -import com.cloud.network.rules.FirewallRule.Purpose; import com.cloud.network.rules.PortForwardingRule; import com.cloud.network.rules.StaticNat; -import com.cloud.network.rules.StaticNatRule; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingDao; @@ -87,8 +84,7 @@ import com.cloud.resource.ResourceState; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; -import com.cloud.resource.ResourceStateAdapter.DeleteHostAnswer; -import com.cloud.server.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.dao.AccountDao; @@ -100,7 +96,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; import com.cloud.utils.net.UrlUtil; import com.cloud.vm.Nic.ReservationStrategy; diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index d9c4fd1edb6..4f9404e5e78 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -36,10 +36,8 @@ import com.cloud.agent.api.routing.DestroyLoadBalancerApplianceCommand; import com.cloud.agent.api.routing.IpAssocCommand; import com.cloud.agent.api.routing.LoadBalancerConfigCommand; import com.cloud.agent.api.routing.NetworkElementCommand; -import com.cloud.agent.api.routing.SetStaticNatRulesCommand; import com.cloud.agent.api.to.IpAddressTO; import com.cloud.agent.api.to.LoadBalancerTO; -import com.cloud.agent.api.to.StaticNatRuleTO; import org.apache.cloudstack.api.ApiConstants; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; @@ -48,7 +46,6 @@ import com.cloud.dc.DataCenterIpAddressVO; import com.cloud.dc.DataCenterVO; import com.cloud.dc.Pod; import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; @@ -89,11 +86,8 @@ import com.cloud.network.resource.CreateLoadBalancerApplianceAnswer; import com.cloud.network.resource.DestroyLoadBalancerApplianceAnswer; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.Purpose; -import com.cloud.network.rules.FirewallRuleVO; import com.cloud.network.rules.StaticNat; import com.cloud.network.rules.StaticNatImpl; -import com.cloud.network.rules.StaticNatRule; -import com.cloud.network.rules.StaticNatRuleImpl; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; @@ -102,7 +96,7 @@ import com.cloud.resource.ResourceState; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; -import com.cloud.server.api.response.ExternalLoadBalancerResponse; +import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.dao.AccountDao; diff --git a/server/src/com/cloud/network/NetworkUsageManager.java b/server/src/com/cloud/network/NetworkUsageManager.java index 10264b8ba42..3d4577b8199 100644 --- a/server/src/com/cloud/network/NetworkUsageManager.java +++ b/server/src/com/cloud/network/NetworkUsageManager.java @@ -23,7 +23,7 @@ import com.cloud.api.commands.DeleteTrafficMonitorCmd; import com.cloud.api.commands.ListTrafficMonitorsCmd; import com.cloud.host.Host; import com.cloud.host.HostVO; -import com.cloud.server.api.response.TrafficMonitorResponse; +import org.apache.cloudstack.api.response.TrafficMonitorResponse; import com.cloud.utils.component.Manager; public interface NetworkUsageManager extends Manager { diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java index b30f1858922..2485a8c966d 100755 --- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java +++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java @@ -67,7 +67,7 @@ import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; -import com.cloud.server.api.response.TrafficMonitorResponse; +import org.apache.cloudstack.api.response.TrafficMonitorResponse; import com.cloud.usage.UsageIPAddressVO; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; diff --git a/server/src/com/cloud/server/ManagementServerExt.java b/server/src/com/cloud/server/ManagementServerExt.java index 0804e4fe05f..4e506a3bc4a 100644 --- a/server/src/com/cloud/server/ManagementServerExt.java +++ b/server/src/com/cloud/server/ManagementServerExt.java @@ -21,7 +21,7 @@ import java.util.TimeZone; import com.cloud.api.commands.GenerateUsageRecordsCmd; import com.cloud.api.commands.GetUsageRecordsCmd; -import com.cloud.server.api.response.UsageTypeResponse; +import org.apache.cloudstack.api.response.UsageTypeResponse; import com.cloud.usage.UsageVO; public interface ManagementServerExt extends ManagementServer { /** diff --git a/server/src/com/cloud/server/ManagementServerExtImpl.java b/server/src/com/cloud/server/ManagementServerExtImpl.java index fbd517dc5c2..b7320276341 100644 --- a/server/src/com/cloud/server/ManagementServerExtImpl.java +++ b/server/src/com/cloud/server/ManagementServerExtImpl.java @@ -29,7 +29,7 @@ import com.cloud.domain.dao.DomainDao; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.projects.Project; -import com.cloud.server.api.response.UsageTypeResponse; +import org.apache.cloudstack.api.response.UsageTypeResponse; import com.cloud.usage.UsageJobVO; import com.cloud.usage.UsageTypes; import com.cloud.usage.UsageVO; diff --git a/server/src/com/cloud/usage/UsageTypes.java b/server/src/com/cloud/usage/UsageTypes.java index af77c323451..e5a48d5c143 100644 --- a/server/src/com/cloud/usage/UsageTypes.java +++ b/server/src/com/cloud/usage/UsageTypes.java @@ -19,7 +19,7 @@ package com.cloud.usage; import java.util.ArrayList; import java.util.List; -import com.cloud.server.api.response.UsageTypeResponse; +import org.apache.cloudstack.api.response.UsageTypeResponse; public class UsageTypes { public static final int RUNNING_VM = 1;