apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2815: org.apache.cloudstack.dedicated.* to org.apache.cloudstack

Browse Source 
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 <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-06-03 16:19:44 +05:30
parent a9bfee1e22
commit 2f51bcf2a8
20 changed files with 64 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/tomcatconf/componentContext.xml.in
View File

@ -272,7 +272,7 @@
<!--
Dedicated Resources components
-->
<bean id="DedicatedResourceManagerImpl" class="org.apache.cloudstack.dedicated.manager.DedicatedResourceManagerImpl"/>
<bean id="DedicatedResourceManagerImpl" class="org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl"/>
<bean id="ExplicitDedicationProcessor" class="org.apache.cloudstack.affinity.ExplicitDedicationProcessor">
<property name="name" value="ExplicitDedicationProcessor"/>
<property name="type" value="ExplicitDedication"/>

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateClusterCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateHostCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicatePodCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateZoneCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedClustersCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedHostsCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedPodsCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java
View File

@ -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;

6
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedZonesCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java
View File

@ -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;

4
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedClusterCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java
View File

@ -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;

4
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedHostCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java
View File

@ -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;

4
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedPodCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java
View File

@ -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;

4
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedZoneCmd.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java
View File

@ -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;

2
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateClusterResponse.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateClusterResponse.java
View File

@ -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;

2
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateHostResponse.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateHostResponse.java
View File

@ -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;

2
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicatePodResponse.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicatePodResponse.java
View File

@ -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;

2
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/response/DedicateZoneResponse.java → plugins/dedicated-resources/src/org/apache/cloudstack/api/response/DedicateZoneResponse.java
View File

@ -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;

36
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/manager/DedicatedResourceManagerImpl.java → plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
View File

@ -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;

18
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/services/DedicatedService.java → plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedService.java
View File

@ -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;

9
plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
View File

@ -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;