Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 606391864D for ; Mon, 23 Nov 2015 10:26:52 +0000 (UTC) Received: (qmail 24190 invoked by uid 500); 23 Nov 2015 10:26:46 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 24033 invoked by uid 500); 23 Nov 2015 10:26:46 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 23136 invoked by uid 99); 23 Nov 2015 10:26:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Nov 2015 10:26:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E95B3E04C2; Mon, 23 Nov 2015 10:26:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Mon, 23 Nov 2015 10:26:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/9] git commit: updated refs/heads/master to a6b6f41 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java index 2c64746..6a8ff56 100644 --- a/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java @@ -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 implements HostDetailsDao { protected final SearchBuilder HostSearch; protected final SearchBuilder DetailSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java index e275e04..48eb8f1 100644 --- a/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java +++ b/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java @@ -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 implements HostTagsDao { protected final SearchBuilder HostSearch; protected final GenericSearchBuilder DistinctImplictTagsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java index 2b94e69..b4d2f6f 100644 --- a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java +++ b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java @@ -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 implements HypervisorCapabilitiesDao { private static final Logger s_logger = Logger.getLogger(HypervisorCapabilitiesDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java index fd4bfd5..713fec3 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java @@ -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 implements AutoScalePolicyConditionMapDao { private SearchCriteria getSearchCriteria(Long policyId, Long conditionId) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java index 684aaad..a0dc989 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java @@ -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 implements AutoScalePolicyDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java index 9f73cf8..eb47165 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java @@ -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 implements AutoScaleVmGroupDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java index 01aac2f..830a8c4 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java @@ -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 implements AutoScaleVmGroupPolicyMapDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java index 463477c..24a3c10 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java @@ -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 implements AutoScaleVmGroupVmMapDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java index 3e2dd25..cc40d16 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java @@ -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 implements AutoScaleVmProfileDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java index 2bb8fd3..db4f781 100644 --- a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java @@ -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 implements ConditionDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java index 0abc3a0..dde7d03 100644 --- a/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java @@ -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 implements CounterDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 a31798f..686dc9c 100644 --- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java @@ -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 implements AccountGuestVlanMapDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 11fa5ed..2b25b73 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java @@ -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 implements ExternalFirewallDeviceDao { final SearchBuilder physicalNetworkServiceProviderSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 da23bcf..f2706d9 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java @@ -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 implements ExternalLoadBalancerDeviceDao { final SearchBuilder physicalNetworkIdSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java index e89536b..bfaf562 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java @@ -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 implements FirewallRulesCidrsDao { private static final Logger s_logger = Logger.getLogger(FirewallRulesCidrsDaoImpl.class); protected final SearchBuilder CidrsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 6a43486..45ab1f8 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java @@ -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 implements FirewallRulesDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java index 63278c2..7b5746d 100644 --- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java @@ -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 implements IPAddressDao { private static final Logger s_logger = Logger.getLogger(IPAddressDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java index 54d34fa..1c3f231 100644 --- a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java @@ -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 implements InlineLoadBalancerNicMapDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java index 52c1d0e..45927f3 100644 --- a/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java @@ -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 implements LBHealthCheckPolicyDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java index e8295c5..717458f 100644 --- a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java @@ -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 implements LBStickinessPolicyDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java index 9986337..2833c33 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java @@ -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 implements LoadBalancerCertMapDao { private final SearchBuilder listByCertId; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java index 8ef6215..0ad768d 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java @@ -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 implements LoadBalancerDao { private final SearchBuilder ListByIp; protected final SearchBuilder TransitionStateSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java index cbfda8f..b32320a 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java @@ -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 implements LoadBalancerVMMapDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java index fffb42b..75bdf30 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java @@ -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 implements MonitoringServiceDao { private final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 3c79985..0c4354b 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java @@ -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 implements NetworkDao { SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java index 0874a3b..7fc8cda 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java @@ -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 implements NetworkDetailsDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 e5ee255..188f306 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java @@ -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 implements NetworkDomainDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 803da2f..e015118 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java @@ -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 implements NetworkExternalFirewallDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 d7432ce..1dc07a7 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java @@ -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 implements NetworkExternalLoadBalancerDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java index ebb1eb2..d8cfd08 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java @@ -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 implements NetworkRuleConfigDao { protected SearchBuilder SecurityGroupIdSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 b2cb7e4..31e0830 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java @@ -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 implements NetworkServiceMapDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java index b92512e..451320a 100644 --- a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java @@ -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 implements OpRouterMonitorServiceDao { } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java index ee13197..14edd80 100644 --- a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java @@ -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 implements OvsProviderDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 fc9eccf..235db0c 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java @@ -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 implements PhysicalNetworkDao { final SearchBuilder ZoneSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 f241a41..75c70d1 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java @@ -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 implements PhysicalNetworkServiceProviderDao { final SearchBuilder physicalNetworkSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 fe7d49c..4811b59 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java @@ -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 implements PhysicalNetworkTrafficTypeDao { final SearchBuilder physicalNetworkSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 211280d..40d5c8e 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java @@ -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 implements PortProfileDao { protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java index 965d433..3aa2e74 100644 --- a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java @@ -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 implements RemoteAccessVpnDao { private static final Logger s_logger = Logger.getLogger(RemoteAccessVpnDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java index cd8d9e2..4db826b 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java @@ -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 implements Site2SiteCustomerGatewayDao { private static final Logger s_logger = Logger.getLogger(Site2SiteCustomerGatewayDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java index e32533f..b55f39a 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java @@ -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 implements Site2SiteVpnConnectionDao { private static final Logger s_logger = Logger.getLogger(Site2SiteVpnConnectionDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java index 658ca0a..80465f9 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java @@ -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 implements Site2SiteVpnGatewayDao { @Inject protected IPAddressDao _addrDao; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java index 99354c5..185c18a 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java @@ -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 implements SslCertDao { private final SearchBuilder listByAccountId; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java index f0ba199..9a7737f 100644 --- a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java @@ -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 implements UserIpv6AddressDao { private static final Logger s_logger = Logger.getLogger(IPAddressDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 4baf0a0..4d995c9 100644 --- a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java @@ -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 implements VirtualRouterProviderDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java b/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java index 9f5e1dc..b8acaf4 100644 --- a/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java @@ -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 implements VpnUserDao { private final SearchBuilder AccountSearch; private final SearchBuilder AccountNameSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java index 3aa6181..29cba51 100644 --- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java @@ -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 implements PortForwardingRulesDao { protected final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java index 78bc128..019cf5f 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java @@ -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 implements SecurityGroupDao { private SearchBuilder AccountIdSearch; private SearchBuilder AccountIdNameSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java index f6ea339..64c42bf 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java @@ -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 implements SecurityGroupRuleDao { @Inject http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java index 05feee1..640536c 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java @@ -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 implements SecurityGroupRulesDao { private SearchBuilder AccountGroupNameSearch; private SearchBuilder AccountSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java index 873d193..a2ec95c 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java @@ -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 implements SecurityGroupVMMapDao { private SearchBuilder ListByIpAndVmId; private SearchBuilder ListByVmId; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java index d66590f..9b0bf08 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java @@ -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 implements SecurityGroupWorkDao { private static final Logger s_logger = Logger.getLogger(SecurityGroupWorkDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java index 8fe9375..7620b15 100644 --- a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java @@ -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 implements VmRulesetLogDao { protected static final Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class); private SearchBuilder VmIdSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 bc178d3..00bb1d8 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java @@ -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 implements NetworkACLDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java index 4c2574e..395c9b2 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java @@ -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 implements NetworkACLItemCidrsDao { private static final Logger s_logger = Logger.getLogger(NetworkACLItemCidrsDaoImpl.class); protected final SearchBuilder cidrsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 15f9014..eb957a9 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java @@ -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 implements NetworkACLItemDao { private static final Logger s_logger = Logger.getLogger(NetworkACLItemDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 2178452..8b090fd 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.vpc.dao; import java.util.Date; 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.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = PrivateIpDao.class) @DB() public class PrivateIpDaoImpl extends GenericDaoBase implements PrivateIpDao { private static final Logger s_logger = Logger.getLogger(PrivateIpDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 d2c2a73..596cf98 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = StaticRouteDao.class) @DB() public class StaticRouteDaoImpl extends GenericDaoBase implements StaticRouteDao { protected final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 b06560d..4e13fe4 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.vpc.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -40,7 +39,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = VpcDao.class) @DB() public class VpcDaoImpl extends GenericDaoBase implements VpcDao { final GenericSearchBuilder CountByOfferingId; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 73e7df3..284fd88 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.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 = VpcGatewayDao.class) @DB() public class VpcGatewayDaoImpl extends GenericDaoBase implements VpcGatewayDao { protected final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 8ea0a8a..15a1cc4 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.vpc.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = VpcOfferingDao.class) @DB() public class VpcOfferingDaoImpl extends GenericDaoBase implements VpcOfferingDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 5f8cbff..9679c3a 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = VpcOfferingServiceMapDao.class) @DB() public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase implements VpcOfferingServiceMapDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 cb7ddec..753c45f 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = VpcServiceMapDao.class) @DB() public class VpcServiceMapDaoImpl extends GenericDaoBase implements VpcServiceMapDao { final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 caa16d2..5a6092e 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.offerings.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.EntityExistsException; @@ -41,7 +40,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = NetworkOfferingDao.class) @DB() public class NetworkOfferingDaoImpl extends GenericDaoBase implements NetworkOfferingDao { final SearchBuilder NameSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 e8f5520..b667e58 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.offerings.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.Func; @Component -@Local(value = NetworkOfferingServiceMapDao.class) @DB() public class NetworkOfferingServiceMapDaoImpl extends GenericDaoBase implements NetworkOfferingServiceMapDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java index 2ecf3fb..ecf1aab 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.projects.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {ProjectAccountDao.class}) public class ProjectAccountDaoImpl extends GenericDaoBase implements ProjectAccountDao { protected final SearchBuilder AllFieldsSearch; final GenericSearchBuilder AdminSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java index b2cf2d8..560f8dc 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.projects.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {ProjectDao.class}) public class ProjectDaoImpl extends GenericDaoBase implements ProjectDao { private static final Logger s_logger = Logger.getLogger(ProjectDaoImpl.class); protected final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java index 0dff4af..2fc74b9 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.projects.dao; import java.sql.Date; 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.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ProjectInvitationDao.class}) public class ProjectInvitationDaoImpl extends GenericDaoBase implements ProjectInvitationDao { private static final Logger s_logger = Logger.getLogger(ProjectInvitationDaoImpl.class); protected final SearchBuilder AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java b/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java index 4421e87..ac438b0 100644 --- a/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java +++ b/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.secstorage; import java.util.Date; -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 = {CommandExecLogDao.class}) public class CommandExecLogDaoImpl extends GenericDaoBase implements CommandExecLogDao { protected final SearchBuilder ExpungeSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 4a5a8b5..f54c558 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java @@ -21,7 +21,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.EntityExistsException; @@ -41,7 +40,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.dao.UserVmDetailsDao; @Component -@Local(value = {ServiceOfferingDao.class}) @DB() public class ServiceOfferingDaoImpl extends GenericDaoBase implements ServiceOfferingDao { protected static final Logger s_logger = Logger.getLogger(ServiceOfferingDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java index 6e504bc..fa64389 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.service.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.service.ServiceOfferingDetailsVO; @Component -@Local(value = ServiceOfferingDetailsDao.class) public class ServiceOfferingDetailsDaoImpl extends ResourceDetailsDaoBase implements ServiceOfferingDetailsDao { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java index ba84062..41993b6 100644 --- a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.storage.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import javax.persistence.EntityExistsException; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {DiskOfferingDao.class}) public class DiskOfferingDaoImpl extends GenericDaoBase implements DiskOfferingDao { private final SearchBuilder DomainIdSearch; private final SearchBuilder PrivateDiskOfferingSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java index c68eebb..8ffb54a 100644 --- a/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import com.cloud.storage.GuestOSCategoryVO; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = {GuestOSCategoryDao.class}) public class GuestOSCategoryDaoImpl extends GenericDaoBase implements GuestOSCategoryDao { protected GuestOSCategoryDaoImpl() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java index 435976b..178eab8 100644 --- a/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {GuestOSDao.class}) public class GuestOSDaoImpl extends GenericDaoBase implements GuestOSDao { protected final SearchBuilder Search; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java index 5a855b2..29471f9 100644 --- a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; import java.util.Date; -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 = {GuestOSHypervisorDao.class}) public class GuestOSHypervisorDaoImpl extends GenericDaoBase implements GuestOSHypervisorDao { protected final SearchBuilder guestOsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java index 3a5c385..ec1a3a2 100644 --- a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -39,7 +38,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {LaunchPermissionDao.class}) public class LaunchPermissionDaoImpl extends GenericDaoBase implements LaunchPermissionDao { private static final Logger s_logger = Logger.getLogger(LaunchPermissionDaoImpl.class); private static final String REMOVE_LAUNCH_PERMISSION = "DELETE FROM `cloud`.`launch_permission`" + " WHERE template_id = ? AND account_id = ?"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java index ccca944..9483f1c 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java @@ -21,7 +21,6 @@ import java.sql.ResultSet; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -51,7 +50,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.VMInstanceDao; @Component -@Local(value = {SnapshotDao.class}) public class SnapshotDaoImpl extends GenericDaoBase implements SnapshotDao { public static final Logger s_logger = Logger.getLogger(SnapshotDaoImpl.class.getName()); // TODO: we should remove these direct sqls http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java index 033a82d..73b236f 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {SnapshotPolicyDao.class}) public class SnapshotPolicyDaoImpl extends GenericDaoBase implements SnapshotPolicyDao { private final SearchBuilder VolumeIdSearch; private final SearchBuilder VolumeIdIntervalSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java index ddf8b3d..b1e6d12 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.storage.dao; import java.util.Date; 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 = {SnapshotScheduleDao.class}) public class SnapshotScheduleDaoImpl extends GenericDaoBase implements SnapshotScheduleDao { protected final SearchBuilder executableSchedulesSearch; protected final SearchBuilder coincidingSchedulesSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java index de7141f..1e74d25 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey.Scope; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; -@Local(value = StoragePoolDetailsDao.class) public class StoragePoolDetailsDaoImpl extends ResourceDetailsDaoBase implements StoragePoolDetailsDao, ScopedConfigStorage { public StoragePoolDetailsDaoImpl() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java index c1a7657..2b7b0f7 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {StoragePoolHostDao.class}) public class StoragePoolHostDaoImpl extends GenericDaoBase implements StoragePoolHostDao { public static final Logger s_logger = Logger.getLogger(StoragePoolHostDaoImpl.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 99e96a5..d712b03 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -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 = {StoragePoolWorkDao.class}) @DB() public class StoragePoolWorkDaoImpl extends GenericDaoBase implements StoragePoolWorkDao { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java index 191fc4c..068e1ee 100644 --- a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; 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.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {UploadDao.class}) public class UploadDaoImpl extends GenericDaoBase implements UploadDao { public static final Logger s_logger = Logger.getLogger(UploadDaoImpl.class.getName()); protected final SearchBuilder typeUploadStatusSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 02fb4b4..58922fe 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -63,7 +62,6 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {VMTemplateDao.class}) public class VMTemplateDaoImpl extends GenericDaoBase implements VMTemplateDao { private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class);