You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/23 11:26:46 UTC
[2/9] git commit: updated refs/heads/master to a6b6f41
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/element/SecurityGroupElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/SecurityGroupElement.java b/server/src/com/cloud/network/element/SecurityGroupElement.java
index 356fece..86c862b 100644
--- a/server/src/com/cloud/network/element/SecurityGroupElement.java
+++ b/server/src/com/cloud/network/element/SecurityGroupElement.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
@@ -38,7 +37,6 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = NetworkElement.class)
public class SecurityGroupElement extends AdapterBase implements NetworkElement {
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 2a1dd40..ce96b14 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.command.admin.router.ConfigureOvsElementCmd;
@@ -109,8 +108,6 @@ import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.UserVmDao;
import com.google.gson.Gson;
-@Local(value = { NetworkElement.class, FirewallServiceProvider.class, DhcpServiceProvider.class, UserDataServiceProvider.class, StaticNatServiceProvider.class,
- LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, RemoteAccessVPNServiceProvider.class, NetworkMigrationResponder.class })
public class VirtualRouterElement extends AdapterBase implements VirtualRouterElementService, DhcpServiceProvider, UserDataServiceProvider, SourceNatServiceProvider,
StaticNatServiceProvider, FirewallServiceProvider, LoadBalancingServiceProvider, PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer,
NetworkMigrationResponder, AggregatedCommandExecutor {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 078eab3..8d25ae9 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.network.topology.NetworkTopology;
@@ -78,9 +77,6 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = { NetworkElement.class, FirewallServiceProvider.class, DhcpServiceProvider.class, UserDataServiceProvider.class, StaticNatServiceProvider.class,
- LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, VpcProvider.class, Site2SiteVpnServiceProvider.class,
- NetworkACLServiceProvider.class })
public class VpcVirtualRouterElement extends VirtualRouterElement implements VpcProvider, Site2SiteVpnServiceProvider, NetworkACLServiceProvider {
private static final Logger s_logger = Logger.getLogger(VpcVirtualRouterElement.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index 39fc33c..b7e0d14 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -98,7 +97,6 @@ import com.cloud.vm.UserVmVO;
import com.cloud.vm.dao.UserVmDao;
@Component
-@Local(value = {FirewallService.class, FirewallManager.class})
public class FirewallManagerImpl extends ManagerBase implements FirewallService, FirewallManager, NetworkRuleApplier {
private static final Logger s_logger = Logger.getLogger(FirewallManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 5e80bea..4e3a981 100644
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -18,7 +18,6 @@ package com.cloud.network.guru;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -53,7 +52,6 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = {NetworkGuru.class})
public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(ControlNetworkGuru.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/DirectNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
index 018ab90..f741651 100644
--- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
@@ -18,7 +18,6 @@ package com.cloud.network.guru;
import java.util.List;
-import javax.ejb.Local;
import javax.inject.Inject;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
@@ -73,7 +72,6 @@ import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.NicSecondaryIpDao;
-@Local(value = {NetworkGuru.class})
public class DirectNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(DirectNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
index 26c8015..9154ece 100644
--- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
@@ -18,7 +18,6 @@ package com.cloud.network.guru;
import java.util.List;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -62,7 +61,6 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = NetworkGuru.class)
public class DirectPodBasedNetworkGuru extends DirectNetworkGuru {
private static final Logger s_logger = Logger.getLogger(DirectPodBasedNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
index b1d1236..a5838ec 100644
--- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
@@ -18,7 +18,6 @@ package com.cloud.network.guru;
import java.util.List;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.context.CallContext;
@@ -65,7 +64,6 @@ import com.cloud.vm.NicVO;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = NetworkGuru.class)
public class ExternalGuestNetworkGuru extends GuestNetworkGuru {
private static final Logger s_logger = Logger.getLogger(ExternalGuestNetworkGuru.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/GuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
index 92613c4..f6aeeab 100644
--- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.context.CallContext;
@@ -82,7 +81,6 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.NicDao;
-@Local(value = NetworkGuru.class)
public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGuru, Configurable {
private static final Logger s_logger = Logger.getLogger(GuestNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
index 2470ea7..9bffe2c 100644
--- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
@@ -18,7 +18,6 @@ package com.cloud.network.guru;
import java.util.Random;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -48,7 +47,6 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = {NetworkGuru.class})
public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(PodBasedNetworkGuru.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
index 340c8b1..be3c6e4 100644
--- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.guru;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -54,7 +53,6 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = NetworkGuru.class)
public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(PrivateNetworkGuru.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/PublicNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java
index 9f855ea..c27543d 100644
--- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.guru;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -58,7 +57,6 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = {NetworkGuru.class})
public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(PublicNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/guru/StorageNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java
index bf21cd7..f6c8dec 100644
--- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.guru;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -44,7 +43,6 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
-@Local(value = NetworkGuru.class)
public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(StorageNetworkGuru.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
index 84ac061..d8ad4d4 100644
--- a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java
@@ -23,7 +23,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -42,7 +41,6 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
@Component
-@Local(value = {LBHealthCheckManager.class})
public class LBHealthCheckManagerImpl extends ManagerBase implements LBHealthCheckManager, Manager {
private static final Logger s_logger = Logger.getLogger(LBHealthCheckManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index c03af2d..4029843 100644
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.ApiConstants;
@@ -168,7 +167,6 @@ import com.cloud.vm.dao.UserVmDao;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-@Local(value = {LoadBalancingRulesManager.class, LoadBalancingRulesService.class})
public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements LoadBalancingRulesManager, LoadBalancingRulesService {
private static final Logger s_logger = Logger.getLogger(LoadBalancingRulesManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index ca1f67d..419537f 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -39,7 +39,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -249,7 +248,6 @@ import com.cloud.vm.dao.VMInstanceDao;
* VirtualNetworkApplianceManagerImpl manages the different types of virtual
* network appliances available in the Cloud Stack.
*/
-@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class })
public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, VirtualMachineGuru, Listener,
Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index a13ff21..712c747 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -56,7 +55,6 @@ import com.cloud.network.PublicIpAddress;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.VirtualRouterProvider;
-import com.cloud.network.VpcVirtualNetworkApplianceService;
import com.cloud.network.addr.PublicIp;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.RemoteAccessVpnVO;
@@ -94,7 +92,6 @@ import com.cloud.vm.VirtualMachineProfile.Param;
import com.cloud.vm.dao.VMInstanceDao;
@Component
-@Local(value = { VpcVirtualNetworkApplianceManager.class, VpcVirtualNetworkApplianceService.class })
public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplianceManagerImpl implements VpcVirtualNetworkApplianceManager {
private static final Logger s_logger = Logger.getLogger(VpcVirtualNetworkApplianceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 3e2b15a..b4f7217 100644
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;
@@ -97,7 +96,6 @@ import com.cloud.vm.dao.NicSecondaryIpVO;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
-@Local(value = {RulesManager.class, RulesService.class})
public class RulesManagerImpl extends ManagerBase implements RulesManager, RulesService {
private static final Logger s_logger = Logger.getLogger(RulesManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index 097118d..442747a 100644
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -36,7 +36,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.ConcurrentAccessException;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -122,7 +121,6 @@ import com.cloud.vm.dao.NicSecondaryIpDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
-@Local(value = {SecurityGroupManager.class, SecurityGroupService.class})
public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGroupManager, SecurityGroupService, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
index 47f6e77..64204fe 100644
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
@@ -24,7 +24,6 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -48,7 +47,6 @@ import com.cloud.vm.VirtualMachine.State;
* Same as the base class -- except it uses the abstracted security group work queue
*
*/
-@Local(value = {SecurityGroupManager.class, SecurityGroupService.class})
public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl {
SecurityGroupWorkQueue _workQueue = new LocalSecurityGroupWorkQueue();
SecurityGroupWorkTracker _workTracker;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index de0465b..fe0d777 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -19,7 +19,6 @@ package com.cloud.network.vpc;
import java.util.ArrayList;
import java.util.List;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.context.CallContext;
@@ -53,7 +52,6 @@ import com.cloud.utils.db.TransactionCallback;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
-@Local(value = {NetworkACLManager.class})
public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLManager {
private static final Logger s_logger = Logger.getLogger(NetworkACLManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index 9f61f08..60f5d7b 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.commons.lang.StringUtils;
@@ -65,7 +64,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Component
-@Local(value = {NetworkACLService.class})
public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLService {
private static final Logger s_logger = Logger.getLogger(NetworkACLServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 2a07895..bb857e4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -36,7 +36,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -143,7 +142,6 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.ReservationContextImpl;
import com.cloud.vm.dao.DomainRouterDao;
-@Local(value = {VpcManager.class, VpcService.class, VpcProvisioningService.class})
public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvisioningService, VpcService {
private static final Logger s_logger = Logger.getLogger(VpcManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 3c0188d..b473f05 100644
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -92,7 +91,6 @@ import com.cloud.utils.db.TransactionCallbackWithException;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.net.NetUtils;
-@Local(value = RemoteAccessVpnService.class)
public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAccessVpnService, Configurable {
private final static Logger s_logger = Logger.getLogger(RemoteAccessVpnManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index b3cec12..deebc6d 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -81,7 +80,6 @@ import com.cloud.utils.net.NetUtils;
import com.cloud.vm.DomainRouterVO;
@Component
-@Local(value = {Site2SiteVpnManager.class, Site2SiteVpnService.class})
public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpnManager {
private static final Logger s_logger = Logger.getLogger(Site2SiteVpnManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/projects/ProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java
index 95cf68a..ee66506 100644
--- a/server/src/com/cloud/projects/ProjectManagerImpl.java
+++ b/server/src/com/cloud/projects/ProjectManagerImpl.java
@@ -28,7 +28,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.mail.Authenticator;
import javax.mail.Message.RecipientType;
@@ -93,7 +92,6 @@ import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
-@Local(value = {ProjectService.class, ProjectManager.class})
public class ProjectManagerImpl extends ManagerBase implements ProjectManager {
public static final Logger s_logger = Logger.getLogger(ProjectManagerImpl.class);
private EmailInvite _emailInvite;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/resource/DummyHostDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/com/cloud/resource/DummyHostDiscoverer.java
index 4651498..88f8788 100644
--- a/server/src/com/cloud/resource/DummyHostDiscoverer.java
+++ b/server/src/com/cloud/resource/DummyHostDiscoverer.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -33,7 +32,6 @@ import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.component.AdapterBase;
@Component
-@Local(value = Discoverer.class)
public class DummyHostDiscoverer extends AdapterBase implements Discoverer {
private static final Logger s_logger = Logger.getLogger(DummyHostDiscoverer.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index b450e31..359bccf 100644
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -26,7 +26,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -172,7 +171,6 @@ import com.cloud.vm.dao.VMInstanceDao;
import com.google.gson.Gson;
@Component
-@Local({ResourceManager.class, ResourceService.class})
public class ResourceManagerImpl extends ManagerBase implements ResourceManager, ResourceService, Manager {
private static final Logger s_logger = Logger.getLogger(ResourceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 1651ad7..25afd01 100644
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -26,7 +26,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -108,7 +107,6 @@ import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
@Component
-@Local(value = {ResourceLimitService.class})
public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService {
public static final Logger s_logger = Logger.getLogger(ResourceLimitManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
index ea8e87b..36f2db8 100644
--- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
+++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.server.auth;
-import javax.ejb.Local;
import com.cloud.utils.component.AdapterBase;
@@ -24,6 +23,5 @@ import com.cloud.utils.component.AdapterBase;
* Use this UserAuthenticator if users are already authenticated outside
*
*/
-@Local(value = {UserAuthenticator.class})
public abstract class DefaultUserAuthenticator extends AdapterBase implements UserAuthenticator {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
index 8b462d3..1478910 100755
--- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -77,7 +76,6 @@ import com.cloud.utils.fsm.StateMachine2;
* Monitors the progress of upload.
*/
@Component
-@Local(value = {ImageStoreUploadMonitor.class})
public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageStoreUploadMonitor, Listener, Configurable {
static final Logger s_logger = Logger.getLogger(ImageStoreUploadMonitorImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/OCFS2ManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java
index 017ce7f..8d083cb 100644
--- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java
+++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -53,7 +52,6 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
-@Local(value = {OCFS2Manager.class})
public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, ResourceListener {
private static final Logger s_logger = Logger.getLogger(OCFS2ManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 41f0019..87ff913 100644
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -37,7 +37,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -189,7 +188,6 @@ import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.VMInstanceDao;
@Component
-@Local(value = {StorageManager.class, StorageService.class})
public class StorageManagerImpl extends ManagerBase implements StorageManager, ClusterManagerListener {
private static final Logger s_logger = Logger.getLogger(StorageManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 65471dd..68be52d 100644
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Timer;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -65,7 +64,6 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
-@Local(value = {DownloadMonitor.class})
public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor {
static final Logger s_logger = Logger.getLogger(DownloadMonitorImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
index 28f6dc4..711d1a9 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import javax.ejb.Local;
import org.springframework.stereotype.Component;
@@ -28,7 +27,6 @@ import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.SecondaryStorageVmVO;
@Component
-@Local(value = {SecondaryStorageVmAllocator.class})
public class SecondaryStorageVmDefaultAllocator extends AdapterBase implements SecondaryStorageVmAllocator {
private String _name;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index fb8889f..65f5140 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -130,7 +129,6 @@ import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@Component
-@Local(value = {SnapshotManager.class, SnapshotApiService.class})
public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, SnapshotApiService {
private static final Logger s_logger = Logger.getLogger(SnapshotManagerImpl.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
index 4ce2bba..f6c1379 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -67,7 +66,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
-@Local(value = {SnapshotScheduler.class})
public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotScheduler {
private static final Logger s_logger = Logger.getLogger(SnapshotSchedulerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index 35cb665..e8f2980 100644
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -28,7 +28,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -81,7 +80,6 @@ import com.cloud.vm.dao.SecondaryStorageVmDao;
* Monitors the progress of upload.
*/
@Component
-@Local(value = {UploadMonitor.class})
public class UploadMonitorImpl extends ManagerBase implements UploadMonitor {
static final Logger s_logger = Logger.getLogger(UploadMonitorImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index dfe3ae0..08ed3dd 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -89,7 +88,6 @@ import com.cloud.vm.NicVO;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.snapshot.VMSnapshotVO;
-@Local(value = {TaggedResourceService.class})
public class TaggedResourceManagerImpl extends ManagerBase implements TaggedResourceService {
public static final Logger s_logger = Logger.getLogger(TaggedResourceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/template/HypervisorTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index 0b7854e..1364974 100644
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-import javax.ejb.Local;
import javax.inject.Inject;
import com.cloud.configuration.Config;
@@ -86,7 +85,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.exception.CloudRuntimeException;
-@Local(value = TemplateAdapter.class)
public class HypervisorTemplateAdapter extends TemplateAdapterBase {
private final static Logger s_logger = Logger.getLogger(HypervisorTemplateAdapter.class);
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index aaa86e4..6a8c3b6 100644
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -29,7 +29,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -194,7 +193,6 @@ import com.cloud.vm.dao.VMInstanceDao;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
-@Local(value = {TemplateManager.class, TemplateApiService.class})
public class TemplateManagerImpl extends ManagerBase implements TemplateManager, TemplateApiService, Configurable {
private final static Logger s_logger = Logger.getLogger(TemplateManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/usage/UsageServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java
index df43a00..efd8ef4 100644
--- a/server/src/com/cloud/usage/UsageServiceImpl.java
+++ b/server/src/com/cloud/usage/UsageServiceImpl.java
@@ -67,7 +67,6 @@ import org.apache.cloudstack.usage.UsageTypes;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import java.util.ArrayList;
@@ -78,7 +77,6 @@ import java.util.Map;
import java.util.TimeZone;
@Component
-@Local(value = {UsageService.class})
public class UsageServiceImpl extends ManagerBase implements UsageService, Manager {
public static final Logger s_logger = Logger.getLogger(UsageServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 8f3a1b2..da09737 100644
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -35,7 +35,6 @@ import javax.crypto.KeyGenerator;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -169,7 +168,6 @@ import com.cloud.vm.snapshot.VMSnapshotManager;
import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-@Local(value = {AccountManager.class, AccountService.class})
public class AccountManagerImpl extends ManagerBase implements AccountManager, Manager {
public static final Logger s_logger = Logger.getLogger(AccountManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/user/DomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
index fbbe0c2..912aa8b 100644
--- a/server/src/com/cloud/user/DomainManagerImpl.java
+++ b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -76,7 +75,6 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.ReservationContextImpl;
@Component
-@Local(value = {DomainManager.class, DomainService.class})
public class DomainManagerImpl extends ManagerBase implements DomainManager, DomainService {
public static final Logger s_logger = Logger.getLogger(DomainManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 32b0d3d..49250fb 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -33,7 +33,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -284,7 +283,6 @@ import com.cloud.vm.snapshot.VMSnapshotManager;
import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-@Local(value = {UserVmManager.class, UserVmService.class})
public class UserVmManagerImpl extends ManagerBase implements UserVmManager, VirtualMachineGuru, UserVmService, Configurable {
private static final Logger s_logger = Logger.getLogger(UserVmManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 2dcd2e2..c113e3c 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -100,7 +99,6 @@ import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@Component
-@Local(value = { VMSnapshotManager.class, VMSnapshotService.class })
public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotManager, VMSnapshotService, VmWorkJobHandler {
private static final Logger s_logger = Logger.getLogger(VMSnapshotManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
index d25bddb..85658e5 100644
--- a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
+++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -70,7 +69,6 @@ import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.UserVmDao;
-@Local(value = {AffinityGroupService.class})
public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGroupService, Manager, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public static final Logger s_logger = Logger.getLogger(AffinityGroupServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
index bc2f1c4..1c9af7a 100644
--- a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -79,7 +78,6 @@ import com.cloud.utils.net.Ip;
import com.cloud.utils.net.NetUtils;
@Component
-@Local(value = {ApplicationLoadBalancerService.class})
public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements ApplicationLoadBalancerService {
private static final Logger s_logger = Logger.getLogger(ApplicationLoadBalancerManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
index 8910714..7e7189e 100644
--- a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
+++ b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -48,7 +47,6 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DbProperties;
@Component
-@Local(value = {RegionManager.class})
public class RegionManagerImpl extends ManagerBase implements RegionManager, Manager {
public static final Logger s_logger = Logger.getLogger(RegionManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
index 98cf500..cd3a147 100644
--- a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
+++ b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
@@ -19,7 +19,6 @@ package org.apache.cloudstack.region;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -47,7 +46,6 @@ import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
@Component
-@Local(value = {RegionService.class})
public class RegionServiceImpl extends ManagerBase implements RegionService, Manager {
public static final Logger s_logger = Logger.getLogger(RegionServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/alert/MockAlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/alert/MockAlertManagerImpl.java b/server/test/com/cloud/alert/MockAlertManagerImpl.java
index 597d479..d0b4ac2 100644
--- a/server/test/com/cloud/alert/MockAlertManagerImpl.java
+++ b/server/test/com/cloud/alert/MockAlertManagerImpl.java
@@ -19,12 +19,10 @@ package com.cloud.alert;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.utils.component.ManagerBase;
-@Local(value = {AlertManager.class})
public class MockAlertManagerImpl extends ManagerBase implements AlertManager {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/network/MockFirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/test/com/cloud/network/MockFirewallManagerImpl.java
index 5209069..4c98798 100644
--- a/server/test/com/cloud/network/MockFirewallManagerImpl.java
+++ b/server/test/com/cloud/network/MockFirewallManagerImpl.java
@@ -19,7 +19,6 @@ package com.cloud.network;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.user.firewall.IListFirewallRulesCmd;
@@ -38,7 +37,6 @@ import com.cloud.user.Account;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
-@Local(value = {FirewallManager.class, FirewallService.class})
public class MockFirewallManagerImpl extends ManagerBase implements FirewallManager, FirewallService {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
index 5c89a16..c00d83f 100644
--- a/server/test/com/cloud/network/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.dc.Vlan;
@@ -48,7 +47,6 @@ import com.cloud.vm.Nic;
import com.cloud.vm.NicProfile;
import com.cloud.vm.VirtualMachine;
-@Local(value = {NetworkModel.class})
public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java b/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
index 0d4a550..0156afb 100644
--- a/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
+++ b/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
@@ -19,7 +19,6 @@ package com.cloud.network.vpn;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.exception.ResourceUnavailableException;
@@ -28,7 +27,6 @@ import com.cloud.network.VpnUser;
import com.cloud.network.element.RemoteAccessVPNServiceProvider;
import com.cloud.utils.component.ManagerBase;
-@Local(value = RemoteAccessVPNServiceProvider.class)
public class MockRemoteAccessVPNServiceProvider extends ManagerBase implements RemoteAccessVPNServiceProvider {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/projects/MockProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/projects/MockProjectManagerImpl.java b/server/test/com/cloud/projects/MockProjectManagerImpl.java
index dc377ff..46946aa 100644
--- a/server/test/com/cloud/projects/MockProjectManagerImpl.java
+++ b/server/test/com/cloud/projects/MockProjectManagerImpl.java
@@ -19,7 +19,6 @@ package com.cloud.projects;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.exception.ConcurrentOperationException;
@@ -29,7 +28,6 @@ import com.cloud.projects.ProjectAccount.Role;
import com.cloud.user.Account;
import com.cloud.utils.component.ManagerBase;
-@Local(value = {ProjectManager.class})
public class MockProjectManagerImpl extends ManagerBase implements ProjectManager {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/resource/MockResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/resource/MockResourceManagerImpl.java b/server/test/com/cloud/resource/MockResourceManagerImpl.java
index d4f2210..86de140 100644
--- a/server/test/com/cloud/resource/MockResourceManagerImpl.java
+++ b/server/test/com/cloud/resource/MockResourceManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
@@ -57,7 +56,6 @@ import com.cloud.resource.ResourceState.Event;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.fsm.NoTransitionException;
-@Local(value = {ResourceManager.class})
public class MockResourceManagerImpl extends ManagerBase implements ResourceManager {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/user/MockAccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java
index 546cc39..3971fd6 100644
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import java.net.InetAddress;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@@ -49,7 +48,6 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@Component
-@Local(value = {AccountManager.class, AccountService.class})
public class MockAccountManagerImpl extends ManagerBase implements Manager, AccountManager {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/user/MockDomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/test/com/cloud/user/MockDomainManagerImpl.java
index 7dddefb..cdae887 100644
--- a/server/test/com/cloud/user/MockDomainManagerImpl.java
+++ b/server/test/com/cloud/user/MockDomainManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@@ -36,7 +35,6 @@ import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
@Component
-@Local(value = {DomainManager.class, DomainService.class})
public class MockDomainManagerImpl extends ManagerBase implements DomainManager, DomainService {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
index fc535bd..ee315bd 100644
--- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -83,7 +82,6 @@ import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
@Component
-@Local(value = {ConfigurationManager.class, ConfigurationService.class})
public class MockConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService {
@Inject
NetworkOfferingDaoImpl _ntwkOffDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
index 111df93..a5d8a1a 100644
--- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -82,7 +81,6 @@ import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.VirtualMachineProfile;
@Component
-@Local(value = {NetworkOrchestrationService.class, NetworkService.class})
public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrchestrationService, NetworkService {
@Inject
NetworkServiceMapDao _ntwkSrvcDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
index 8ed3b7c..93b31e9 100644
--- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -56,7 +55,6 @@ import com.cloud.vm.Nic;
import com.cloud.vm.NicProfile;
import com.cloud.vm.VirtualMachine;
-@Local(value = {NetworkModel.class})
public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java b/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
index db0ee6c..d2d7c33 100644
--- a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java
@@ -19,7 +19,6 @@ package com.cloud.vpc;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@@ -34,7 +33,6 @@ import com.cloud.user.ResourceLimitService;
import com.cloud.utils.component.ManagerBase;
@Component
-@Local(value = {ResourceLimitService.class})
public class MockResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java
index b59c11a..0d6674e 100644
--- a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java
@@ -19,7 +19,6 @@ package com.cloud.vpc;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd;
@@ -48,7 +47,6 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.vm.DomainRouterVO;
@Component
-@Local(value = {Site2SiteVpnManager.class, Site2SiteVpnService.class})
public class MockSite2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpnManager, Site2SiteVpnService {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java b/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java
index f13c2d1..95814c2 100644
--- a/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java
+++ b/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java
@@ -19,7 +19,6 @@ package com.cloud.vpc;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@@ -30,7 +29,6 @@ import com.cloud.network.element.Site2SiteVpnServiceProvider;
import com.cloud.utils.component.ManagerBase;
@Component
-@Local({Site2SiteVpnServiceProvider.class})
public class MockSite2SiteVpnServiceProvider extends ManagerBase implements Site2SiteVpnServiceProvider {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
index f6bd997..a85d039 100644
--- a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
+++ b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
@@ -20,7 +20,6 @@ package com.cloud.vpc;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
@@ -45,7 +44,6 @@ import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.VirtualMachineProfile;
@Component
-@Local(value = {VpcVirtualNetworkApplianceManager.class, VpcVirtualNetworkApplianceService.class})
public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implements VpcVirtualNetworkApplianceManager, VpcVirtualNetworkApplianceService {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java b/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java
index e8c1f1c..94f8d65 100644
--- a/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java
@@ -19,14 +19,12 @@ package com.cloud.vpc.dao;
import java.util.HashMap;
import java.util.Map;
-import javax.ejb.Local;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
import com.cloud.utils.db.GenericDaoBase;
-@Local(value = {ConfigurationDao.class})
public class MockConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String> implements ConfigurationDao {
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 89f15d5..e80b1cf 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import com.cloud.network.Network;
import com.cloud.network.Network.GuestType;
@@ -32,7 +31,6 @@ import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
-@Local(value = NetworkDao.class)
@DB()
public class MockNetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 7ea0a80..d77873f 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java
@@ -19,7 +19,6 @@ package com.cloud.vpc.dao;
import java.lang.reflect.Field;
import java.util.List;
-import javax.ejb.Local;
import org.apache.log4j.Logger;
@@ -34,7 +33,6 @@ import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingDaoImpl;
import com.cloud.utils.db.DB;
-@Local(value = NetworkOfferingDao.class)
@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/1a64c247/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 a37e186..3ad928d 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java
@@ -16,14 +16,11 @@
// under the License.
package com.cloud.vpc.dao;
-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;
-@Local(value = NetworkOfferingServiceMapDao.class)
@DB()
public class MockNetworkOfferingServiceMapDaoImpl extends NetworkOfferingServiceMapDaoImpl {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 9e422f6..33f9332 100644
--- a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java
@@ -18,7 +18,6 @@ package com.cloud.vpc.dao;
import java.util.List;
-import javax.ejb.Local;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
@@ -27,7 +26,6 @@ import com.cloud.network.dao.NetworkServiceMapVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
-@Local(value = NetworkServiceMapDao.class)
@DB()
public class MockNetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 a436a92..f20de03 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
@@ -20,7 +20,6 @@ import java.lang.reflect.Field;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import org.apache.log4j.Logger;
@@ -31,7 +30,6 @@ import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
-@Local(value = VpcDao.class)
@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/1a64c247/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 88d3f78..9b35ad8 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java
@@ -16,14 +16,12 @@
// under the License.
package com.cloud.vpc.dao;
-import javax.ejb.Local;
import com.cloud.network.vpc.VpcOfferingVO;
import com.cloud.network.vpc.dao.VpcOfferingDao;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
-@Local(value = VpcOfferingDao.class)
@DB()
public class MockVpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/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 0d3eaa9..ba57212 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java
@@ -18,7 +18,6 @@ package com.cloud.vpc.dao;
import java.util.List;
-import javax.ejb.Local;
import com.cloud.network.Network.Service;
import com.cloud.network.vpc.VpcOfferingServiceMapVO;
@@ -26,7 +25,6 @@ import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
-@Local(value = VpcOfferingServiceMapDao.class)
@DB()
public class MockVpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
index bf8b2e4..b0dc383 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -116,7 +115,6 @@ import com.cloud.vm.NicSecondaryIp;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.snapshot.VMSnapshot;
-@Local(value = {IAMApiService.class})
public class IAMApiServiceImpl extends ManagerBase implements IAMApiService, Manager {
public static final Logger s_logger = Logger.getLogger(IAMApiServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java
----------------------------------------------------------------------
diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java b/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java
index 3a3ba4d..634ce0a 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -55,7 +54,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
//This is the Role Based API access checker that grab's the account's roles
//based on the set of roles, access is granted if any of the role has access to the api
-@Local(value=APIChecker.class)
public class RoleBasedAPIAccessChecker extends AdapterBase implements APIChecker {
protected static final Logger s_logger = Logger.getLogger(RoleBasedAPIAccessChecker.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
index bfeb979..4ae694b 100644
--- a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
+++ b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -62,7 +61,6 @@ import com.cloud.utils.db.TransactionCallback;
import com.cloud.utils.db.TransactionCallbackNoReturn;
import com.cloud.utils.db.TransactionStatus;
-@Local(value = {IAMService.class})
public class IAMServiceImpl extends ManagerBase implements IAMService, Manager {
public static final Logger s_logger = Logger.getLogger(IAMServiceImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
index 15d58be..357c55e 100644
--- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java
@@ -20,7 +20,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;
@@ -48,7 +47,6 @@ import com.cloud.vm.SystemVmLoadScanner.AfterScanAction;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.SecondaryStorageVmDao;
-@Local(value = {SecondaryStorageVmManager.class})
public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerImpl {
private static final Logger s_logger = Logger.getLogger(PremiumSecondaryStorageManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 5f8a1e0..4891b71 100644
--- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -27,7 +27,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -162,7 +161,6 @@ import com.cloud.vm.dao.VMInstanceDao;
// Starting, HA, Migrating, Creating and Running state are all counted as "Open" for available capacity calculation
// because sooner or later, it will be driven into Running state
//
-@Local(value = {SecondaryStorageVmManager.class})
public class SecondaryStorageManagerImpl extends ManagerBase implements SecondaryStorageVmManager, VirtualMachineGuru, SystemVmLoadScanHandler<Long>,
ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(SecondaryStorageManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java
index ee50647..91dcb4c 100644
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -53,7 +52,6 @@ import com.cloud.utils.script.Script;
* storage servers and make sure everything it can do is
* correct.
*/
-@Local(value = Discoverer.class)
public class SecondaryStorageDiscoverer extends DiscovererBase implements Discoverer {
private static final Logger s_logger = Logger.getLogger(SecondaryStorageDiscoverer.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
index f1706e22..8c474ca 100644
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
@@ -38,7 +38,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.storage.command.DownloadCommand;
@@ -85,7 +84,6 @@ import com.cloud.utils.script.OutputInterpreter;
import com.cloud.utils.script.Script;
import com.cloud.utils.storage.QCOW2Utils;
-@Local(value = DownloadManager.class)
public class DownloadManagerImpl extends ManagerBase implements DownloadManager {
private String _name;
StorageLayer _storage;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
index 3c55f57..fd8c7c0 100644
--- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java
@@ -21,7 +21,6 @@ import java.util.Date;
import java.util.Map;
import java.util.Properties;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.mail.Authenticator;
import javax.mail.Message.RecipientType;
@@ -46,7 +45,6 @@ import com.sun.mail.smtp.SMTPSSLTransport;
import com.sun.mail.smtp.SMTPTransport;
@Component
-@Local(value = {AlertManager.class})
public class UsageAlertManagerImpl extends ManagerBase implements AlertManager {
private static final Logger s_logger = Logger.getLogger(UsageAlertManagerImpl.class.getName());
private static final Logger s_alertsLogger = Logger.getLogger("org.apache.cloudstack.alerts");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index c1e26b3..ac4aee7 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -90,7 +89,6 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
@Component
-@Local(value = {UsageManager.class})
public class UsageManagerImpl extends ManagerBase implements UsageManager, Runnable {
public static final Logger s_logger = Logger.getLogger(UsageManagerImpl.class.getName());