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

Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud)

This commit is contained in:
Alena Prokharchyk 2013-10-28 15:03:57 -07:00
parent 5caeab782d
commit 2cac1aaa0f
24 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDao.java
View File

@ -16,6 +16,8 @@
// under the License.
package com.cloud.dc.dao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.dc.DataCenterDetailVO;
import com.cloud.utils.db.GenericDao;

1
engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java
View File

@ -22,6 +22,7 @@ import org.apache.cloudstack.api.ResourceDetail;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import com.cloud.dc.DataCenterDetailVO;

3
engine/schema/src/com/cloud/network/dao/NetworkDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package com.cloud.network.dao;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {

2
engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java
View File

@ -18,9 +18,9 @@ package com.cloud.network.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
@Component
@Local(value=NetworkDetailsDao.class)

3
engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package com.cloud.service.dao;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.service.ServiceOfferingDetailsVO;
import com.cloud.utils.db.GenericDao;

2
engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java
View File

@ -18,9 +18,9 @@ package com.cloud.service.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
import com.cloud.service.ServiceOfferingDetailsVO;
@Component

2
engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
View File

@ -21,10 +21,10 @@ import javax.ejb.Local;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
@Local(value = StoragePoolDetailsDao.class)
public class StoragePoolDetailsDaoImpl extends ResourceDetailsDaoBase<StoragePoolDetailVO> implements StoragePoolDetailsDao, ScopedConfigStorage {

3
engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package com.cloud.storage.dao;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.storage.VMTemplateDetailVO;
import com.cloud.utils.db.GenericDao;

2
engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
View File

@ -18,9 +18,9 @@ package com.cloud.storage.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
import com.cloud.storage.VMTemplateDetailVO;
@Component

3
engine/schema/src/com/cloud/storage/dao/VolumeDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package com.cloud.storage.dao;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.storage.VolumeDetailVO;
import com.cloud.utils.db.GenericDao;

2
engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java
View File

@ -18,9 +18,9 @@ package com.cloud.storage.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
import com.cloud.storage.VolumeDetailVO;
@Component

3
engine/schema/src/com/cloud/vm/dao/NicDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package com.cloud.vm.dao;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
import com.cloud.vm.NicDetailVO;

2
engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java
View File

@ -18,9 +18,9 @@ package com.cloud.vm.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
import com.cloud.vm.NicDetailVO;
@Component

3
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package com.cloud.vm.dao;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
import com.cloud.vm.UserVmDetailVO;

2
engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
View File

@ -18,9 +18,9 @@ package com.cloud.vm.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
import com.cloud.vm.UserVmDetailVO;
@Component

2
engine/schema/src/com/cloud/dc/dao/ResourceDetailsDao.java → engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.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 com.cloud.dc.dao;
package org.apache.cloudstack.resourcedetail;
import java.util.List;
import java.util.Map;

2
engine/schema/src/com/cloud/dc/dao/ResourceDetailsDaoBase.java → engine/schema/src/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.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 com.cloud.dc.dao;
package org.apache.cloudstack.resourcedetail;
import java.util.HashMap;
import java.util.List;

2
engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDao.java
View File

@ -17,8 +17,8 @@
package org.apache.cloudstack.resourcedetail.dao;
import org.apache.cloudstack.resourcedetail.FirewallRuleDetailVO;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.dc.dao.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface FirewallRuleDetailsDao extends GenericDao<FirewallRuleDetailVO, Long>, ResourceDetailsDao<FirewallRuleDetailVO>{

2
engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java
View File

@ -19,9 +19,9 @@ package org.apache.cloudstack.resourcedetail.dao;
import javax.ejb.Local;
import org.apache.cloudstack.resourcedetail.FirewallRuleDetailVO;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
@Component
@Local (value={FirewallRuleDetailsDao.class})

2
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDetailsDao.java
View File

@ -16,7 +16,7 @@
// under the License.
package org.apache.cloudstack.storage.datastore.db;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
public interface PrimaryDataStoreDetailsDao extends ResourceDetailsDao<PrimaryDataStoreDetailVO> {
}

3
engine/schema/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java
View File

@ -16,7 +16,8 @@
// under the License.
package org.apache.cloudstack.storage.datastore.db;
import com.cloud.dc.dao.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface StoragePoolDetailsDao extends GenericDao<StoragePoolDetailVO, Long>, ResourceDetailsDao<StoragePoolDetailVO> {

2
engine/storage/src/org/apache/cloudstack/storage/volume/db/PrimaryDataStoreDetailsDaoImpl.java
View File

@ -16,11 +16,11 @@
// under the License.
package org.apache.cloudstack.storage.volume.db;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDetailVO;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDetailsDao;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
@Component
public class PrimaryDataStoreDetailsDaoImpl extends ResourceDetailsDaoBase<PrimaryDataStoreDetailVO> implements

2
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -59,6 +59,7 @@ import org.apache.cloudstack.framework.jobs.AsyncJob;
import org.apache.cloudstack.framework.jobs.AsyncJobManager;
import org.apache.cloudstack.framework.jobs.dao.AsyncJobDao;
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
@ -126,7 +127,6 @@ import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.DataCenterDetailsDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.dc.dao.ResourceDetailsDaoBase;
import com.cloud.dc.dao.VlanDao;
import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao;

2
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
View File

@ -26,13 +26,13 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.ResourceDetail;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.dc.dao.DataCenterDetailsDao;
import com.cloud.dc.dao.ResourceDetailsDao;
import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;