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

Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.

Browse Source
This commit is contained in:
cirstofolini 2015-11-21 18:31:11 -02:00
parent 63203cec18
commit 1a64c247ad
519 changed files with 0 additions and 1066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/storage/template/IsoProcessor.java
View File

@ -22,7 +22,6 @@ package com.cloud.storage.template;
import java.io.File;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@ -31,7 +30,6 @@ import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
@Local(value = Processor.class)
public class IsoProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(IsoProcessor.class);

2
core/src/com/cloud/storage/template/OVAProcessor.java
View File

@ -22,7 +22,6 @@ package com.cloud.storage.template;
import java.io.File;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import javax.xml.parsers.DocumentBuilderFactory;
@ -36,7 +35,6 @@ import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.script.Script;
@Local(value = Processor.class)
public class OVAProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(OVAProcessor.class);

2
core/src/com/cloud/storage/template/QCOW2Processor.java
View File

@ -24,7 +24,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.exception.InternalErrorException;
@ -35,7 +34,6 @@ import com.cloud.storage.StorageLayer;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.AdapterBase;
@Local(value = Processor.class)
public class QCOW2Processor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(QCOW2Processor.class);
private static final int VIRTUALSIZE_HEADER_LOCATION = 24;

2
core/src/com/cloud/storage/template/RawImageProcessor.java
View File

@ -22,7 +22,6 @@ package com.cloud.storage.template;
import java.io.File;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@ -32,7 +31,6 @@ import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
@Local(value = Processor.class)
public class RawImageProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(RawImageProcessor.class);
StorageLayer _storage;

2
core/src/com/cloud/storage/template/TARProcessor.java
View File

@ -24,12 +24,10 @@ import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import java.io.File;
import java.util.Map;
@Local(value = Processor.class)
public class TARProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(TARProcessor.class);

2
core/src/com/cloud/storage/template/VhdProcessor.java
View File

@ -24,7 +24,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.exception.InternalErrorException;
@ -41,7 +40,6 @@ import com.cloud.utils.component.AdapterBase;
* into the VHD format.
*
*/
@Local(value = Processor.class)
public class VhdProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(VhdProcessor.class);

2
core/src/com/cloud/storage/template/VmdkProcessor.java
View File

@ -28,7 +28,6 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@ -38,7 +37,6 @@ import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
@Local(value = Processor.class)
public class VmdkProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(VmdkProcessor.class);

2
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -34,7 +34,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@ -116,7 +115,6 @@ import com.cloud.utils.time.InaccurateClock;
/**
* Implementation of the Agent Manager. This class controls the connection to the agents.
**/
@Local(value = {AgentManager.class})
public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory, Configurable {
protected static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class);
protected static final Logger status_logger = Logger.getLogger(Status.class);

3
engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
View File

