Skip to content

Commit 942f282

Browse files
author
Alex Huang
committed
Moved config into it's own package
1 parent cf3bbb1 commit 942f282

159 files changed

Lines changed: 527 additions & 341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

utils/src/org/apache/cloudstack/config/Configuration.java renamed to api/src/org/apache/cloudstack/config/Configuration.java

File renamed without changes.

‎client/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,6 @@
195195
<artifactId>cloud-engine-components-api</artifactId>
196196
<version>${project.version}</version>
197197
</dependency>
198-
199-
<dependency>
200-
<groupId>org.apache.cloudstack</groupId>
201-
<artifactId>cloud-engine-compute</artifactId>
202-
<version>${project.version}</version>
203-
</dependency>
204-
205198
<dependency>
206199
<groupId>org.apache.cloudstack</groupId>
207200
<artifactId>cloud-engine-network</artifactId>

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
</bean>
8282

8383
<bean id="messageBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase" />
84+
<bean id="configDepot" class = "org.apache.cloudstack.config.ConfigDepotImpl" />
8485

8586
<!--
8687
DAO with customized configuration

‎engine/schema/src/com/cloud/configuration/ConfigurationVO.java‎

Lines changed: 0 additions & 109 deletions
This file was deleted.

‎engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@
3030
import javax.naming.ConfigurationException;
3131

3232
import com.cloud.storage.VMTemplateStorageResourceAssoc;
33+
34+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
3335
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
3436
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
37+
3538
import org.apache.log4j.Logger;
3639
import org.springframework.stereotype.Component;
3740

38-
import com.cloud.configuration.dao.ConfigurationDao;
3941
import com.cloud.dc.dao.DataCenterDao;
4042
import com.cloud.domain.dao.DomainDao;
4143
import com.cloud.host.Host;

‎engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.cloudstack.storage.cache.manager;
2020

2121
import com.cloud.configuration.Config;
22-
import com.cloud.configuration.dao.ConfigurationDao;
2322
import com.cloud.storage.DataStoreRole;
2423
import com.cloud.utils.NumbersUtil;
2524
import com.cloud.utils.component.Manager;
@@ -29,16 +28,20 @@
2928
import com.cloud.utils.db.SearchCriteria2;
3029
import com.cloud.utils.db.SearchCriteriaService;
3130
import com.cloud.utils.exception.CloudRuntimeException;
31+
3232
import org.apache.cloudstack.engine.subsystem.api.storage.*;
3333
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
3434
import org.apache.cloudstack.framework.async.AsyncCallFuture;
35+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
3536
import org.apache.cloudstack.storage.cache.allocator.StorageCacheAllocator;
3637
import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
3738
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
39+
3840
import org.apache.log4j.Logger;
3941

4042
import javax.inject.Inject;
4143
import javax.naming.ConfigurationException;
44+
4245
import java.util.*;
4346
import java.util.concurrent.ExecutionException;
4447
import java.util.concurrent.Executors;

‎engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@
1818
*/
1919
package org.apache.cloudstack.storage.cache.manager;
2020
import com.cloud.configuration.Config;
21-
import com.cloud.configuration.dao.ConfigurationDao;
2221
import com.cloud.utils.DateUtil;
2322
import com.cloud.utils.NumbersUtil;
2423
import com.cloud.utils.db.SearchCriteria;
2524
import com.cloud.utils.db.SearchCriteria2;
2625
import com.cloud.utils.db.SearchCriteriaService;
26+
2727
import org.apache.cloudstack.engine.subsystem.api.storage.*;
28+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
2829
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
2930
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
3031
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
32+
3133
import org.apache.commons.lang.math.NumberUtils;
3234

3335
import java.util.Calendar;
3436
import java.util.Date;
37+
3538
import javax.annotation.PostConstruct;
3639
import javax.inject.Inject;
3740

‎engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
4040
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
4141
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
42+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
4243
import org.apache.cloudstack.storage.command.CopyCommand;
4344
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4445
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
4546
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
4647
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
4748
import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
49+
4850
import org.apache.log4j.Logger;
4951
import org.springframework.stereotype.Component;
5052

@@ -57,7 +59,6 @@
5759
import com.cloud.agent.api.to.NfsTO;
5860
import com.cloud.agent.api.to.VirtualMachineTO;
5961
import com.cloud.configuration.Config;
60-
import com.cloud.configuration.dao.ConfigurationDao;
6162
import com.cloud.host.Host;
6263
import com.cloud.host.dao.HostDao;
6364
import com.cloud.hypervisor.Hypervisor.HypervisorType;

‎engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
4949
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
5050
import org.apache.cloudstack.framework.async.AsyncRpcContext;
51+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
5152
import org.apache.cloudstack.storage.command.CommandResult;
5253
import org.apache.cloudstack.storage.command.DeleteCommand;
5354
import org.apache.cloudstack.storage.datastore.DataObjectManager;
@@ -57,6 +58,7 @@
5758
import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
5859
import org.apache.cloudstack.storage.image.store.TemplateObject;
5960
import org.apache.cloudstack.storage.to.TemplateObjectTO;
61+
6062
import org.apache.log4j.Logger;
6163
import org.springframework.stereotype.Component;
6264

@@ -65,7 +67,6 @@
6567
import com.cloud.agent.api.storage.ListTemplateCommand;
6668
import com.cloud.alert.AlertManager;
6769
import com.cloud.configuration.Config;
68-
import com.cloud.configuration.dao.ConfigurationDao;
6970
import com.cloud.dc.DataCenterVO;
7071
import com.cloud.dc.dao.ClusterDao;
7172
import com.cloud.dc.dao.DataCenterDao;

‎engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
import org.apache.cloudstack.acl.APIChecker;
2222
import org.apache.cloudstack.engine.service.api.OrchestrationService;
2323
import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
24+
import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl;
2425
import org.apache.cloudstack.framework.rpc.RpcProvider;
2526
import org.apache.cloudstack.storage.cache.manager.StorageCacheManagerImpl;
2627
import org.apache.cloudstack.storage.test.ChildTestConfiguration.Library;
2728
import org.apache.cloudstack.test.utils.SpringUtils;
29+
2830
import org.mockito.Mockito;
2931
import org.springframework.context.annotation.Bean;
3032
import org.springframework.context.annotation.ComponentScan;
@@ -40,7 +42,6 @@
4042
import com.cloud.capacity.dao.CapacityDaoImpl;
4143
import com.cloud.cluster.ClusteredAgentRebalanceService;
4244
import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl;
43-
import com.cloud.configuration.dao.ConfigurationDaoImpl;
4445
import com.cloud.dc.ClusterDetailsDaoImpl;
4546
import com.cloud.dc.dao.ClusterDaoImpl;
4647
import com.cloud.dc.dao.DataCenterDaoImpl;

0 commit comments

Comments
 (0)