You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/06/11 03:03:38 UTC
git commit: updated refs/heads/object_store to 3bf15bd
Updated Branches:
refs/heads/object_store cc0de8808 -> 3bf15bd1f
Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3bf15bd1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3bf15bd1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3bf15bd1
Branch: refs/heads/object_store
Commit: 3bf15bd1ff8a852efea73a37b7a8607dc791cb79
Parents: cc0de88
Author: Min Chen <mi...@citrix.com>
Authored: Mon Jun 10 18:03:15 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Jun 10 18:03:15 2013 -0700
----------------------------------------------------------------------
.../storage/image/TemplateServiceImpl.java | 15 ---------------
.../cloudstack/storage/volume/VolumeServiceImpl.java | 10 ----------
.../cloud/agent/manager/MockStorageManagerImpl.java | 2 --
3 files changed, 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bf15bd1/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index fb8e89c..9b6382b 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -56,7 +56,6 @@ import org.apache.cloudstack.storage.datastore.DataObjectManager;
import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
-import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
import org.apache.cloudstack.storage.image.manager.ImageDataManager;
import org.apache.cloudstack.storage.image.store.TemplateObject;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
@@ -67,7 +66,6 @@ import com.cloud.agent.api.Answer;
import com.cloud.agent.api.storage.ListTemplateAnswer;
import com.cloud.agent.api.storage.ListTemplateCommand;
import com.cloud.alert.AlertManager;
-import com.cloud.api.query.dao.UserVmJoinDao;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
@@ -81,8 +79,6 @@ import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VMTemplatePoolDao;
import com.cloud.storage.dao.VMTemplateZoneDao;
-import com.cloud.storage.dao.VolumeDao;
-import com.cloud.storage.download.DownloadMonitor;
import com.cloud.storage.template.TemplateConstants;
import com.cloud.storage.template.TemplateProp;
import com.cloud.template.TemplateManager;
@@ -90,7 +86,6 @@ import com.cloud.user.AccountManager;
import com.cloud.user.ResourceLimitService;
import com.cloud.utils.UriUtils;
import com.cloud.utils.fsm.NoTransitionException;
-import com.cloud.vm.dao.UserVmDao;
@Component
public class TemplateServiceImpl implements TemplateService {
@@ -114,22 +109,12 @@ public class TemplateServiceImpl implements TemplateService {
@Inject
TemplateDataStoreDao _vmTemplateStoreDao;
@Inject
- VolumeDataStoreDao _volumeStoreDao;
- @Inject
- DownloadMonitor _dlMonitor;
- @Inject
DataCenterDao _dcDao = null;
@Inject
VMTemplateZoneDao _vmTemplateZoneDao;
@Inject
ClusterDao _clusterDao;
@Inject
- UserVmDao _userVmDao;
- @Inject
- UserVmJoinDao _userVmJoinDao;
- @Inject
- VolumeDao _volumeDao;
- @Inject
TemplateDataFactory _templateFactory;
@Inject
VMTemplatePoolDao _tmpltPoolDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bf15bd1/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index ed6b86f..7d5b7a2 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -51,12 +51,10 @@ import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
-import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
-import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.storage.ListVolumeAnswer;
import com.cloud.agent.api.storage.ListVolumeCommand;
@@ -75,14 +73,12 @@ import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.VolumeDao;
-import com.cloud.storage.download.DownloadMonitor;
import com.cloud.storage.snapshot.SnapshotManager;
import com.cloud.storage.template.TemplateProp;
import com.cloud.user.AccountManager;
import com.cloud.user.ResourceLimitService;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.DB;
-import com.cloud.vm.dao.VMInstanceDao;
@Component
public class VolumeServiceImpl implements VolumeService {
@@ -104,18 +100,12 @@ public class VolumeServiceImpl implements VolumeService {
@Inject
ResourceLimitService _resourceLimitMgr;
@Inject
- DownloadMonitor downloadMonitor;
- @Inject
AccountManager _accountMgr;
@Inject
AlertManager _alertMgr;
@Inject
- VMInstanceDao vmDao;
- @Inject
ConfigurationDao configDao;
@Inject
- AgentManager _agentMgr;
- @Inject
VolumeDataStoreDao _volumeStoreDao;
@Inject
VolumeDao _volumeDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bf15bd1/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
index 1fc1d79..21b81e1 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
@@ -52,9 +52,7 @@ import com.cloud.agent.api.storage.ListVolumeAnswer;
import com.cloud.agent.api.storage.ListVolumeCommand;
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
-import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
-import com.cloud.agent.api.to.DataTO;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VolumeTO;
import com.cloud.simulator.MockHost;