Updated Branches: refs/heads/4.1 9d57d59e6 -> 6a76c96be
spring: Remove annotations from interfaces and abstract classes Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit da7c0b1437bc26c43b63df66235f0fcdd98f5c66) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6a76c96b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6a76c96b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6a76c96b Branch: refs/heads/4.1 Commit: 6a76c96be1a686e84c12b2973752311d380c0738 Parents: 9d57d59 Author: Rohit Yadav <[email protected]> Authored: Tue Feb 26 14:27:58 2013 +0530 Committer: Rohit Yadav <[email protected]> Committed: Tue Feb 26 15:26:15 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/network/guru/GuestNetworkGuru.java | 2 -- .../server/auth/DefaultUserAuthenticator.java | 3 --- server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 3 --- 3 files changed, 0 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a76c96b/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 cc79d30..9c0205a 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -27,7 +27,6 @@ import javax.inject.Inject; import com.cloud.event.ActionEventUtils; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; @@ -77,7 +76,6 @@ import com.cloud.vm.dao.NicDao; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -@Component @Local(value = NetworkGuru.class) public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGuru { private static final Logger s_logger = Logger.getLogger(GuestNetworkGuru.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a76c96b/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 347b9c0..952f724 100644 --- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java +++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java @@ -21,15 +21,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.springframework.stereotype.Component; - import com.cloud.utils.component.AdapterBase; /** * Use this UserAuthenticator if users are already authenticated outside * */ -@Component @Local(value={UserAuthenticator.class}) public abstract class DefaultUserAuthenticator extends AdapterBase implements UserAuthenticator { private String _name = null; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a76c96b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmDetailsDao.java b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java index 87fb9b6..bdccec9 100644 --- a/server/src/com/cloud/vm/dao/UserVmDetailsDao.java +++ b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java @@ -18,12 +18,9 @@ package com.cloud.vm.dao; import java.util.Map; -import org.springframework.stereotype.Component; - import com.cloud.utils.db.GenericDao; import com.cloud.vm.UserVmDetailVO; -@Component public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long> { Map<String, String> findDetails(long vmId);
