Skip to content

Commit cea8f3b

Browse files
kelvenykelveny
committed
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
1 parent aab02e2 commit cea8f3b

144 files changed

Lines changed: 189 additions & 171 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.

‎awsapi/src/com/cloud/bridge/service/EC2MainServlet.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.cloud.bridge.persist.dao.CloudStackConfigurationDaoImpl;
3434
import com.cloud.bridge.util.ConfigurationHelper;
3535
import com.cloud.utils.component.ComponentLocator;
36-
import com.cloud.utils.component.Inject;
3736
import com.cloud.utils.db.DB;
3837
import com.cloud.utils.db.Transaction;
3938

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
1414

1515
<context:annotation-config />
16+
17+
<!--
1618
<context:component-scan base-package="org.apache.cloudstack, com.cloud" />
19+
-->
1720

1821
</beans>

‎engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.Map;
3030
import java.util.Set;
3131

32+
import javax.inject.Inject;
3233
import javax.naming.ConfigurationException;
3334

3435
import org.apache.cloudstack.storage.image.format.ISO;
@@ -59,7 +60,6 @@
5960
import com.cloud.user.Account;
6061
import com.cloud.utils.Pair;
6162
import com.cloud.utils.component.ComponentLocator;
62-
import com.cloud.utils.component.Inject;
6363
import com.cloud.utils.db.DB;
6464
import com.cloud.utils.db.Filter;
6565
import com.cloud.utils.db.GenericDaoBase;

‎engine/storage/src/org/apache/cloudstack/storage/manager/SecondaryStorageManagerImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.cloud.storage.Snapshot;
2626
import com.cloud.storage.Volume;
2727
import com.cloud.storage.dao.VMTemplateZoneDao;
28-
import com.cloud.utils.component.Inject;
2928

3029
public class SecondaryStorageManagerImpl implements SecondaryStorageManager {
3130
public DataStore getStore(Volume volume) {

‎engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.List;
88
import java.util.Map;
99

10+
import javax.inject.Inject;
1011
import javax.naming.ConfigurationException;
1112

1213
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -27,7 +28,6 @@
2728
import com.cloud.storage.StoragePoolStatus;
2829
import com.cloud.storage.StoragePoolVO;
2930
import com.cloud.storage.dao.StoragePoolDao;
30-
import com.cloud.utils.component.Inject;
3131

3232
public class DefaultPrimaryStorageProvider implements StorageProvider {
3333
private String _name = DefaultPrimaryStorageProvider.class.toString();

‎plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.StringTokenizer;
2828

2929
import javax.ejb.Local;
30+
import javax.inject.Inject;
3031
import javax.naming.ConfigurationException;
3132

3233
import netapp.manage.NaAPIFailedException;
@@ -45,7 +46,6 @@
4546
import com.cloud.netapp.dao.LunDao;
4647
import com.cloud.netapp.dao.PoolDao;
4748
import com.cloud.netapp.dao.VolumeDao;
48-
import com.cloud.utils.component.Inject;
4949
import com.cloud.utils.db.DB;
5050
import com.cloud.utils.db.Transaction;
5151
import com.cloud.utils.exception.CloudRuntimeException;

‎plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import javax.ejb.Local;
2525

2626
import org.apache.log4j.Logger;
27+
import org.springframework.stereotype.Component;
2728

2829
import com.cloud.agent.manager.allocator.HostAllocator;
2930
import com.cloud.deploy.DeploymentPlan;

‎plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.UUID;
2626

2727
import javax.ejb.Local;
28+
import javax.inject.Inject;
2829
import javax.naming.ConfigurationException;
2930

3031
import org.apache.log4j.Logger;
@@ -48,7 +49,6 @@
4849
import com.cloud.resource.ResourceStateAdapter;
4950
import com.cloud.resource.ServerResource;
5051
import com.cloud.resource.UnableDeleteHostException;
51-
import com.cloud.utils.component.Inject;
5252
import com.cloud.utils.db.SearchCriteria;
5353
import com.cloud.utils.db.SearchCriteria2;
5454
import com.cloud.utils.exception.CloudRuntimeException;

‎plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Map;
2121

2222
import javax.ejb.Local;
23+
import javax.inject.Inject;
2324
import javax.naming.ConfigurationException;
2425

2526
import org.apache.log4j.Logger;
@@ -35,7 +36,6 @@
3536
import com.cloud.host.Status;
3637
import com.cloud.host.dao.HostDao;
3738
import com.cloud.hypervisor.Hypervisor.HypervisorType;
38-
import com.cloud.utils.component.Inject;
3939
import com.cloud.vm.VMInstanceVO;
4040
import com.cloud.resource.ResourceManager;
4141

‎plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.cloud.ovm.hypervisor;
1818

1919
import javax.ejb.Local;
20+
import javax.inject.Inject;
2021

2122
import org.springframework.stereotype.Component;
2223

@@ -26,7 +27,6 @@
2627
import com.cloud.hypervisor.Hypervisor.HypervisorType;
2728
import com.cloud.storage.GuestOSVO;
2829
import com.cloud.storage.dao.GuestOSDao;
29-
import com.cloud.utils.component.Inject;
3030
import com.cloud.vm.VirtualMachine;
3131
import com.cloud.vm.VirtualMachineProfile;
3232

0 commit comments

Comments
 (0)