You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/10/04 20:01:42 UTC
git commit: updated refs/heads/master to bd85367
Updated Branches:
refs/heads/master 2b47611c5 -> bd8536739
remove txn attribute from DB
txn attribute was never actually used
Signed-off-by: Laszlo Hornyak <la...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd853673
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd853673
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd853673
Branch: refs/heads/master
Commit: bd8536739c012e1025d35271ce82dbc9e5e66a8d
Parents: 2b47611
Author: Laszlo Hornyak <la...@gmail.com>
Authored: Fri Aug 30 13:21:37 2013 +0200
Committer: Darren Shepherd <da...@gmail.com>
Committed: Fri Oct 4 10:15:39 2013 -0700
----------------------------------------------------------------------
.../entity/api/db/dao/EngineHostDaoImpl.java | 2 +-
.../certificate/dao/CertificateDaoImpl.java | 5 +-
.../agentlb/dao/HostTransferMapDaoImpl.java | 2 +-
.../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 2 +-
.../dc/dao/DataCenterIpAddressDaoImpl.java | 2 +-
.../DataCenterLinkLocalIpAddressDaoImpl.java | 3 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 4 +-
.../dc/dao/StorageNetworkIpAddressDaoImpl.java | 7 +-
.../dc/dao/StorageNetworkIpRangeDaoImpl.java | 2 +-
.../src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../network/dao/AccountGuestVlanMapDaoImpl.java | 2 +-
.../dao/ExternalFirewallDeviceDaoImpl.java | 2 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 2 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 3 +-
.../com/cloud/network/dao/NetworkDaoImpl.java | 4 +-
.../cloud/network/dao/NetworkDomainDaoImpl.java | 2 +-
.../dao/NetworkExternalFirewallDaoImpl.java | 2 +-
.../dao/NetworkExternalLoadBalancerDaoImpl.java | 2 +-
.../network/dao/NetworkServiceMapDaoImpl.java | 2 +-
.../network/dao/PhysicalNetworkDaoImpl.java | 2 +-
.../PhysicalNetworkServiceProviderDaoImpl.java | 2 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 2 +-
.../cloud/network/dao/PortProfileDaoImpl.java | 2 +-
.../dao/VirtualRouterProviderDaoImpl.java | 2 +-
.../network/vpc/dao/NetworkACLDaoImpl.java | 3 +-
.../network/vpc/dao/NetworkACLItemDaoImpl.java | 2 +-
.../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 2 +-
.../network/vpc/dao/StaticRouteDaoImpl.java | 2 +-
.../com/cloud/network/vpc/dao/VpcDaoImpl.java | 2 +-
.../network/vpc/dao/VpcGatewayDaoImpl.java | 2 +-
.../network/vpc/dao/VpcOfferingDaoImpl.java | 2 +-
.../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 2 +-
.../network/vpc/dao/VpcServiceMapDaoImpl.java | 2 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 2 +-
.../dao/NetworkOfferingServiceMapDaoImpl.java | 2 +-
.../service/dao/ServiceOfferingDaoImpl.java | 2 +-
.../storage/dao/StoragePoolWorkDaoImpl.java | 2 +-
.../com/cloud/storage/dao/VolumeDaoImpl.java | 4 +-
.../com/cloud/upgrade/dao/VersionDaoImpl.java | 2 +-
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 2 +-
.../GlobalLoadBalancerLbRuleMapDaoImpl.java | 2 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 2 +-
framework/db/src/com/cloud/utils/db/DB.java | 16 ---
.../src/com/cloud/utils/db/GenericDaoBase.java | 122 +++++++++----------
.../database/BaremetalDhcpDaoImpl.java | 7 +-
.../baremetal/database/BaremetalPxeDaoImpl.java | 7 +-
.../com/cloud/ucs/database/UcsBladeDaoImpl.java | 4 +-
.../cloud/ucs/database/UcsManagerDaoImpl.java | 4 +-
.../vmware/dao/LegacyZoneDaoImpl.java | 2 +-
.../vmware/dao/VmwareDatacenterDaoImpl.java | 2 +-
.../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 +-
.../cloud/network/dao/NetScalerPodDaoImpl.java | 2 +-
.../cloud/dc/dao/DedicatedResourceDaoImpl.java | 3 +-
.../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 2 +-
.../vpc/dao/MockNetworkOfferingDaoImpl.java | 3 +-
.../MockNetworkOfferingServiceMapDaoImpl.java | 6 +-
.../vpc/dao/MockNetworkServiceMapDaoImpl.java | 2 +-
.../test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 2 +-
.../cloud/vpc/dao/MockVpcOfferingDaoImpl.java | 2 +-
.../dao/MockVpcOfferingServiceMapDaoImpl.java | 2 +-
60 files changed, 121 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
index 4bbc601..8debe2e 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
@@ -60,7 +60,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component(value="EngineHostDao")
@Local(value = { EngineHostDao.class })
-@DB(txn = false)
+@DB
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
public class EngineHostDaoImpl extends GenericDaoBase<EngineHostVO, Long> implements EngineHostDao {
private static final Logger s_logger = Logger.getLogger(EngineHostDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java b/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
index f071cea..fdd5a28 100644
--- a/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
+++ b/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
@@ -17,9 +17,6 @@
package com.cloud.certificate.dao;
import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import javax.ejb.Local;
@@ -32,7 +29,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Component
-@Local(value={CertificateDao.class}) @DB(txn=false)
+@Local(value={CertificateDao.class}) @DB
public class CertificateDaoImpl extends GenericDaoBase<CertificateVO, Long> implements CertificateDao {
private static final Logger s_logger = Logger.getLogger(CertificateDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java b/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
index cff4cfc..8a43d23 100644
--- a/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
@@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = { HostTransferMapDao.class })
-@DB(txn = false)
+@DB
public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Long> implements HostTransferMapDao {
private static final Logger s_logger = Logger.getLogger(HostTransferMapDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
index b12fa9d..c3d3f2a 100644
--- a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value=ClusterVSMMapDao.class)
-@DB(txn = false)
+@DB
public class ClusterVSMMapDaoImpl extends GenericDaoBase<ClusterVSMMapVO, Long> implements ClusterVSMMapDao {
final SearchBuilder<ClusterVSMMapVO> ClusterSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
index 353402d..0ec2bb5 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
@@ -38,7 +38,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
-@Local(value={DataCenterIpAddressDao.class}) @DB(txn=false)
+@Local(value={DataCenterIpAddressDao.class}) @DB
public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddressVO, Long> implements DataCenterIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
index b52e373..6baf04f 100644
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
@@ -30,7 +30,6 @@ import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenterLinkLocalIpAddressVO;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@@ -41,7 +40,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
-@Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB(txn=false)
+@Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB
public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase<DataCenterLinkLocalIpAddressVO, Long> implements DataCenterLinkLocalIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
index d3a2409..c052026 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
@@ -25,14 +25,12 @@ import java.util.Map;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.exception.InvalidParameterValueException;
import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenterVnetVO;
import com.cloud.network.dao.AccountGuestVlanMapDao;
import com.cloud.network.dao.AccountGuestVlanMapVO;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
@@ -48,7 +46,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
* data center/physical_network and the vnet that appears within the physical network.
*/
@Component
-@DB(txn=false)
+@DB
public class DataCenterVnetDaoImpl extends GenericDaoBase<DataCenterVnetVO, Long> implements DataCenterVnetDao {
private final SearchBuilder<DataCenterVnetVO> FreeVnetSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
index e78533f..a7bb9c1 100755
--- a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
@@ -18,17 +18,13 @@ package com.cloud.dc.dao;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import javax.ejb.Local;
-import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
-import com.cloud.dc.DataCenterIpAddressVO;
import com.cloud.dc.StorageNetworkIpAddressVO;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@@ -37,10 +33,11 @@ import com.cloud.utils.db.GenericQueryBuilder;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.Transaction;
@Component
@Local(value={StorageNetworkIpAddressDao.class})
-@DB(txn=false)
+@DB
public class StorageNetworkIpAddressDaoImpl extends GenericDaoBase<StorageNetworkIpAddressVO, Long> implements StorageNetworkIpAddressDao {
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, Long> countInUserIp;
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, String> listInUseIp;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
index e1605d5..517099a 100755
--- a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
@Component
@Local(value={StorageNetworkIpRangeDao.class})
-@DB(txn=false)
+@DB
public class StorageNetworkIpRangeDaoImpl extends GenericDaoBase<StorageNetworkIpRangeVO, Long> implements StorageNetworkIpRangeDao {
protected final GenericSearchBuilder<StorageNetworkIpRangeVO, Long> countRanges;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
index 4716810..caf7c01 100755
--- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
@@ -65,7 +65,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = {HostDao.class})
-@DB(txn = false)
+@DB
@TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao { //FIXME: , ExternalIdDao {
private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
index e7a7b34..85f37c9 100644
--- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value={AccountGuestVlanMapDao.class})
-@DB(txn=false)
+@DB
public class AccountGuestVlanMapDaoImpl extends GenericDaoBase<AccountGuestVlanMapVO, Long> implements AccountGuestVlanMapDao {
protected SearchBuilder<AccountGuestVlanMapVO> AccountSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
index 01f8861..f0e40c1 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=ExternalFirewallDeviceDao.class) @DB(txn=false)
+@Local(value=ExternalFirewallDeviceDao.class) @DB
public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase<ExternalFirewallDeviceVO, Long> implements ExternalFirewallDeviceDao {
final SearchBuilder<ExternalFirewallDeviceVO> physicalNetworkServiceProviderSearch;
final SearchBuilder<ExternalFirewallDeviceVO> physicalNetworkIdSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
index ea6437d..e8ef0d2 100644
--- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
@@ -29,7 +29,7 @@ import javax.ejb.Local;
import java.util.List;
@Component
-@Local(value=ExternalLoadBalancerDeviceDao.class) @DB(txn=false)
+@Local(value=ExternalLoadBalancerDeviceDao.class) @DB
public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLoadBalancerDeviceVO, Long> implements ExternalLoadBalancerDeviceDao {
final SearchBuilder<ExternalLoadBalancerDeviceVO> physicalNetworkIdSearch;
final SearchBuilder<ExternalLoadBalancerDeviceVO> physicalNetworkServiceProviderSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
index 41f911c..cd7878f 100644
--- a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
@@ -31,7 +31,6 @@ import com.cloud.network.rules.FirewallRule.TrafficType;
import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.tags.dao.ResourceTagsDaoImpl;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
@@ -44,7 +43,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = FirewallRulesDao.class)
-@DB(txn = false)
+@DB
public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> implements FirewallRulesDao {
protected final SearchBuilder<FirewallRuleVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
index 23ccba9..72b357d 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
@@ -40,10 +40,8 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.NetworkOffering;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
-import com.cloud.offerings.dao.NetworkOfferingDaoImpl;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.tags.dao.ResourceTagsDaoImpl;
import com.cloud.utils.db.*;
import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.db.SearchCriteria.Func;
@@ -52,7 +50,7 @@ import com.cloud.utils.net.NetUtils;
@Component
@Local(value = NetworkDao.class)
-@DB(txn = false)
+@DB()
public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao {
SearchBuilder<NetworkVO> AllFieldsSearch;
SearchBuilder<NetworkVO> AccountSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
index bbb9203..882c7fe 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=NetworkDomainDao.class) @DB(txn=false)
+@Local(value=NetworkDomainDao.class) @DB()
public class NetworkDomainDaoImpl extends GenericDaoBase<NetworkDomainVO, Long> implements NetworkDomainDao {
final SearchBuilder<NetworkDomainVO> AllFieldsSearch;
final SearchBuilder<NetworkDomainVO> DomainsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
index b176760..9a2bd76 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=NetworkExternalFirewallDao.class) @DB(txn=false)
+@Local(value=NetworkExternalFirewallDao.class) @DB()
public class NetworkExternalFirewallDaoImpl extends GenericDaoBase<NetworkExternalFirewallVO, Long> implements NetworkExternalFirewallDao {
final SearchBuilder<NetworkExternalFirewallVO> networkIdSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
index c29c164..8d77a5b 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
@@ -29,7 +29,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=NetworkExternalLoadBalancerDao.class) @DB(txn=false)
+@Local(value=NetworkExternalLoadBalancerDao.class) @DB()
public class NetworkExternalLoadBalancerDaoImpl extends GenericDaoBase<NetworkExternalLoadBalancerVO, Long> implements NetworkExternalLoadBalancerDao {
final SearchBuilder<NetworkExternalLoadBalancerVO> networkIdSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
index a4ebd8c..d1402a9 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
-@Local(value=NetworkServiceMapDao.class) @DB(txn=false)
+@Local(value=NetworkServiceMapDao.class) @DB()
public class NetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao {
final SearchBuilder<NetworkServiceMapVO> AllFieldsSearch;
final SearchBuilder<NetworkServiceMapVO> MultipleServicesSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
index 1e26a51..8be29a4 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
@@ -32,7 +32,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=PhysicalNetworkDao.class) @DB(txn=false)
+@Local(value=PhysicalNetworkDao.class) @DB()
public class PhysicalNetworkDaoImpl extends GenericDaoBase<PhysicalNetworkVO, Long> implements PhysicalNetworkDao {
final SearchBuilder<PhysicalNetworkVO> ZoneSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
index 16a23dd..bfe7d25 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
@@ -31,7 +31,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=PhysicalNetworkServiceProviderDao.class) @DB(txn=false)
+@Local(value=PhysicalNetworkServiceProviderDao.class) @DB()
public class PhysicalNetworkServiceProviderDaoImpl extends GenericDaoBase<PhysicalNetworkServiceProviderVO, Long> implements PhysicalNetworkServiceProviderDao {
final SearchBuilder<PhysicalNetworkServiceProviderVO> physicalNetworkSearch;
final SearchBuilder<PhysicalNetworkServiceProviderVO> physicalNetworkServiceProviderSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
index 910616c..2a712a6 100755
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=PhysicalNetworkTrafficTypeDao.class) @DB(txn=false)
+@Local(value=PhysicalNetworkTrafficTypeDao.class) @DB()
public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNetworkTrafficTypeVO, Long> implements PhysicalNetworkTrafficTypeDao {
final SearchBuilder<PhysicalNetworkTrafficTypeVO> physicalNetworkSearch;
final GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> kvmAllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
index 61fe52a..2325c4a 100644
--- a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java
@@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
-@Local(value=PortProfileDao.class) @DB(txn=false)
+@Local(value=PortProfileDao.class) @DB()
public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> implements PortProfileDao {
protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
index 1c5d27e..8dce4e4 100644
--- a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
-@Local(value=VirtualRouterProviderDao.class) @DB(txn=false)
+@Local(value=VirtualRouterProviderDao.class) @DB()
public class VirtualRouterProviderDaoImpl extends GenericDaoBase<VirtualRouterProviderVO, Long> implements VirtualRouterProviderDao {
final SearchBuilder<VirtualRouterProviderVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java
index fd3308d..5a2eeed 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java
@@ -19,14 +19,13 @@ package com.cloud.network.vpc.dao;
import com.cloud.network.vpc.NetworkACLVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
-import com.cloud.utils.db.SearchBuilder;
import org.springframework.stereotype.Component;
import javax.ejb.Local;
@Component
@Local(value = NetworkACLDao.class)
-@DB(txn = false)
+@DB()
public class NetworkACLDaoImpl extends GenericDaoBase<NetworkACLVO, Long> implements NetworkACLDao{
protected NetworkACLDaoImpl() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
index 8162ce8..6bd47bd 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -28,7 +28,7 @@ import java.util.List;
@Component
@Local(value = NetworkACLItemDao.class)
-@DB(txn = false)
+@DB()
public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long> implements NetworkACLItemDao {
protected final SearchBuilder<NetworkACLItemVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
index fe435c0..5ed7fb2 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
@@ -36,7 +36,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = PrivateIpDao.class)
-@DB(txn = false)
+@DB()
public class PrivateIpDaoImpl extends GenericDaoBase<PrivateIpVO, Long> implements PrivateIpDao {
private static final Logger s_logger = Logger.getLogger(PrivateIpDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
index 518237d..e7e006e 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
@@ -40,7 +40,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = StaticRouteDao.class)
-@DB(txn = false)
+@DB()
public class StaticRouteDaoImpl extends GenericDaoBase<StaticRouteVO, Long> implements StaticRouteDao{
protected final SearchBuilder<StaticRouteVO> AllFieldsSearch;
protected final SearchBuilder<StaticRouteVO> NotRevokedSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
index 12868fe..289b896 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
@@ -42,7 +42,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = VpcDao.class)
-@DB(txn = false)
+@DB()
public class VpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements VpcDao{
final GenericSearchBuilder<VpcVO, Integer> CountByOfferingId;
final SearchBuilder<VpcVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
index 13c37c4..e718209 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -31,7 +31,7 @@ import java.util.List;
@Component
@Local(value = VpcGatewayDao.class)
-@DB(txn = false)
+@DB()
public class VpcGatewayDaoImpl extends GenericDaoBase<VpcGatewayVO, Long> implements VpcGatewayDao{
protected final SearchBuilder<VpcGatewayVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
index 2cda547..b5a7e4d 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = VpcOfferingDao.class)
-@DB(txn = false)
+@DB()
public class VpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao{
final SearchBuilder<VpcOfferingVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
index 4b5f1b9..8b503c9 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
@Component
@Local(value = VpcOfferingServiceMapDao.class)
-@DB(txn = false)
+@DB()
public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao{
final SearchBuilder<VpcOfferingServiceMapVO> AllFieldsSearch;
final SearchBuilder<VpcOfferingServiceMapVO> MultipleServicesSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
index 41e8d91..227694f 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java
@@ -33,7 +33,7 @@ import com.cloud.utils.db.SearchCriteria;
import org.springframework.stereotype.Component;
@Component
-@Local(value=VpcServiceMapDao.class) @DB(txn=false)
+@Local(value=VpcServiceMapDao.class) @DB()
public class VpcServiceMapDaoImpl extends GenericDaoBase<VpcServiceMapVO, Long> implements VpcServiceMapDao {
final SearchBuilder<VpcServiceMapVO> AllFieldsSearch;
final SearchBuilder<VpcServiceMapVO> MultipleServicesSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
index 8432473..1c0a1d7 100644
--- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
+++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
@@ -42,7 +42,7 @@ import com.cloud.utils.db.Transaction;
@Component
@Local(value = NetworkOfferingDao.class)
-@DB(txn = false)
+@DB()
public class NetworkOfferingDaoImpl extends GenericDaoBase<NetworkOfferingVO, Long> implements NetworkOfferingDao {
final SearchBuilder<NetworkOfferingVO> NameSearch;
final SearchBuilder<NetworkOfferingVO> SystemOfferingSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
index d2fbfe9..6694eb8 100644
--- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
+++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
@@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
@Component
-@Local(value=NetworkOfferingServiceMapDao.class) @DB(txn=false)
+@Local(value=NetworkOfferingServiceMapDao.class) @DB()
public class NetworkOfferingServiceMapDaoImpl extends GenericDaoBase<NetworkOfferingServiceMapVO, Long> implements NetworkOfferingServiceMapDao {
final SearchBuilder<NetworkOfferingServiceMapVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 14b2abf..b7890a4 100644
--- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -34,7 +34,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
-@Local(value={ServiceOfferingDao.class}) @DB(txn=false)
+@Local(value={ServiceOfferingDao.class}) @DB()
public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Long> implements ServiceOfferingDao {
protected static final Logger s_logger = Logger.getLogger(ServiceOfferingDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
index 052bae4..aa3e0df 100644
--- a/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
@@ -36,7 +36,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = { StoragePoolWorkDao.class })
-@DB(txn = false)
+@DB()
public class StoragePoolWorkDaoImpl extends GenericDaoBase<StoragePoolWorkVO, Long> implements StoragePoolWorkDao {
protected final SearchBuilder<StoragePoolWorkVO> PendingWorkForPrepareForMaintenanceSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
index bf28410..2b79664 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -354,7 +354,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
}
@Override
- @DB(txn = false)
+ @DB()
public Pair<Long, Long> getCountAndTotalByPool(long poolId) {
SearchCriteria<SumCount> sc = TotalSizeByPoolSearch.create();
sc.setParameters("poolId", poolId);
@@ -506,7 +506,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
}
@Override
- @DB(txn = false)
+ @DB()
public Pair<Long, Long> getNonDestroyedCountAndTotalByPool(long poolId) {
SearchCriteria<SumCount> sc = TotalSizeByPoolSearch.create();
sc.setParameters("poolId", poolId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
index 2cdb5ec..8c92765 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
@@ -40,7 +40,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = VersionDao.class)
-@DB(txn = false)
+@DB()
public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements VersionDao {
private static final Logger s_logger = Logger.getLogger(VersionDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
index 174f283..9d54b1e 100644
--- a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java
@@ -35,7 +35,7 @@ import com.cloud.utils.db.DB;
@Component
@Local(value= { UserVmCloneSettingDao.class })
-@DB(txn = false)
+@DB()
public class UserVmCloneSettingDaoImpl extends GenericDaoBase<UserVmCloneSettingVO, Long> implements UserVmCloneSettingDao {
public static final Logger s_logger = Logger.getLogger(UserVmCloneSettingDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java
index 2a6e72b..421343c 100644
--- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java
@@ -28,7 +28,7 @@ import java.util.List;
@Component
@Local(value={GlobalLoadBalancerLbRuleMapDao.class})
-@DB(txn = false)
+@DB()
public class GlobalLoadBalancerLbRuleMapDaoImpl extends GenericDaoBase<GlobalLoadBalancerLbRuleMapVO, Long> implements GlobalLoadBalancerLbRuleMapDao {
private final SearchBuilder<GlobalLoadBalancerLbRuleMapVO> listByGslbRuleId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
index 54a107b..9e2bb36 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
@@ -44,7 +44,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@Local(value = { PrimaryDataStoreDao.class })
-@DB(txn = false)
+@DB()
public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long> implements PrimaryDataStoreDao {
protected final SearchBuilder<StoragePoolVO> AllFieldSearch;
protected final SearchBuilder<StoragePoolVO> DcPodSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/framework/db/src/com/cloud/utils/db/DB.java
----------------------------------------------------------------------
diff --git a/framework/db/src/com/cloud/utils/db/DB.java b/framework/db/src/com/cloud/utils/db/DB.java
index f83a7ea..b67f93e 100644
--- a/framework/db/src/com/cloud/utils/db/DB.java
+++ b/framework/db/src/com/cloud/utils/db/DB.java
@@ -36,24 +36,8 @@ import java.lang.annotation.Target;
* _dao.acquireInLockTable(id);
* ...
* _dao.releaseFromLockTable(id);
- *
- * 3. Annotate methods that are inside a DAO but doesn't use
- * the Transaction class. Generally, these are methods
- * that are utility methods for setting up searches. In
- * this case use @DB(txn=false) to annotate the method.
- * While this is not required, it helps when you're debugging
- * the code and it saves on method calls during runtime.
- *
*/
@Target({TYPE, METHOD})
@Retention(RUNTIME)
public @interface DB {
- /**
- * (Optional) Specifies that the method
- * does not use transaction. This is useful for
- * utility methods within DAO classes which are
- * automatically marked with @DB. By marking txn=false,
- * the method is not surrounded with transaction code.
- */
- boolean txn() default true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
----------------------------------------------------------------------
diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
index ad8c770..b4c02cf 100755
--- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
+++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
@@ -168,7 +168,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
@Override
- @SuppressWarnings("unchecked") @DB(txn=false)
+ @SuppressWarnings("unchecked") @DB()
public <J> GenericSearchBuilder<T, J> createSearchBuilder(Class<J> resultType) {
return new GenericSearchBuilder<T, J>(_entityBeanType, resultType);
}
@@ -282,7 +282,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
setRunLevel(ComponentLifecycle.RUN_LEVEL_SYSTEM);
}
- @Override @DB(txn=false)
+ @Override @DB()
@SuppressWarnings("unchecked")
public T createForUpdate(final ID id) {
final T entity = (T)_factory.newInstance(new Callback[] {NoOp.INSTANCE, new UpdateBuilder(this)});
@@ -296,12 +296,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return entity;
}
- @Override @DB(txn=false)
+ @Override @DB()
public T createForUpdate() {
return createForUpdate(null);
}
- @Override @DB(txn=false)
+ @Override @DB()
public <K> K getNextInSequence(final Class<K> clazz, final String name) {
final TableGenerator tg = _tgs.get(name);
assert (tg != null) : "Couldn't find Table generator using " + name;
@@ -309,7 +309,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return s_seqFetcher.getNextSequence(clazz, tg);
}
- @Override @DB(txn=false)
+ @Override @DB()
public <K> K getRandomlyIncreasingNextInSequence(final Class<K> clazz, final String name) {
final TableGenerator tg = _tgs.get(name);
assert (tg != null) : "Couldn't find Table generator using " + name;
@@ -317,19 +317,19 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return s_seqFetcher.getRandomNextSequence(clazz, tg);
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> lockRows(final SearchCriteria<T> sc, final Filter filter, final boolean exclusive) {
return search(sc, filter, exclusive, false);
}
- @Override @DB(txn=false)
+ @Override @DB()
public T lockOneRandomRow(final SearchCriteria<T> sc, final boolean exclusive) {
final Filter filter = new Filter(1);
final List<T> beans = search(sc, filter, exclusive, true);
return beans.isEmpty() ? null : beans.get(0);
}
- @DB(txn=false)
+ @DB()
protected List<T> search(SearchCriteria<T> sc, final Filter filter, final Boolean lock, final boolean cache) {
if (_removed != null) {
if (sc == null) {
@@ -340,7 +340,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return searchIncludingRemoved(sc, filter, lock, cache);
}
- @DB(txn=false)
+ @DB()
protected List<T> search(SearchCriteria<T> sc, final Filter filter, final Boolean lock, final boolean cache, final boolean enable_query_cache) {
if (_removed != null) {
if (sc == null) {
@@ -499,7 +499,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public <M> List<M> customSearch(SearchCriteria<M> sc, final Filter filter) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@@ -508,7 +508,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return customSearchIncludingRemoved(sc, filter);
}
- @DB(txn=false)
+ @DB()
protected void setField(Object entity, Field field, ResultSet rs, int index) throws SQLException {
try {
final Class<?> type = field.getType();
@@ -652,7 +652,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false) @SuppressWarnings("unchecked")
+ @DB() @SuppressWarnings("unchecked")
protected <M> M getObject(Class<M> type, ResultSet rs, int index) throws SQLException {
if (type == String.class) {
byte[] bytes = rs.getBytes(index);
@@ -744,7 +744,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected int addJoinAttributes(int count, PreparedStatement pstmt, Collection<JoinBuilder<SearchCriteria<?>>> joins) throws SQLException {
for (JoinBuilder<SearchCriteria<?>> join : joins) {
for (final Pair<Attribute, Object> value : join.getT().getValues()) {
@@ -832,12 +832,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected Attribute findAttributeByFieldName(String name) {
return _allAttributes.get(name);
}
- @DB(txn=false)
+ @DB()
protected String buildSelectByIdSql(final StringBuilder sql) {
if (_idField == null) {
return null;
@@ -857,13 +857,13 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return sql.toString();
}
- @DB(txn=false)
+ @DB()
@Override
public Class<T> getEntityBeanType() {
return _entityBeanType;
}
- @DB(txn=false)
+ @DB()
protected T findOneIncludingRemovedBy(final SearchCriteria<T> sc) {
Filter filter = new Filter(1);
List<T> results = searchIncludingRemoved(sc, filter, null, false);
@@ -872,7 +872,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
@Override
- @DB(txn=false)
+ @DB()
public T findOneBy(final SearchCriteria<T> sc) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@@ -880,7 +880,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return findOneIncludingRemovedBy(sc);
}
- @DB(txn=false)
+ @DB()
protected List<T> listBy(final SearchCriteria<T> sc, final Filter filter) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@@ -888,7 +888,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return listIncludingRemovedBy(sc, filter);
}
- @DB(txn=false)
+ @DB()
protected List<T> listBy(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
if (_removed != null) {
sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
@@ -896,27 +896,27 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return listIncludingRemovedBy(sc, filter, enable_query_cache);
}
- @DB(txn=false)
+ @DB()
protected List<T> listBy(final SearchCriteria<T> sc) {
return listBy(sc, null);
}
- @DB(txn=false)
+ @DB()
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
return searchIncludingRemoved(sc, filter, null, false, enable_query_cache);
}
- @DB(txn=false)
+ @DB()
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc, final Filter filter) {
return searchIncludingRemoved(sc, filter, null, false);
}
- @DB(txn=false)
+ @DB()
protected List<T> listIncludingRemovedBy(final SearchCriteria<T> sc) {
return listIncludingRemovedBy(sc, null);
}
- @Override @DB(txn=false)
+ @Override @DB()
@SuppressWarnings("unchecked")
public T findById(final ID id) {
if (_cache != null) {
@@ -927,26 +927,26 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public T findByUuid(final String uuid) {
SearchCriteria<T> sc = createSearchCriteria();
sc.addAnd("uuid", SearchCriteria.Op.EQ, uuid);
return findOneBy(sc);
}
- @Override @DB(txn=false)
+ @Override @DB()
public T findByUuidIncludingRemoved(final String uuid) {
SearchCriteria<T> sc = createSearchCriteria();
sc.addAnd("uuid", SearchCriteria.Op.EQ, uuid);
return findOneIncludingRemovedBy(sc);
}
- @Override @DB(txn=false)
+ @Override @DB()
public T findByIdIncludingRemoved(ID id) {
return findById(id, true, null);
}
- @Override @DB(txn=false)
+ @Override @DB()
public T findById(final ID id, boolean fresh) {
if(!fresh) {
return findById(id);
@@ -958,7 +958,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return lockRow(id, null);
}
- @Override @DB(txn=false)
+ @Override @DB()
public T lockRow(ID id, Boolean lock) {
return findById(id, false, lock);
}
@@ -987,7 +987,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public T acquireInLockTable(ID id) {
return acquireInLockTable(id, _timeoutSeconds);
}
@@ -1018,7 +1018,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return txn.release(_table + id);
}
- @Override @DB(txn=false)
+ @Override @DB()
public boolean lockInLockTable(final String id) {
return lockInLockTable(id, _timeoutSeconds);
}
@@ -1035,12 +1035,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return txn.release(_table + id);
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> listAllIncludingRemoved() {
return listAllIncludingRemoved(null);
}
- @DB(txn=false)
+ @DB()
protected List<Object> addGroupBy(final StringBuilder sql, SearchCriteria<?> sc) {
Pair<GroupBy<?, ?, ?>, List<Object>> groupBys = sc.getGroupBy();
if (groupBys != null) {
@@ -1051,7 +1051,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected void addFilter(final StringBuilder sql, final Filter filter) {
if (filter != null) {
if (filter.getOrderBy() != null) {
@@ -1067,7 +1067,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> listAllIncludingRemoved(final Filter filter) {
final StringBuilder sql = createPartialSelectSql(null, false);
addFilter(sql, filter);
@@ -1098,12 +1098,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> listAll() {
return listAll(null);
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> listAll(final Filter filter) {
if (_removed == null) {
return listAllIncludingRemoved(filter);
@@ -1174,7 +1174,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected StringBuilder createPartialSelectSql(SearchCriteria<?> sc, final boolean whereClause, final boolean enable_query_cache) {
StringBuilder sql = new StringBuilder(enable_query_cache ? _partialQueryCacheSelectSql.first() : _partialSelectSql.first());
if (sc != null && !sc.isSelectAll()) {
@@ -1189,7 +1189,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return sql;
}
- @DB(txn=false)
+ @DB()
protected StringBuilder createPartialSelectSql(SearchCriteria<?> sc, final boolean whereClause) {
StringBuilder sql = new StringBuilder(_partialSelectSql.first());
if (sc != null && !sc.isSelectAll()) {
@@ -1205,7 +1205,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
- @DB(txn = false)
+ @DB()
protected void addJoins(StringBuilder str, Collection<JoinBuilder<SearchCriteria<?>>> joins) {
int fromIndex = str.lastIndexOf("WHERE");
if (fromIndex == -1) {
@@ -1238,24 +1238,24 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> search(final SearchCriteria<T> sc, final Filter filter) {
return search(sc, filter, null, false);
}
- @Override @DB(txn=false)
+ @Override @DB()
public Pair<List<T>, Integer> searchAndCount(final SearchCriteria<T> sc, final Filter filter) {
List<T> objects = search(sc, filter, null, false);
Integer count = getCount(sc);
return new Pair<List<T>, Integer>(objects, count);
}
- @Override @DB(txn=false)
+ @Override @DB()
public List<T> search(final SearchCriteria<T> sc, final Filter filter, final boolean enable_query_cache) {
return search(sc, filter, null, false, enable_query_cache);
}
- @Override @DB(txn=false)
+ @Override @DB()
public boolean update(ID id, T entity) {
assert Enhancer.isEnhanced(entity.getClass()) : "Entity is not generated by this dao";
@@ -1264,14 +1264,14 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return result;
}
- @DB(txn=false)
+ @DB()
public int update(final T entity, final SearchCriteria<T> sc, Integer rows) {
final UpdateBuilder ub = getUpdateBuilder(entity);
return update(ub, sc, rows);
}
@Override
- @DB(txn=false)
+ @DB()
public int update(final T entity, final SearchCriteria<T> sc) {
final UpdateBuilder ub = getUpdateBuilder(entity);
return update(ub, sc, null);
@@ -1390,7 +1390,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
txn.commit();
}
- @DB(txn=false)
+ @DB()
protected Object generateValue(final Attribute attr) {
if (attr.is(Attribute.Flag.Created) || attr.is(Attribute.Flag.Removed)) {
return new Date();
@@ -1414,7 +1414,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected void prepareAttribute(final int j, final PreparedStatement pstmt, final Attribute attr, Object value) throws SQLException {
if (attr.is(Attribute.Flag.DaoGenerated) && value == null) {
value = generateValue(attr);
@@ -1519,7 +1519,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected int prepareAttributes(final PreparedStatement pstmt, final Object entity, final Attribute[] attrs, final int index) throws SQLException {
int j = 0;
for (int i = 0; i < attrs.length; i++) {
@@ -1536,7 +1536,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return j;
}
- @SuppressWarnings("unchecked") @DB(txn=false)
+ @SuppressWarnings("unchecked") @DB()
protected T toEntityBean(final ResultSet result, final boolean cache) throws SQLException {
final T entity = (T)_factory.newInstance(new Callback[] {NoOp.INSTANCE, new UpdateBuilder(this)});
@@ -1553,7 +1553,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return entity;
}
- @DB(txn=false)
+ @DB()
protected T toVO(ResultSet result, boolean cache) throws SQLException {
T entity;
try {
@@ -1575,7 +1575,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return entity;
}
- @DB(txn=false)
+ @DB()
protected void toEntityBean(final ResultSet result, final T entity) throws SQLException {
ResultSetMetaData meta = result.getMetaData();
for (int index = 1, max = meta.getColumnCount(); index <= max; index++) {
@@ -1586,7 +1586,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn = true)
+ @DB()
@SuppressWarnings("unchecked")
protected void loadCollection(T entity, Attribute attr) {
EcInfo ec = (EcInfo)attr.attache;
@@ -1688,7 +1688,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected void setField(final Object entity, final ResultSet rs, ResultSetMetaData meta, final int index) throws SQLException {
Attribute attr = _allColumns.get(new Pair<String, String>(meta.getTableName(index), meta.getColumnName(index)));
if ( attr == null ){
@@ -1745,7 +1745,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
protected Cache _cache;
- @DB(txn=false)
+ @DB()
protected void createCache(final Map<String, ? extends Object> params) {
final String value = (String)params.get("cache.size");
@@ -1762,7 +1762,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @Override @DB(txn=false)
+ @Override @DB()
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
@@ -1778,19 +1778,19 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
return true;
}
- @DB(txn=false)
+ @DB()
public static <T> UpdateBuilder getUpdateBuilder(final T entityObject) {
final Factory factory = (Factory)entityObject;
assert(factory != null);
return (UpdateBuilder)factory.getCallback(1);
}
- @Override @DB(txn=false)
+ @Override @DB()
public SearchBuilder<T> createSearchBuilder() {
return new SearchBuilder<T>(_entityBeanType);
}
- @Override @DB(txn=false)
+ @Override @DB()
public SearchCriteria<T> createSearchCriteria() {
SearchBuilder<T> builder = createSearchBuilder();
return builder.create();
@@ -1859,7 +1859,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
}
- @DB(txn=false)
+ @DB()
protected StringBuilder createCountSelect(SearchCriteria<?> sc, final boolean whereClause) {
StringBuilder sql = new StringBuilder(_count);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java
index b21010b..3a6aef7 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java
@@ -18,16 +18,11 @@
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.database;
-import java.util.List;
-import java.util.Map;
-
import javax.ejb.Local;
-import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@@ -36,7 +31,7 @@ import com.cloud.utils.db.GenericQueryBuilder;
@Component
@Local(value=BaremetalDhcpDao.class)
-@DB(txn=false)
+@DB()
public class BaremetalDhcpDaoImpl extends GenericDaoBase<BaremetalDhcpVO, Long> implements BaremetalDhcpDao {
public BaremetalDhcpDaoImpl() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java
index 6afbc1b..bede347 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java
@@ -18,16 +18,11 @@
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.database;
-import java.util.List;
-import java.util.Map;
-
import javax.ejb.Local;
-import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
@@ -36,6 +31,6 @@ import com.cloud.utils.db.GenericQueryBuilder;
@Component
@Local(value = {BaremetalPxeDao.class})
-@DB(txn = false)
+@DB()
public class BaremetalPxeDaoImpl extends GenericDaoBase<BaremetalPxeVO, Long> implements BaremetalPxeDao {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
index 5cb9b02..5dc6f79 100644
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
@@ -19,12 +19,10 @@ package com.cloud.ucs.database;
import javax.ejb.Local;
-import org.springframework.stereotype.Component;
-
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = { UcsBladeDao.class })
-@DB(txn = false)
+@DB()
public class UcsBladeDaoImpl extends GenericDaoBase<UcsBladeVO, Long> implements UcsBladeDao {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
index 93c0885..9500886 100644
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
@@ -19,12 +19,10 @@ package com.cloud.ucs.database;
import javax.ejb.Local;
-import org.springframework.stereotype.Component;
-
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = { UcsManagerDao.class })
-@DB(txn = false)
+@DB()
public class UcsManagerDaoImpl extends GenericDaoBase<UcsManagerVO, Long> implements UcsManagerDao {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
index 7d2d128..20d68b0 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
@@ -32,7 +32,7 @@
import com.cloud.utils.db.SearchCriteria.Op;
@Component
- @Local(value=LegacyZoneDao.class) @DB(txn=false)
+ @Local(value=LegacyZoneDao.class) @DB
public class LegacyZoneDaoImpl extends GenericDaoBase<LegacyZoneVO, Long> implements LegacyZoneDao {
protected static final Logger s_logger = Logger.getLogger(LegacyZoneDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
index 9f5796a..6dbbbed 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
@@ -32,7 +32,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=VmwareDatacenterDao.class) @DB(txn=false)
+@Local(value=VmwareDatacenterDao.class) @DB
public class VmwareDatacenterDaoImpl extends GenericDaoBase<VmwareDatacenterVO, Long> implements VmwareDatacenterDao {
protected static final Logger s_logger = Logger.getLogger(VmwareDatacenterDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
index cc25573..5379bba 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=CiscoNexusVSMDeviceDao.class) @DB(txn=false)
+@Local(value=CiscoNexusVSMDeviceDao.class) @DB
public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase<CiscoNexusVSMDeviceVO, Long> implements CiscoNexusVSMDeviceDao {
protected static final Logger s_logger = Logger.getLogger(CiscoNexusVSMDeviceDaoImpl.class);
final SearchBuilder<CiscoNexusVSMDeviceVO> mgmtVlanIdSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java
index 30dd06d..e9af106 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java
@@ -30,7 +30,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
@Component
-@Local(value=NetScalerPodDao.class) @DB(txn=false)
+@Local(value=NetScalerPodDao.class) @DB
public class NetScalerPodDaoImpl extends GenericDaoBase<NetScalerPodVO, Long> implements NetScalerPodDao {
final SearchBuilder<NetScalerPodVO> podIdSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
index bc58021..1936b85 100644
--- a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
+++ b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java
@@ -23,7 +23,6 @@ import javax.ejb.Local;
import org.springframework.stereotype.Component;
import com.cloud.dc.DedicatedResourceVO;
-import com.cloud.dc.HostPodVO;
import com.cloud.utils.Pair;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@@ -35,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
@Component
-@Local(value={DedicatedResourceDao.class}) @DB(txn = false)
+@Local(value={DedicatedResourceDao.class}) @DB
public class DedicatedResourceDaoImpl extends GenericDaoBase<DedicatedResourceVO, Long> implements DedicatedResourceDao {
protected final SearchBuilder<DedicatedResourceVO> ZoneSearch;
protected final SearchBuilder<DedicatedResourceVO> PodSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
index 145b6c5..1aef649 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map;
@Local(value = NetworkDao.class)
-@DB(txn = false)
+@DB()
public class MockNetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao{
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
index a8208dd..f6a3b13 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
@@ -33,10 +33,9 @@ import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingDaoImpl;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.GenericDaoBase;
@Local(value = NetworkOfferingDao.class)
-@DB(txn = false)
+@DB()
public class MockNetworkOfferingDaoImpl extends NetworkOfferingDaoImpl implements NetworkOfferingDao{
private static final Logger s_logger = Logger.getLogger(MockNetworkOfferingDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
index d1e8354..a7f77bc 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
@@ -16,19 +16,15 @@
// under the License.
package com.cloud.vpc.dao;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.ejb.Local;
import com.cloud.network.Network.Service;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl;
import com.cloud.utils.db.DB;
-import com.cloud.utils.db.SearchCriteria;
@Local(value = NetworkOfferingServiceMapDao.class)
-@DB(txn = false)
+@DB()
public class MockNetworkOfferingServiceMapDaoImpl extends NetworkOfferingServiceMapDaoImpl{
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
index 103f04e..c5c0a06 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
@@ -28,7 +28,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = NetworkServiceMapDao.class)
-@DB(txn = false)
+@DB()
public class MockNetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao{
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
index 5e1c2ec..e7674e0 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
@@ -32,7 +32,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = VpcDao.class)
-@DB(txn = false)
+@DB()
public class MockVpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements VpcDao{
private static final Logger s_logger = Logger.getLogger(MockNetworkOfferingDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
index 329931e..48df3d4 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
@@ -24,7 +24,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = VpcOfferingDao.class)
-@DB(txn = false)
+@DB()
public class MockVpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao{
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd853673/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
index 3357686..9618536 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
@@ -27,7 +27,7 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@Local(value = VpcOfferingServiceMapDao.class)
-@DB(txn = false)
+@DB()
public class MockVpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao{
/* (non-Javadoc)