You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/25 00:54:54 UTC
[1/2] git commit: spring: Fix component annotation for VolumeDaoImpl
and CfgServerImpl
spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/753b8840
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/753b8840
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/753b8840
Branch: refs/heads/javelin
Commit: 753b8840448910d4e5f18640a37419df9976b569
Parents: 1567a11
Author: Rohit Yadav <bh...@apache.org>
Authored: Thu Jan 24 15:40:40 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Jan 24 15:40:40 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 2 +-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/753b8840/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
index a53df8a..360c936 100644
--- a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
+++ b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
@@ -29,7 +29,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-@Component
+@Component(value = "netappVolumeDaoImpl")
@Local(value={VolumeDao.class})
public class VolumeDaoImpl extends GenericDaoBase<NetappVolumeVO, Long> implements VolumeDao {
private static final Logger s_logger = Logger.getLogger(VolumeDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/753b8840/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 3e9fb6a..2b0cf7d 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -104,7 +104,7 @@ import com.cloud.utils.net.NetUtils;
import com.cloud.utils.script.Script;
import com.cloud.uuididentity.dao.IdentityDao;
-@Component
+//@Component
public class ConfigurationServerImpl implements ConfigurationServer {
public static final Logger s_logger = Logger.getLogger(ConfigurationServerImpl.class.getName());