From 2f51bcf2a89399f17fe73dc773100f7c1a8bfeb8 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 3 Jun 2013 16:19:44 +0530 Subject: [PATCH] CLOUDSTACK-2815: org.apache.cloudstack.dedicated.* to org.apache.cloudstack Moving the package one level up so API discovery can discovery APIs from org.apache.cloudstack.api.* This also keeps the plugin uniform with the other plugins which have their APIs in org.apache.cloudstack.api namespace. Signed-off-by: Prasanna Santhanam --- client/tomcatconf/componentContext.xml.in | 2 +- .../api/commands/DedicateClusterCmd.java | 6 ++-- .../api/commands/DedicateHostCmd.java | 6 ++-- .../api/commands/DedicatePodCmd.java | 6 ++-- .../api/commands/DedicateZoneCmd.java | 6 ++-- .../commands/ListDedicatedClustersCmd.java | 6 ++-- .../api/commands/ListDedicatedHostsCmd.java | 6 ++-- .../api/commands/ListDedicatedPodsCmd.java | 6 ++-- .../api/commands/ListDedicatedZonesCmd.java | 6 ++-- .../commands/ReleaseDedicatedClusterCmd.java | 4 +-- .../api/commands/ReleaseDedicatedHostCmd.java | 4 +-- .../api/commands/ReleaseDedicatedPodCmd.java | 4 +-- .../api/commands/ReleaseDedicatedZoneCmd.java | 4 +-- .../api/response/DedicateClusterResponse.java | 2 +- .../api/response/DedicateHostResponse.java | 2 +- .../api/response/DedicatePodResponse.java | 2 +- .../api/response/DedicateZoneResponse.java | 2 +- .../DedicatedResourceManagerImpl.java | 36 +++++++++---------- .../{services => }/DedicatedService.java | 18 +++++----- .../manager/DedicatedApiUnitTest.java | 9 +---- 20 files changed, 64 insertions(+), 73 deletions(-) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/DedicateClusterCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/DedicateHostCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/DedicatePodCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/DedicateZoneCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ListDedicatedClustersCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ListDedicatedHostsCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ListDedicatedPodsCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ListDedicatedZonesCmd.java (95%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ReleaseDedicatedClusterCmd.java (96%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ReleaseDedicatedHostCmd.java (96%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ReleaseDedicatedPodCmd.java (96%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/commands/ReleaseDedicatedZoneCmd.java (96%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/response/DedicateClusterResponse.java (97%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/response/DedicateHostResponse.java (97%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/response/DedicatePodResponse.java (97%) rename plugins/dedicated-resources/src/org/apache/cloudstack/{dedicated => }/api/response/DedicateZoneResponse.java (97%) rename plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/{manager => }/DedicatedResourceManagerImpl.java (96%) rename plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/{services => }/DedicatedService.java (77%) diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index fcbcc1bb50b..03e931a7374 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -272,7 +272,7 @@ - + diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateClusterCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java index 58e20dee025..91e4fcee3ad 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateClusterCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateClusterResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicateClusterResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateHostCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateHostCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java index f0269b11048..cb8eb45e0c4 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateHostCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateHostResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicateHostResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicatePodCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicatePodCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java index be5eac26feb..ed3c227e508 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicatePodCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.dedicated.api.response.DedicatePodResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicatePodResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateZoneCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateZoneCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java index 134fb972757..31c6025c305 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateZoneCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateZoneResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicateZoneResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResources; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedClustersCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedClustersCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java index c60c5240d9a..f3947876581 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedClustersCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateClusterResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicateClusterResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedHostsCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedHostsCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java index 2c1ad002e0d..736251b36d6 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedHostsCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateHostResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicateHostResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedPodsCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedPodsCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java index 31b1ecfbb51..da59edae8d3 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedPodsCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.PodResponse; -import org.apache.cloudstack.dedicated.api.response.DedicatePodResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicatePodResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedZonesCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java similarity index 95% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedZonesCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java index c88c42b82a6..a21f129f5be 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedZonesCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateZoneResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.response.DedicateZoneResponse; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.dc.DedicatedResourceVO; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java similarity index 96% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedClusterCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java index 6a317885f10..ba1c6aad7cc 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedClusterCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import javax.inject.Inject; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ClusterResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.event.EventTypes; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedHostCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java similarity index 96% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedHostCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java index 29cfdeb9ab5..a79c965926d 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedHostCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import javax.inject.Inject; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.HostResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.event.EventTypes; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedPodCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java similarity index 96% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedPodCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java index 51d3fe20477..d84ef66ef5a 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedPodCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import javax.inject.Inject; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.event.EventTypes; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedZoneCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java similarity index 96% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedZoneCmd.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java index 23f955711bf..c78a4961dc8 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedZoneCmd.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.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 org.apache.cloudstack.dedicated.api.commands; +package org.apache.cloudstack.api.commands; import javax.inject.Inject; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.dedicated.DedicatedService; import org.apache.log4j.Logger; import com.cloud.event.EventTypes; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateClusterResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java similarity index 97% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateClusterResponse.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java index faa362777f2..3c8dde3fd08 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateClusterResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.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 org.apache.cloudstack.dedicated.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.BaseResponse; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateHostResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java similarity index 97% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateHostResponse.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java index e48ee35610d..cea31fe392b 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateHostResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.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 org.apache.cloudstack.dedicated.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.BaseResponse; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicatePodResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java similarity index 97% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicatePodResponse.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java index fabaca166ea..4bcaa61c269 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicatePodResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.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 org.apache.cloudstack.dedicated.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateZoneResponse.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java similarity index 97% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateZoneResponse.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java index 06f4877d211..57497cd3484 100644 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateZoneResponse.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.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 org.apache.cloudstack.dedicated.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/manager/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java similarity index 96% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/manager/DedicatedResourceManagerImpl.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java index 51087e2f56a..ae25b02ec47 100755 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/manager/DedicatedResourceManagerImpl.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.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 org.apache.cloudstack.dedicated.manager; +package org.apache.cloudstack.dedicated; import java.util.ArrayList; import java.util.List; @@ -24,23 +24,22 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.dedicated.api.commands.DedicateClusterCmd; -import org.apache.cloudstack.dedicated.api.commands.DedicateHostCmd; -import org.apache.cloudstack.dedicated.api.commands.DedicatePodCmd; -import org.apache.cloudstack.dedicated.api.commands.DedicateZoneCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedClustersCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedHostsCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedPodsCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedZonesCmd; -import org.apache.cloudstack.dedicated.api.commands.ReleaseDedicatedClusterCmd; -import org.apache.cloudstack.dedicated.api.commands.ReleaseDedicatedHostCmd; -import org.apache.cloudstack.dedicated.api.commands.ReleaseDedicatedPodCmd; -import org.apache.cloudstack.dedicated.api.commands.ReleaseDedicatedZoneCmd; -import org.apache.cloudstack.dedicated.api.response.DedicateClusterResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateHostResponse; -import org.apache.cloudstack.dedicated.api.response.DedicatePodResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateZoneResponse; -import org.apache.cloudstack.dedicated.services.DedicatedService; +import org.apache.cloudstack.api.commands.DedicateClusterCmd; +import org.apache.cloudstack.api.commands.DedicateHostCmd; +import org.apache.cloudstack.api.commands.DedicatePodCmd; +import org.apache.cloudstack.api.commands.DedicateZoneCmd; +import org.apache.cloudstack.api.commands.ListDedicatedClustersCmd; +import org.apache.cloudstack.api.commands.ListDedicatedHostsCmd; +import org.apache.cloudstack.api.commands.ListDedicatedPodsCmd; +import org.apache.cloudstack.api.commands.ListDedicatedZonesCmd; +import org.apache.cloudstack.api.commands.ReleaseDedicatedClusterCmd; +import org.apache.cloudstack.api.commands.ReleaseDedicatedHostCmd; +import org.apache.cloudstack.api.commands.ReleaseDedicatedPodCmd; +import org.apache.cloudstack.api.commands.ReleaseDedicatedZoneCmd; +import org.apache.cloudstack.api.response.DedicateClusterResponse; +import org.apache.cloudstack.api.response.DedicateHostResponse; +import org.apache.cloudstack.api.response.DedicatePodResponse; +import org.apache.cloudstack.api.response.DedicateZoneResponse; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -51,7 +50,6 @@ import com.cloud.dc.DataCenterVO; import com.cloud.dc.DedicatedResourceVO; import com.cloud.dc.DedicatedResources; import com.cloud.dc.HostPodVO; -import com.cloud.dc.Pod; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DedicatedResourceDao; diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/services/DedicatedService.java b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java similarity index 77% rename from plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/services/DedicatedService.java rename to plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java index 360852ae8e6..81ababcf53b 100755 --- a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/services/DedicatedService.java +++ b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java @@ -14,18 +14,18 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.dedicated.services; +package org.apache.cloudstack.dedicated; import java.util.List; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedClustersCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedHostsCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedPodsCmd; -import org.apache.cloudstack.dedicated.api.commands.ListDedicatedZonesCmd; -import org.apache.cloudstack.dedicated.api.response.DedicateClusterResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateHostResponse; -import org.apache.cloudstack.dedicated.api.response.DedicatePodResponse; -import org.apache.cloudstack.dedicated.api.response.DedicateZoneResponse; +import org.apache.cloudstack.api.commands.ListDedicatedClustersCmd; +import org.apache.cloudstack.api.commands.ListDedicatedHostsCmd; +import org.apache.cloudstack.api.commands.ListDedicatedPodsCmd; +import org.apache.cloudstack.api.commands.ListDedicatedZonesCmd; +import org.apache.cloudstack.api.response.DedicateClusterResponse; +import org.apache.cloudstack.api.response.DedicateHostResponse; +import org.apache.cloudstack.api.response.DedicatePodResponse; +import org.apache.cloudstack.api.response.DedicateZoneResponse; import com.cloud.dc.DedicatedResourceVO; import com.cloud.dc.DedicatedResources; import com.cloud.utils.Pair; diff --git a/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java b/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java index 3cf51299b6e..58aae238d88 100644 --- a/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java +++ b/plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java @@ -22,13 +22,13 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import java.io.IOException; -import java.util.List; import javax.inject.Inject; import javax.naming.ConfigurationException; import junit.framework.Assert; +import org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl; import org.apache.cloudstack.test.utils.SpringUtils; import org.apache.log4j.Logger; import org.junit.Before; @@ -49,11 +49,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.dc.ClusterVO; -import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.dc.DataCenterVO; import com.cloud.dc.DedicatedResourceVO; -import com.cloud.dc.HostPodVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DedicatedResourceDao; @@ -61,9 +57,6 @@ import com.cloud.dc.dao.HostPodDao; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.host.Host; -import com.cloud.host.HostVO; -import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.user.Account; import com.cloud.user.AccountManager;