@ -37,7 +37,6 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.net.ssl.SSLContext;
@ -52,7 +51,6 @@ import org.apache.cloudstack.utils.identity.ManagementServerNode;
import org.apache.cloudstack.utils.security.SSLUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.CancelCommand;
import com.cloud.agent.api.ChangeAgentAnswer;
@ -95,7 +93,6 @@ import com.cloud.utils.nio.Link;
import com.cloud.utils.nio.Task;
import com.google.gson.Gson;
@Local(value = {AgentManager.class, ClusteredAgentRebalanceService.class})
public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService {
final static Logger s_logger = Logger.getLogger(ClusteredAgentManagerImpl.class);
private static final ScheduledExecutorService s_transferExecutor = Executors.newScheduledThreadPool(2, new NamedThreadFactory("Cluster-AgentRebalancingExecutor"));

2
engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
View File

@ -24,7 +24,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -39,7 +38,6 @@ import com.cloud.utils.db.QueryBuilder;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = AgentLoadBalancerPlanner.class)
public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements AgentLoadBalancerPlanner {
private static final Logger s_logger = Logger.getLogger(AgentLoadBalancerPlanner.class);

2
engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java
View File

@ -19,7 +19,6 @@ package com.cloud.vm;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@ -27,7 +26,6 @@ import com.cloud.cluster.ClusterManager;
import com.cloud.cluster.ClusterManagerListener;
import com.cloud.cluster.ManagementServerHost;
@Local(value = VirtualMachineManager.class)
public class ClusteredVirtualMachineManagerImpl extends VirtualMachineManagerImpl implements ClusterManagerListener {
@Inject

2
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -34,7 +34,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@ -204,7 +203,6 @@ import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.snapshot.VMSnapshotManager;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@Local(value = VirtualMachineManager.class)
public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMachineManager, VmWorkJobHandler, Listener, Configurable {
private static final Logger s_logger = Logger.getLogger(VirtualMachineManagerImpl.class);

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

@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component(value = "EngineDcDetailsDao")
@Local(value = DcDetailsDao.class)
public class DcDetailsDaoImpl extends GenericDaoBase<DcDetailVO, Long> implements DcDetailsDao {
protected final SearchBuilder<DcDetailVO> DcSearch;
protected final SearchBuilder<DcDetailVO> DetailSearch;

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

@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -51,7 +50,6 @@ import com.cloud.utils.db.UpdateBuilder;
import com.cloud.utils.exception.CloudRuntimeException;
@Component(value = "EngineClusterDao")
@Local(value = EngineClusterDao.class)
public class EngineClusterDaoImpl extends GenericDaoBase<EngineClusterVO, Long> implements EngineClusterDao {
private static final Logger s_logger = Logger.getLogger(EngineClusterDaoImpl.class);

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

@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.TableGenerator;
@ -53,7 +52,6 @@ import com.cloud.utils.net.NetUtils;
* }
**/
@Component(value = "EngineDataCenterDao")
@Local(value = {EngineDataCenterDao.class})
public class EngineDataCenterDaoImpl extends GenericDaoBase<EngineDataCenterVO, Long> implements EngineDataCenterDao {
private static final Logger s_logger = Logger.getLogger(EngineDataCenterDaoImpl.class);

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
View File

@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.persistence.TableGenerator;
@ -59,7 +58,6 @@ import com.cloud.utils.db.UpdateBuilder;
import com.cloud.utils.exception.CloudRuntimeException;
@Component(value = "EngineHostDao")
@Local(value = {EngineHostDao.class})
@DB
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implements EngineHostDao {

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

@ -24,7 +24,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -44,7 +43,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.UpdateBuilder;
@Component(value = "EngineHostPodDao")
@Local(value = {EngineHostPodDao.class})
public class EngineHostPodDaoImpl extends GenericDaoBase<EngineHostPodVO, Long> implements EngineHostPodDao {
private static final Logger s_logger = Logger.getLogger(EngineHostPodDaoImpl.class);

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java
View File

@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component(value = "EngineHostDetailsDao")
@Local(value = HostDetailsDao.class)
public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implements HostDetailsDao {
protected final SearchBuilder<DetailVO> HostSearch;
protected final SearchBuilder<DetailVO> DetailSearch;

2
engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java
View File

@ -19,7 +19,6 @@ package org.apache.cloudstack.engine.datacenter.entity.api.db.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component(value = "EngineHostTagsDao")
@Local(value = HostTagsDao.class)
public class HostTagsDaoImpl extends GenericDaoBase<HostTagVO, Long> implements HostTagsDao {
protected final SearchBuilder<HostTagVO> HostSearch;

2
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -33,7 +33,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@ -211,7 +210,6 @@ import com.cloud.vm.dao.VMInstanceDao;
/**
* NetworkManagerImpl implements NetworkManager.
*/
@Local(value = {NetworkOrchestrationService.class})
public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestrationService, Listener, Configurable {
static final Logger s_logger = Logger.getLogger(NetworkOrchestrator.class);

2
engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java
View File

@ -19,7 +19,6 @@ package com.cloud.alert.dao;
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {AlertDao.class})
public class AlertDaoImpl extends GenericDaoBase<AlertVO, Long> implements AlertDao {
protected final SearchBuilder<AlertVO> AlertSearchByIdsAndType;

2
engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
View File

@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -50,7 +49,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = {CapacityDao.class})
public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements CapacityDao {
private static final Logger s_logger = Logger.getLogger(CapacityDaoImpl.class);

2
engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
View File

@ -16,7 +16,6 @@
// under the License.
package com.cloud.certificate.dao;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -26,7 +25,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Component
@Local(value = {CertificateDao.class})
@DB
public class CertificateDaoImpl extends GenericDaoBase<CertificateVO, Long> implements CertificateDao {

2
engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
View File

@ -20,7 +20,6 @@ import java.util.Date;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {HostTransferMapDao.class})
@DB
public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Long> implements HostTransferMapDao {
private static final Logger s_logger = Logger.getLogger(HostTransferMapDaoImpl.class);

2
engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
View File

@ -21,7 +21,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -41,7 +40,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {ResourceCountDao.class})
public class ResourceCountDaoImpl extends GenericDaoBase<ResourceCountVO, Long> implements ResourceCountDao {
private final SearchBuilder<ResourceCountVO> TypeSearch;

2
engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java
View File

@ -19,7 +19,6 @@ package com.cloud.configuration.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {ResourceLimitDao.class})
public class ResourceLimitDaoImpl extends GenericDaoBase<ResourceLimitVO, Long> implements ResourceLimitDao {
private SearchBuilder<ResourceLimitVO> IdTypeSearch;

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

@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Local(value = ClusterDetailsDao.class)
public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long> implements ClusterDetailsDao, ScopedConfigStorage {
protected final SearchBuilder<ClusterDetailsVO> ClusterSearch;
protected final SearchBuilder<ClusterDetailsVO> DetailSearch;

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

@ -18,7 +18,6 @@ package com.cloud.dc.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {AccountVlanMapDao.class})
public class AccountVlanMapDaoImpl extends GenericDaoBase<AccountVlanMapVO, Long> implements AccountVlanMapDao {
protected SearchBuilder<AccountVlanMapVO> AccountSearch;

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

@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -44,7 +43,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = ClusterDao.class)
public class ClusterDaoImpl extends GenericDaoBase<ClusterVO, Long> implements ClusterDao {
protected final SearchBuilder<ClusterVO> PodSearch;

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

@ -18,7 +18,6 @@ package com.cloud.dc.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = ClusterVSMMapDao.class)
@DB
public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long> implements ClusterVSMMapDao {

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

@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.TableGenerator;
@ -56,7 +55,6 @@ import com.cloud.utils.net.NetUtils;
* }
**/
@Component
@Local(value = {DataCenterDao.class})
public class DataCenterDaoImpl extends GenericDaoBase<DataCenterVO, Long> implements DataCenterDao {
private static final Logger s_logger = Logger.getLogger(DataCenterDaoImpl.class);

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

@ -16,7 +16,6 @@
// under the License.
package com.cloud.dc.dao;
import javax.ejb.Local;
import org.apache.cloudstack.api.ResourceDetail;
import org.apache.cloudstack.framework.config.ConfigKey;
@ -26,7 +25,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
import com.cloud.dc.DataCenterDetailVO;
@Local(value = DataCenterDetailsDao.class)
public class DataCenterDetailsDaoImpl extends ResourceDetailsDaoBase<DataCenterDetailVO> implements DataCenterDetailsDao, ScopedConfigStorage {
@Override

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

@ -21,7 +21,6 @@ import java.sql.SQLException;
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -38,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
@Local(value = {DataCenterIpAddressDao.class})
@DB
public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddressVO, Long> implements DataCenterIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class);

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

@ -22,7 +22,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@ -40,7 +39,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
@Local(value = {DataCenterLinkLocalIpAddressDaoImpl.class})
@DB
public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCenterLinkLocalIpAddressVO, Long> implements DataCenterLinkLocalIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class);

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

@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {HostPodDao.class})
public class HostPodDaoImpl extends GenericDaoBase<HostPodVO, Long> implements HostPodDao {
private static final Logger s_logger = Logger.getLogger(HostPodDaoImpl.class);

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

@ -18,7 +18,6 @@ package com.cloud.dc.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {PodVlanMapDao.class})
public class PodVlanMapDaoImpl extends GenericDaoBase<PodVlanMapVO, Long> implements PodVlanMapDao {
protected SearchBuilder<PodVlanMapVO> PodSearch;

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

@ -19,7 +19,6 @@ package com.cloud.dc.dao;
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {StorageNetworkIpAddressDao.class})
@DB
public class StorageNetworkIpAddressDaoImpl extends GenericDaoBase<StorageNetworkIpAddressVO, Long> implements StorageNetworkIpAddressDao {
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, Long> countInUserIp;

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

@ -18,7 +18,6 @@ package com.cloud.dc.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = {StorageNetworkIpRangeDao.class})
@DB
public class StorageNetworkIpRangeDaoImpl extends GenericDaoBase<StorageNetworkIpRangeVO, Long> implements StorageNetworkIpRangeDao {
protected final GenericSearchBuilder<StorageNetworkIpRangeVO, Long> countRanges;

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

@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@ -45,7 +44,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = {VlanDao.class})
public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao {
private final String FindZoneWideVlans =

2
engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
View File

@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {DomainDao.class})
public class DomainDaoImpl extends GenericDaoBase<DomainVO, Long> implements DomainDao {
private static final Logger s_logger = Logger.getLogger(DomainDaoImpl.class);

2
engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
View File

@ -19,7 +19,6 @@ package com.cloud.event.dao;
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {EventDao.class})
public class EventDaoImpl extends GenericDaoBase<EventVO, Long> implements EventDao {
public static final Logger s_logger = Logger.getLogger(EventDaoImpl.class.getName());
protected final SearchBuilder<EventVO> CompletedEventSearch;

2
engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
View File

@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -42,7 +41,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = {UsageEventDao.class})
public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implements UsageEventDao {
public static final Logger s_logger = Logger.getLogger(UsageEventDaoImpl.class.getName());

2
engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
View File

@ -19,7 +19,6 @@ package com.cloud.event.dao;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {UsageEventDetailsDao.class})
public class UsageEventDetailsDaoImpl extends GenericDaoBase<UsageEventDetailsVO, Long> implements UsageEventDetailsDao {
public static final Logger s_logger = Logger.getLogger(UsageEventDetailsDaoImpl.class.getName());

2
engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java
View File

@ -18,7 +18,6 @@ package com.cloud.gpu.dao;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = HostGpuGroupsDao.class)
public class HostGpuGroupsDaoImpl extends GenericDaoBase<HostGpuGroupsVO, Long> implements HostGpuGroupsDao {
private static final Logger s_logger = Logger.getLogger(HostGpuGroupsDaoImpl.class);

2
engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java
View File

@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -41,7 +40,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = VGPUTypesDao.class)
public class VGPUTypesDaoImpl extends GenericDaoBase<VGPUTypesVO, Long> implements VGPUTypesDao {
private static final Logger s_logger = Logger.getLogger(VGPUTypesDaoImpl.class);

2
engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java
View File

@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = HostDetailsDao.class)
public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implements HostDetailsDao {
protected final SearchBuilder<DetailVO> HostSearch;
protected final SearchBuilder<DetailVO> DetailSearch;

2
engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
View File

@ -19,7 +19,6 @@ package com.cloud.host.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -32,7 +31,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value = HostTagsDao.class)
public class HostTagsDaoImpl extends GenericDaoBase<HostTagVO, Long> implements HostTagsDao {
protected final SearchBuilder<HostTagVO> HostSearch;
protected final GenericSearchBuilder<HostTagVO, String> DistinctImplictTagsSearch;

2
engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
View File

@ -18,7 +18,6 @@ package com.cloud.hypervisor.dao;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = HypervisorCapabilitiesDao.class)
public class HypervisorCapabilitiesDaoImpl extends GenericDaoBase<HypervisorCapabilitiesVO, Long> implements HypervisorCapabilitiesDao {
private static final Logger s_logger = Logger.getLogger(HypervisorCapabilitiesDaoImpl.class);

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

@ -18,7 +18,6 @@ package com.cloud.network.as.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {AutoScalePolicyConditionMapDao.class})
public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase<AutoScalePolicyConditionMapVO, Long> implements AutoScalePolicyConditionMapDao {
private SearchCriteria<AutoScalePolicyConditionMapVO> getSearchCriteria(Long policyId, Long conditionId) {

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

@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.as.dao;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -25,7 +24,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {AutoScalePolicyDao.class})
public class AutoScalePolicyDaoImpl extends GenericDaoBase<AutoScalePolicyVO, Long> implements AutoScalePolicyDao {
@Override

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

@ -18,7 +18,6 @@ package com.cloud.network.as.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value = {AutoScaleVmGroupDao.class})
public class AutoScaleVmGroupDaoImpl extends GenericDaoBase<AutoScaleVmGroupVO, Long> implements AutoScaleVmGroupDao {
@Override

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

@ -18,7 +18,6 @@ package com.cloud.network.as.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = {AutoScaleVmGroupPolicyMapDao.class})
public class AutoScaleVmGroupPolicyMapDaoImpl extends GenericDaoBase<AutoScaleVmGroupPolicyMapVO, Long> implements AutoScaleVmGroupPolicyMapDao {
@Override

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

@ -18,7 +18,6 @@ package com.cloud.network.as.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {AutoScaleVmGroupVmMapDao.class})
public class AutoScaleVmGroupVmMapDaoImpl extends GenericDaoBase<AutoScaleVmGroupVmMapVO, Long> implements AutoScaleVmGroupVmMapDao {
@Override

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

@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.as.dao;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -25,7 +24,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {AutoScaleVmProfileDao.class})
public class AutoScaleVmProfileDaoImpl extends GenericDaoBase<AutoScaleVmProfileVO, Long> implements AutoScaleVmProfileDao {
@Override

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

@ -17,7 +17,6 @@
package com.cloud.network.as.dao;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = ConditionDao.class)
public class ConditionDaoImpl extends GenericDaoBase<ConditionVO, Long> implements ConditionDao {
final SearchBuilder<ConditionVO> AllFieldsSearch;

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

@ -19,7 +19,6 @@ package com.cloud.network.as.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = CounterDao.class)
public class CounterDaoImpl extends GenericDaoBase<CounterVO, Long> implements CounterDao {
final SearchBuilder<CounterVO> AllFieldsSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {AccountGuestVlanMapDao.class})
@DB
public class AccountGuestVlanMapDaoImpl extends GenericDaoBase<AccountGuestVlanMapVO, Long> implements AccountGuestVlanMapDao {

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = ExternalFirewallDeviceDao.class)
@DB
public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase<ExternalFirewallDeviceVO, Long> implements ExternalFirewallDeviceDao {
final SearchBuilder<ExternalFirewallDeviceVO> physicalNetworkServiceProviderSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = ExternalLoadBalancerDeviceDao.class)
@DB
public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLoadBalancerDeviceVO, Long> implements ExternalLoadBalancerDeviceDao {
final SearchBuilder<ExternalLoadBalancerDeviceVO> physicalNetworkIdSearch;

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

@ -19,7 +19,6 @@ package com.cloud.network.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = FirewallRulesCidrsDao.class)
public class FirewallRulesCidrsDaoImpl extends GenericDaoBase<FirewallRulesCidrsVO, Long> implements FirewallRulesCidrsDao {
private static final Logger s_logger = Logger.getLogger(FirewallRulesCidrsDaoImpl.class);
protected final SearchBuilder<FirewallRulesCidrsVO> CidrsSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -42,7 +41,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = FirewallRulesDao.class)
@DB
public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> implements FirewallRulesDao {

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

@ -22,7 +22,6 @@ import java.util.Date;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao;
@ -47,7 +46,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.Ip;
@Component
@Local(value = {IPAddressDao.class})
@DB
public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implements IPAddressDao {
private static final Logger s_logger = Logger.getLogger(IPAddressDaoImpl.class);

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

@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.dao;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -24,7 +23,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {InlineLoadBalancerNicMapDao.class})
public class InlineLoadBalancerNicMapDaoImpl extends GenericDaoBase<InlineLoadBalancerNicMapVO, Long> implements InlineLoadBalancerNicMapDao {
@Override

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {LBHealthCheckPolicyDao.class})
public class LBHealthCheckPolicyDaoImpl extends GenericDaoBase<LBHealthCheckPolicyVO, Long> implements LBHealthCheckPolicyDao {
@Override

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -26,7 +25,6 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {LBStickinessPolicyDao.class})
public class LBStickinessPolicyDaoImpl extends GenericDaoBase<LBStickinessPolicyVO, Long> implements LBStickinessPolicyDao {
@Override

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import com.cloud.utils.db.GenericDaoBase;
@ -26,7 +25,6 @@ import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Local(value = {LoadBalancerCertMapDao.class})
public class LoadBalancerCertMapDaoImpl extends GenericDaoBase<LoadBalancerCertMapVO, Long> implements LoadBalancerCertMapDao {
private final SearchBuilder<LoadBalancerCertMapVO> listByCertId;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = {LoadBalancerDao.class})
public class LoadBalancerDaoImpl extends GenericDaoBase<LoadBalancerVO, Long> implements LoadBalancerDao {
private final SearchBuilder<LoadBalancerVO> ListByIp;
protected final SearchBuilder<LoadBalancerVO> TransitionStateSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value = {LoadBalancerVMMapDao.class})
public class LoadBalancerVMMapDaoImpl extends GenericDaoBase<LoadBalancerVMMapVO, Long> implements LoadBalancerVMMapDao {
@Override

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

@ -19,7 +19,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = MonitoringServiceDao.class)
public class MonitoringServiceDaoImpl extends GenericDaoBase<MonitoringServiceVO, Long> implements MonitoringServiceDao {
private final SearchBuilder<MonitoringServiceVO> AllFieldsSearch;

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

@ -21,7 +21,6 @@ import java.util.Map;
import java.util.Random;
import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.persistence.TableGenerator;
@ -56,7 +55,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.net.NetUtils;
@Component
@Local(value = NetworkDao.class)
@DB()
public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao {
SearchBuilder<NetworkVO> AllFieldsSearch;

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

@ -16,14 +16,12 @@
// under the License.
package com.cloud.network.dao;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
@Component
@Local(value = NetworkDetailsDao.class)
public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase<NetworkDetailVO> implements NetworkDetailsDao {
@Override

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

@ -19,7 +19,6 @@ package com.cloud.network.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = NetworkDomainDao.class)
@DB()
public class NetworkDomainDaoImpl extends GenericDaoBase<NetworkDomainVO, Long> implements NetworkDomainDao {
final SearchBuilder<NetworkDomainVO> AllFieldsSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = NetworkExternalFirewallDao.class)
@DB()
public class NetworkExternalFirewallDaoImpl extends GenericDaoBase<NetworkExternalFirewallVO, Long> implements NetworkExternalFirewallDao {

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = NetworkExternalLoadBalancerDao.class)
@DB()
public class NetworkExternalLoadBalancerDaoImpl extends GenericDaoBase<NetworkExternalLoadBalancerVO, Long> implements NetworkExternalLoadBalancerDao {

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {NetworkRuleConfigDao.class})
public class NetworkRuleConfigDaoImpl extends GenericDaoBase<NetworkRuleConfigVO, Long> implements NetworkRuleConfigDao {
protected SearchBuilder<NetworkRuleConfigVO> SecurityGroupIdSearch;

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

@ -19,7 +19,6 @@ package com.cloud.network.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = NetworkServiceMapDao.class)
@DB()
public class NetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao {
final SearchBuilder<NetworkServiceMapVO> AllFieldsSearch;

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

@ -20,9 +20,7 @@ package com.cloud.network.dao;
import com.cloud.utils.db.GenericDaoBase;
import org.springframework.stereotype.Component;
import javax.ejb.Local;
@Component
@Local(value=OpRouterMonitorServiceDao.class)
public class OpRouterMonitorServiceDaoImpl extends GenericDaoBase<OpRouterMonitorServiceVO, Long> implements OpRouterMonitorServiceDao {
}

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = OvsProviderDao.class)
@DB()
public class OvsProviderDaoImpl extends GenericDaoBase<OvsProviderVO, Long>
implements OvsProviderDao {

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = PhysicalNetworkDao.class)
@DB()
public class PhysicalNetworkDaoImpl extends GenericDaoBase<PhysicalNetworkVO, Long> implements PhysicalNetworkDao {
final SearchBuilder<PhysicalNetworkVO> ZoneSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = PhysicalNetworkServiceProviderDao.class)
@DB()
public class PhysicalNetworkServiceProviderDaoImpl extends GenericDaoBase<PhysicalNetworkServiceProviderVO, Long> implements PhysicalNetworkServiceProviderDao {
final SearchBuilder<PhysicalNetworkServiceProviderVO> physicalNetworkSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = PhysicalNetworkTrafficTypeDao.class)
@DB()
public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNetworkTrafficTypeVO, Long> implements PhysicalNetworkTrafficTypeDao {
final SearchBuilder<PhysicalNetworkTrafficTypeVO> physicalNetworkSearch;

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

@ -21,7 +21,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = PortProfileDao.class)
@DB()
public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> implements PortProfileDao {
protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class);

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {RemoteAccessVpnDao.class})
public class RemoteAccessVpnDaoImpl extends GenericDaoBase<RemoteAccessVpnVO, Long> implements RemoteAccessVpnDao {
private static final Logger s_logger = Logger.getLogger(RemoteAccessVpnDaoImpl.class);

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {Site2SiteCustomerGatewayDao.class})
public class Site2SiteCustomerGatewayDaoImpl extends GenericDaoBase<Site2SiteCustomerGatewayVO, Long> implements Site2SiteCustomerGatewayDao {
private static final Logger s_logger = Logger.getLogger(Site2SiteCustomerGatewayDaoImpl.class);

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

@ -19,7 +19,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {Site2SiteVpnConnectionDao.class})
public class Site2SiteVpnConnectionDaoImpl extends GenericDaoBase<Site2SiteVpnConnectionVO, Long> implements Site2SiteVpnConnectionDao {
private static final Logger s_logger = Logger.getLogger(Site2SiteVpnConnectionDaoImpl.class);

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

@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.dao;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {Site2SiteVpnGatewayDao.class})
public class Site2SiteVpnGatewayDaoImpl extends GenericDaoBase<Site2SiteVpnGatewayVO, Long> implements Site2SiteVpnGatewayDao {
@Inject
protected IPAddressDao _addrDao;

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

@ -18,13 +18,11 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Local(value = {SslCertDao.class})
public class SslCertDaoImpl extends GenericDaoBase<SslCertVO, Long> implements SslCertDao {
private final SearchBuilder<SslCertVO> listByAccountId;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = UserIpv6AddressDao.class)
public class UserIpv6AddressDaoImpl extends GenericDaoBase<UserIpv6AddressVO, Long> implements UserIpv6AddressDao {
private static final Logger s_logger = Logger.getLogger(IPAddressDaoImpl.class);

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = VirtualRouterProviderDao.class)
@DB()
public class VirtualRouterProviderDaoImpl extends GenericDaoBase<VirtualRouterProviderVO, Long> implements VirtualRouterProviderDao {
final SearchBuilder<VirtualRouterProviderVO> AllFieldsSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value = {VpnUserDao.class})
public class VpnUserDaoImpl extends GenericDaoBase<VpnUserVO, Long> implements VpnUserDao {
private final SearchBuilder<VpnUserVO> AccountSearch;
private final SearchBuilder<VpnUserVO> AccountNameSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.rules.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value = PortForwardingRulesDao.class)
public class PortForwardingRulesDaoImpl extends GenericDaoBase<PortForwardingRuleVO, Long> implements PortForwardingRulesDao {
protected final SearchBuilder<PortForwardingRuleVO> AllFieldsSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.security.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {SecurityGroupDao.class})
public class SecurityGroupDaoImpl extends GenericDaoBase<SecurityGroupVO, Long> implements SecurityGroupDao {
private SearchBuilder<SecurityGroupVO> AccountIdSearch;
private SearchBuilder<SecurityGroupVO> AccountIdNameSearch;

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

@ -19,7 +19,6 @@ package com.cloud.network.security.dao;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@ -38,7 +37,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.DB;
@Component
@Local(value = {SecurityGroupRuleDao.class})
public class SecurityGroupRuleDaoImpl extends GenericDaoBase<SecurityGroupRuleVO, Long> implements SecurityGroupRuleDao {
@Inject

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

@ -18,7 +18,6 @@ package com.cloud.network.security.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = {SecurityGroupRulesDao.class})
public class SecurityGroupRulesDaoImpl extends GenericDaoBase<SecurityGroupRulesVO, Long> implements SecurityGroupRulesDao {
private SearchBuilder<SecurityGroupRulesVO> AccountGroupNameSearch;
private SearchBuilder<SecurityGroupRulesVO> AccountSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.security.dao;
import java.util.List;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.vm.VirtualMachine.State;
@Component
@Local(value = {SecurityGroupVMMapDao.class})
public class SecurityGroupVMMapDaoImpl extends GenericDaoBase<SecurityGroupVMMapVO, Long> implements SecurityGroupVMMapDao {
private SearchBuilder<SecurityGroupVMMapVO> ListByIpAndVmId;
private SearchBuilder<SecurityGroupVMMapVO> ListByVmId;

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

@ -19,7 +19,6 @@ package com.cloud.network.security.dao;
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -37,7 +36,6 @@ import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = {SecurityGroupWorkDao.class})
public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO, Long> implements SecurityGroupWorkDao {
private static final Logger s_logger = Logger.getLogger(SecurityGroupWorkDaoImpl.class);

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

@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {VmRulesetLogDao.class})
public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> implements VmRulesetLogDao {
protected static final Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class);
private SearchBuilder<VmRulesetLogVO> VmIdSearch;

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

@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.vpc.dao;
import javax.ejb.Local;
import org.springframework.stereotype.Component;
@ -25,7 +24,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Component
@Local(value = NetworkACLDao.class)
@DB()
public class NetworkACLDaoImpl extends GenericDaoBase<NetworkACLVO, Long> implements NetworkACLDao {

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

@ -21,7 +21,6 @@ package com.cloud.network.vpc.dao;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -38,7 +37,6 @@ import com.cloud.utils.db.TransactionLegacy;
*
*/
@Component
@Local(value = NetworkACLItemCidrsDao.class)
public class NetworkACLItemCidrsDaoImpl extends GenericDaoBase<NetworkACLItemCidrsVO, Long> implements NetworkACLItemCidrsDao {
private static final Logger s_logger = Logger.getLogger(NetworkACLItemCidrsDaoImpl.class);
protected final SearchBuilder<NetworkACLItemCidrsVO> cidrsSearch;

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

@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import com.google.common.collect.Lists;
@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = NetworkACLItemDao.class)
@DB()
public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long> implements NetworkACLItemDao {
private static final Logger s_logger = Logger.getLogger(NetworkACLItemDaoImpl.class);

Some files were not shown because too many files have changed in this diff Show More