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

Author: cristofolini

core/src/com/cloud/storage/template/IsoProcessor.java

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

core/src/com/cloud/storage/template/OVAProcessor.java

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

core/src/com/cloud/storage/template/QCOW2Processor.java

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

core/src/com/cloud/storage/template/RawImageProcessor.java

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

core/src/com/cloud/storage/template/TARProcessor.java

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

core/src/com/cloud/storage/template/VhdProcessor.java

@@ -24,7 +24,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
@@ -40,7 +39,6 @@
  * into the VHD format.
  *
  */
-@Local(value = Processor.class)
 public class VhdProcessor extends AdapterBase implements Processor {
 
     private static final Logger s_logger = Logger.getLogger(VhdProcessor.class);

core/src/com/cloud/storage/template/VmdkProcessor.java

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

engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java

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

engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java

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

engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java

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