diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java index 08175537ded..5ad4d0fa0bf 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java @@ -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 { /** - * 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 getStateMachine() { + return s_fsm; + } } /** * Prepare the resource to take new on new demands. */ - @POST + @POST boolean enable(); /** diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java index ca0a77742a9..92d4401a0ae 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java index 25e742301cf..2292facd023 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java index dd57f9a03f4..9dc0262143a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ClusterEntityImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ClusterEntityImpl.java index 46dd21d28eb..041fa12b93f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ClusterEntityImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManager.java similarity index 77% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManager.java index a5f6d5e8108..65f3c935ed3 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManager.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManagerImpl.java similarity index 80% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManagerImpl.java index c267e5515f1..dfbaed549ac 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/DataCenterResourceManagerImpl.java @@ -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 _stateMachine = DataCenterResourceEntity.State.s_fsm; + protected StateMachine2 _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); } - } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/HostEntityImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/HostEntityImpl.java index 17114e7ce07..dd8dcd30930 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/HostEntityImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/PodEntityImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/PodEntityImpl.java index 758a99751ad..696c3e0a5d8 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/PodEntityImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ZoneEntityImpl.java similarity index 92% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ZoneEntityImpl.java index e2548803d61..043b632e3d0 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/ZoneEntityImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java index 863c181a9a7..3c676ff2c36 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java @@ -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; diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java index 3b1721f37fb..f6e79886473 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java @@ -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; diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java index 0976f838b3b..53f8ffbbb0c 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMComputeTagVO.java similarity index 97% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMComputeTagVO.java index e4fc2283349..484035c1348 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMComputeTagVO.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.engine.cloud.entity.api.db; +package org.apache.cloudstack.engine.cloud.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMEntityVO.java similarity index 99% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMEntityVO.java index 4748215e3c6..8e090709bb8 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMEntityVO.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.engine.cloud.entity.api.db; +package org.apache.cloudstack.engine.cloud.entity; import java.util.Date; import java.util.List; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMNetworkMapVO.java similarity index 97% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMNetworkMapVO.java index f29b19f9fe3..12095dab31c 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMNetworkMapVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMNetworkMapVO.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.engine.cloud.entity.api.db; +package org.apache.cloudstack.engine.cloud.entity; import javax.persistence.Column; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMReservationVO.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMReservationVO.java index 5a69ec841cd..5c4b87024c1 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMReservationVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMReservationVO.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.engine.cloud.entity.api.db; +package org.apache.cloudstack.engine.cloud.entity; import java.util.Date; import java.util.Map; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMRootDiskTagVO.java similarity index 97% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMRootDiskTagVO.java index 3c09e930693..396aafb9b48 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VMRootDiskTagVO.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.engine.cloud.entity.api.db; +package org.apache.cloudstack.engine.cloud.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VolumeReservationVO.java similarity index 97% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VolumeReservationVO.java index f064623f887..ecb0e68d49b 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/VolumeReservationVO.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.engine.cloud.entity.api.db; +package org.apache.cloudstack.engine.cloud.entity; import java.util.Date; import java.util.Map; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDao.java similarity index 88% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDao.java index d8178d4a8f4..012316060e9 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDaoImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDaoImpl.java index 6f70b353176..95359265e3f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMComputeTagDaoImpl.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.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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDao.java similarity index 90% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDao.java index aa063dc0794..7f6b3c66799 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDaoImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDaoImpl.java index 3082d21c1ee..bf153bcbeec 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMEntityDaoImpl.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.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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDao.java similarity index 88% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDao.java index 59c41c298ac..102339f5993 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDaoImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDaoImpl.java index 0f2c4ccb77e..f5d70360ace 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMNetworkMapDaoImpl.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.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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDao.java similarity index 89% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDao.java index 721a8c48326..364d70c8ab9 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDaoImpl.java similarity index 92% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDaoImpl.java index 73b4dd2194c..d6723ed683a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMReservationDaoImpl.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.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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDao.java similarity index 88% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDao.java index dc00880d79d..44d9036a242 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDaoImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDaoImpl.java index be194bbfcaa..3f395abffbb 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VMRootDiskTagDaoImpl.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.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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDao.java similarity index 88% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDao.java index fd709b0db0a..80534d98ee8 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDaoImpl.java similarity index 91% rename from engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDaoImpl.java index 26bc65f35c1..689628e8cf0 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/dao/VolumeReservationDaoImpl.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.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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/ClusterDetailsVO.java similarity index 96% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/ClusterDetailsVO.java index d735c47dc18..720a3fc2c7e 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterDetailsVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/ClusterDetailsVO.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/DcDetailVO.java similarity index 96% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/DcDetailVO.java index ef59118ef81..c67c8eb95c7 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DcDetailVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/DcDetailVO.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineCluster.java similarity index 93% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineCluster.java index 98b7a991a3f..b95e13176ff 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineCluster.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.engine.datacenter.entity.api.db; +package org.apache.cloudstack.engine.datacenter.entity; import com.cloud.org.Cluster; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineClusterVO.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineClusterVO.java index 00344198d7a..c64fdf8eabe 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineClusterVO.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenter.java similarity index 93% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenter.java index 240dddf1529..027b0e6a4bd 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenter.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.engine.datacenter.entity.api.db; +package org.apache.cloudstack.engine.datacenter.entity; import com.cloud.dc.DataCenter; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenterVO.java similarity index 99% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenterVO.java index cdf08cc5b9c..08d3085eb22 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineDataCenterVO.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHost.java similarity index 93% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHost.java index 127c4457071..82ab1f57e36 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHost.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostPodVO.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostPodVO.java index 65b9db53e93..3b78b8590d6 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostPodVO.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostVO.java similarity index 99% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostVO.java index 4b4a5600380..a528e1fe5e3 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EngineHostVO.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.engine.datacenter.entity.api.db; +package org.apache.cloudstack.engine.datacenter.entity; import java.util.Date; import java.util.List; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EnginePod.java similarity index 93% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EnginePod.java index 2adbca36af5..59ade3efdaf 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/EnginePod.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.engine.datacenter.entity.api.db; +package org.apache.cloudstack.engine.datacenter.entity; import com.cloud.dc.Pod; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDao.java similarity index 88% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDao.java index ef1b3a0a57e..bcfbfc4cb88 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDaoImpl.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDaoImpl.java index 60eec4cf913..5b46e75999b 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/DcDetailsDaoImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDao.java similarity index 92% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDao.java index af1b1536e26..945298d6a2b 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDaoImpl.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDaoImpl.java index 1f0bd4d84af..fb86e448eea 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineClusterDaoImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDao.java similarity index 93% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDao.java index 83060cfee2f..5e99c8814c9 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDaoImpl.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDaoImpl.java index f99bc6c0c09..16f4d76243d 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineDataCenterDaoImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDao.java similarity index 95% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDao.java index 3a71fe2cf9f..c7ec8b9c30a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDaoImpl.java similarity index 97% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDaoImpl.java index 3c34023c01c..99ecd1f49d8 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostDaoImpl.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.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 implem } @Override - public List lockRows( - SearchCriteria sc, + public List lockRows( + SearchCriteria 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 sc, + public org.apache.cloudstack.engine.datacenter.entity.EngineHostVO lockOneRandomRow( + SearchCriteria sc, boolean exclusive) { // TODO Auto-generated method stub return null; @@ -754,24 +754,24 @@ public class EngineHostDaoImpl extends GenericDaoBase implem @Override - public List search( - SearchCriteria sc, + public List search( + SearchCriteria sc, Filter filter) { // TODO Auto-generated method stub return null; } @Override - public List search( - SearchCriteria sc, + public List search( + SearchCriteria sc, Filter filter, boolean enable_query_cache) { // TODO Auto-generated method stub return null; } @Override - public List searchIncludingRemoved( - SearchCriteria sc, + public List searchIncludingRemoved( + SearchCriteria sc, Filter filter, Boolean lock, boolean cache) { // TODO Auto-generated method stub return null; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDao.java similarity index 90% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDao.java index 451723e5370..8fecf3b4f16 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDao.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDaoImpl.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDaoImpl.java index fee083a39a0..3daf356e287 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/EngineHostPodDaoImpl.java @@ -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; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDao.java similarity index 94% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDao.java index d6455038f8e..7a91a90fa93 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDao.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.engine.datacenter.entity.api.db.dao; +package org.apache.cloudstack.engine.datacenter.entity.dao; import java.util.Map; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDaoImpl.java similarity index 98% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDaoImpl.java index 02f8c2c546c..6c2db46f69d 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostDetailsDaoImpl.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.engine.datacenter.entity.api.db.dao; +package org.apache.cloudstack.engine.datacenter.entity.dao; import java.util.HashMap; import java.util.List; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDao.java similarity index 94% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDao.java index 09503d80127..73ffe01d897 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDao.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDao.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.engine.datacenter.entity.api.db.dao; +package org.apache.cloudstack.engine.datacenter.entity.dao; import java.util.List; import com.cloud.host.HostTagVO; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDaoImpl.java similarity index 97% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java rename to engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDaoImpl.java index a70b7d1b234..a157bb72d68 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/datacenter/entity/dao/HostTagsDaoImpl.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.engine.datacenter.entity.api.db.dao; +package org.apache.cloudstack.engine.datacenter.entity.dao; import java.util.ArrayList; import java.util.List;