etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved VOs into the schema

This commit is contained in:
Alex Huang 2013-05-14 13:06:48 -07:00
parent 3dd26e85d3
commit 2fa361209e
55 changed files with 149 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
View File

@ -19,8 +19,6 @@
package org.apache.cloudstack.engine.datacenter.entity.api;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Produces;
@ -30,14 +28,14 @@ import com.cloud.utils.fsm.StateMachine2;
import com.cloud.utils.fsm.StateObject;
/**
* This interface specifies the states and operations all physical
* and virtual resources in the data center must implement.
* This interface specifies the states and operations all physical
* and virtual resources in the data center must implement.
*/
@Produces({"application/json", "application/xml"})
public interface DataCenterResourceEntity extends CloudStackEntity, StateObject<DataCenterResourceEntity.State> {
/**
* This is the state machine for how CloudStack should interact with
* This is the state machine for how CloudStack should interact with
*
*/
public enum State {
@ -66,12 +64,15 @@ public interface DataCenterResourceEntity extends CloudStackEntity, StateObject<
s_fsm.addTransition(Deactivated, Event.ActivatedRequest, Enabled);
}
public static StateMachine2<State, Event, DataCenterResourceEntity> getStateMachine() {
return s_fsm;
}
}
/**
* Prepare the resource to take new on new demands.
*/
@POST
@POST
boolean enable();
/**

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
View File

@ -16,7 +16,7 @@
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.VMEntityVO;
import com.cloud.deploy.DeploymentPlan;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;

8
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
View File

@ -24,10 +24,10 @@ import java.util.UUID;
import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMEntityDao;
import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
import org.apache.cloudstack.engine.cloud.entity.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.dao.VMEntityDao;
import org.apache.cloudstack.engine.cloud.entity.dao.VMReservationDao;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.springframework.stereotype.Component;

3
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
View File

@ -23,7 +23,8 @@ import java.util.Map;
import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.VMEntityVO;
import org.springframework.stereotype.Component;
import com.cloud.deploy.DeploymentPlan;

5
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java → engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ClusterEntityImpl.java
View File

@ -15,15 +15,16 @@
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api;
package org.apache.cloudstack.engine.datacenter.entity;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.cloudstack.engine.datacenter.entity.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Cluster.ClusterType;
import com.cloud.org.Grouping.AllocationState;

11
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java → engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManager.java
View File

@ -14,14 +14,15 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api;
package org.apache.cloudstack.engine.datacenter.entity;
import org.apache.cloudstack.engine.datacenter.entity.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import com.cloud.utils.fsm.NoTransitionException;

25
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java → engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManagerImpl.java
View File

@ -14,28 +14,26 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api;
package org.apache.cloudstack.engine.datacenter.entity;
import javax.inject.Inject;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineHostPodDao;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.utils.fsm.StateMachine2;
@Component
public class DataCenterResourceManagerImpl implements DataCenterResourceManager {
@Inject
@ -51,7 +49,7 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager
EngineHostDao _hostDao;
protected StateMachine2<State, Event, DataCenterResourceEntity> _stateMachine = DataCenterResourceEntity.State.s_fsm;
protected StateMachine2<State, Event, DataCenterResourceEntity> _stateMachine = DataCenterResourceEntity.State.getStateMachine();
@Override
public EngineDataCenterVO loadDataCenter(String dataCenterId) {
@ -125,5 +123,4 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager
public void saveHost(EngineHostVO hostVO) {
_hostDao.persist(hostVO);
}
}

5
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java → engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/HostEntityImpl.java
View File

@ -14,15 +14,16 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api;
package org.apache.cloudstack.engine.datacenter.entity;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostVO;
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.fsm.NoTransitionException;

5
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java → engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/PodEntityImpl.java
View File

@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.cloudstack.engine.datacenter.entity.api;
package org.apache.cloudstack.engine.datacenter.entity;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import com.cloud.org.Cluster;
import com.cloud.org.Grouping.AllocationState;

8
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java → engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ZoneEntityImpl.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.cloudstack.engine.datacenter.entity.api;
package org.apache.cloudstack.engine.datacenter.entity;
import java.lang.reflect.Method;
import java.util.ArrayList;
@ -25,8 +25,12 @@ import java.util.List;
import java.util.Map;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import org.apache.cloudstack.engine.datacenter.entity.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import com.cloud.utils.fsm.FiniteStateObject;
import com.cloud.utils.fsm.NoTransitionException;

10
engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
View File

@ -25,16 +25,16 @@ import java.util.Map;
import javax.inject.Inject;
import javax.ws.rs.Path;
import org.apache.cloudstack.engine.datacenter.entity.ClusterEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.DataCenterResourceManager;
import org.apache.cloudstack.engine.datacenter.entity.HostEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.PodEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.ZoneEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager;
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;

9
engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java
View File

@ -17,10 +17,11 @@
package org.apache.cloudstack.engine.provisioning.test;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineHostPodDao;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean;

16
engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java
View File

@ -26,15 +26,19 @@ import java.util.UUID;
import javax.inject.Inject;
import org.apache.cloudstack.engine.datacenter.entity.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostVO;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineClusterDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineDataCenterDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineHostDao;
import org.apache.cloudstack.engine.datacenter.entity.dao.EngineHostPodDao;
import org.apache.cloudstack.engine.service.api.ProvisioningService;
import org.junit.Before;
import org.junit.Test;
@ -43,10 +47,6 @@ import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import com.cloud.dc.DataCenter.NetworkType;

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMComputeTagVO.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.engine.cloud.entity.api.db;
package org.apache.cloudstack.engine.cloud.entity;
import javax.persistence.Column;
import javax.persistence.Entity;

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMEntityVO.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.engine.cloud.entity.api.db;
package org.apache.cloudstack.engine.cloud.entity;
import java.util.Date;
import java.util.List;

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMNetworkMapVO.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.engine.cloud.entity.api.db;
package org.apache.cloudstack.engine.cloud.entity;
import javax.persistence.Column;

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMReservationVO.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.engine.cloud.entity.api.db;
package org.apache.cloudstack.engine.cloud.entity;
import java.util.Date;
import java.util.Map;

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMRootDiskTagVO.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.engine.cloud.entity.api.db;
package org.apache.cloudstack.engine.cloud.entity;
import javax.persistence.Column;
import javax.persistence.Entity;

2
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VolumeReservationVO.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.engine.cloud.entity.api.db;
package org.apache.cloudstack.engine.cloud.entity;
import java.util.Date;
import java.util.Map;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDao.java
View File

@ -14,11 +14,11 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.List;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO;
import org.apache.cloudstack.engine.cloud.entity.VMComputeTagVO;
import com.cloud.utils.db.GenericDao;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDaoImpl.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.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.ArrayList;
@ -24,7 +24,7 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO;
import org.apache.cloudstack.engine.cloud.entity.VMComputeTagVO;
import org.springframework.stereotype.Component;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDao.java
View File

@ -14,13 +14,13 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.VMEntityVO;
import com.cloud.utils.Pair;
import com.cloud.utils.db.GenericDao;

7
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDaoImpl.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.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.sql.PreparedStatement;
@ -26,8 +26,9 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.VMReservationVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDao.java
View File

@ -14,11 +14,11 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.List;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO;
import org.apache.cloudstack.engine.cloud.entity.VMNetworkMapVO;
import com.cloud.utils.db.GenericDao;

6
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDaoImpl.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.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.ArrayList;
@ -22,7 +22,9 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO;
import org.apache.cloudstack.engine.cloud.entity.VMNetworkMapVO;
import org.springframework.stereotype.Component;
import com.cloud.network.dao.NetworkDao;
import com.cloud.utils.db.GenericDaoBase;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDao.java
View File

@ -14,12 +14,12 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.Map;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VMReservationVO;
import com.cloud.utils.db.GenericDao;

9
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDaoImpl.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.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.HashMap;
@ -25,9 +25,10 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VMEntityVO;
import org.apache.cloudstack.engine.cloud.entity.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VolumeReservationVO;
import org.springframework.stereotype.Component;
import com.cloud.host.dao.HostTagsDaoImpl;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDao.java
View File

@ -14,11 +14,11 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.List;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO;
import org.apache.cloudstack.engine.cloud.entity.VMRootDiskTagVO;
import com.cloud.utils.db.GenericDao;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDaoImpl.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.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.ArrayList;
@ -24,7 +24,7 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO;
import org.apache.cloudstack.engine.cloud.entity.VMRootDiskTagVO;
import org.springframework.stereotype.Component;

4
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDao.java
View File

@ -14,11 +14,11 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.List;
import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VolumeReservationVO;
import com.cloud.utils.db.GenericDao;

7
engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDaoImpl.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.engine.cloud.entity.api.db.dao;
package org.apache.cloudstack.engine.cloud.entity.dao;
import java.util.List;
@ -23,8 +23,9 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VMReservationVO;
import org.apache.cloudstack.engine.cloud.entity.VolumeReservationVO;
import org.springframework.stereotype.Component;
import com.cloud.host.dao.HostTagsDaoImpl;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/ClusterDetailsVO.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import javax.persistence.Column;
import javax.persistence.Entity;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/DcDetailVO.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import javax.persistence.Column;
import javax.persistence.Entity;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineCluster.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.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import com.cloud.org.Cluster;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineClusterVO.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import java.util.Date;
import java.util.UUID;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenter.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.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import com.cloud.dc.DataCenter;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenterVO.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import java.util.Date;
import java.util.Map;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHost.java
View File

@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import com.cloud.host.Host;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostPodVO.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import java.util.Date;
import java.util.UUID;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostVO.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.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import java.util.Date;
import java.util.List;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EnginePod.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.engine.datacenter.entity.api.db;
package org.apache.cloudstack.engine.datacenter.entity;
import com.cloud.dc.Pod;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDao.java
View File

@ -10,11 +10,11 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.Map;
import org.apache.cloudstack.engine.datacenter.entity.api.db.DcDetailVO;
import org.apache.cloudstack.engine.datacenter.entity.DcDetailVO;
import com.cloud.utils.db.GenericDao;

5
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDaoImpl.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.HashMap;
import java.util.List;
@ -18,7 +18,8 @@ import java.util.Map;
import javax.ejb.Local;
import org.apache.cloudstack.engine.datacenter.entity.api.db.DcDetailVO;
import org.apache.cloudstack.engine.datacenter.entity.DcDetailVO;
import org.springframework.stereotype.Component;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDao.java
View File

@ -10,13 +10,13 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.List;
import java.util.Map;
import org.apache.cloudstack.engine.datacenter.entity.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;

6
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDaoImpl.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -24,11 +24,11 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.datacenter.entity.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDao.java
View File

@ -10,12 +10,12 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.List;
import org.apache.cloudstack.engine.datacenter.entity.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import com.cloud.utils.db.GenericDao;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDaoImpl.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.Date;
import java.util.List;
@ -22,10 +22,10 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.TableGenerator;
import org.apache.cloudstack.engine.datacenter.entity.EngineDataCenterVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDao.java
View File

@ -14,13 +14,13 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.Date;
import java.util.List;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import com.cloud.host.Host;
import com.cloud.host.Host.Type;

24
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDaoImpl.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.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -29,9 +29,9 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.persistence.TableGenerator;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -737,16 +737,16 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
}
@Override
public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> lockRows(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
public List<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> lockRows(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> sc,
Filter filter, boolean exclusive) {
// TODO Auto-generated method stub
return null;
}
@Override
public org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO lockOneRandomRow(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
public org.apache.cloudstack.engine.datacenter.entity.EngineHostVO lockOneRandomRow(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> sc,
boolean exclusive) {
// TODO Auto-generated method stub
return null;
@ -754,24 +754,24 @@ public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implem
@Override
public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> search(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
public List<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> search(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> sc,
Filter filter) {
// TODO Auto-generated method stub
return null;
}
@Override
public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> search(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
public List<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> search(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> sc,
Filter filter, boolean enable_query_cache) {
// TODO Auto-generated method stub
return null;
}
@Override
public List<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> searchIncludingRemoved(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO> sc,
public List<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> searchIncludingRemoved(
SearchCriteria<org.apache.cloudstack.engine.datacenter.entity.EngineHostVO> sc,
Filter filter, Boolean lock, boolean cache) {
// TODO Auto-generated method stub
return null;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDao.java
View File

@ -10,13 +10,13 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.HashMap;
import java.util.List;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import com.cloud.utils.db.GenericDao;

4
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDaoImpl.java
View File

@ -10,7 +10,7 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -22,10 +22,10 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.cloudstack.engine.datacenter.entity.EngineHostPodVO;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDao.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.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.Map;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDaoImpl.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.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.HashMap;
import java.util.List;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDao.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.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.List;
import com.cloud.host.HostTagVO;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java → engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDaoImpl.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.engine.datacenter.entity.api.db.dao;
package org.apache.cloudstack.engine.datacenter.entity.dao;
import java.util.ArrayList;
import java.util.List;