Skip to content

Commit 2be270d

Browse files
kelvenykelveny
committed
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
1 parent 727fab7 commit 2be270d

47 files changed

Lines changed: 188 additions & 177 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.

‎client/tomcatconf/componentContext.xml.in‎

Lines changed: 162 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,173 @@
6565
<!--
6666
Adapters
6767
-->
68+
<bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator">
69+
<property name="name" value="FirstFitRouting"/>
70+
</bean>
71+
72+
<!--
73+
Storage pool allocators
74+
-->
75+
<bean id="LocalStoragePoolAllocator" class="com.cloud.storage.allocator.LocalStoragePoolAllocator">
76+
<property name="name" value="LocalStorage"/>
77+
</bean>
78+
<bean id="FirstFitStoragePoolAllocator" class="com.cloud.storage.allocator.FirstFitStoragePoolAllocator">
79+
<property name="name" value="Storage"/>
80+
</bean>
81+
82+
<bean id="UserConcentratedAllocator" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator">
83+
<property name="name" value="User First"/>
84+
</bean>
85+
86+
<bean id="ConsoleProxyAllocator" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator">
87+
<property name="name" value="Balance"/>
88+
</bean>
89+
6890
<bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
91+
92+
<bean id="ExteralIpAddressAllocator" class="com.cloud.network.ExteralIpAddressAllocator">
93+
<property name="name" value="Basic"/>
94+
</bean>
95+
96+
<!--
97+
Authenticators
98+
-->
99+
<bean id="MD5UserAuthenticator" class="com.cloud.server.auth.MD5UserAuthenticator">
100+
<property name="name" value="MD5"/>
101+
</bean>
102+
103+
<bean id="LDAPUserAuthenticator" class="com.cloud.server.auth.LDAPUserAuthenticator">
104+
<property name="name" value="LDAP"/>
105+
</bean>
106+
107+
<!--
108+
Investigators
109+
-->
110+
<bean id="CheckOnAgentInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator">
111+
<property name="name" value="SimpleInvestigator"/>
112+
</bean>
113+
114+
<bean id="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator">
115+
<property name="name" value="XenServerInvestigator"/>
116+
</bean>
69117

118+
<bean id="UserVmDomRInvestigator" class="com.cloud.ha.UserVmDomRInvestigator">
119+
<property name="name" value="PingInvestigator"/>
120+
</bean>
121+
122+
<bean id="ManagementIPSystemVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator">
123+
<property name="name" value="ManagementIPSysVMInvestigator"/>
124+
</bean>
125+
126+
<!--
127+
Fencers
128+
-->
129+
<bean id="XenServerFencer" class="com.cloud.ha.XenServerFencer">
130+
<property name="name" value="XenServerFenceBuilder"/>
131+
</bean>
132+
<bean id="KVMFencer" class="com.cloud.ha.KVMFencer">
133+
<property name="name" value="KVMFenceBuilder"/>
134+
</bean>
135+
<bean id="OvmFencer" class="com.cloud.ovm.hypervisor.OvmFencer">
136+
<property name="name" value="OvmFenceBuilder"/>
137+
</bean>
138+
139+
<bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer">
140+
<property name="name" value="XCP Agent"/>
141+
</bean>
142+
143+
<bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer">
144+
<property name="name" value="SecondaryStorage"/>
145+
</bean>
146+
147+
<bean id="KvmServerDiscoverer" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer">
148+
<property name="name" value="KVM Agent"/>
149+
</bean>
150+
151+
<bean id="BareMetalDiscoverer" class="com.cloud.baremetal.BareMetalDiscoverer">
152+
<property name="name" value="Bare Metal Agent"/>
153+
</bean>
154+
155+
<bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer">
156+
<property name="name" value="SCVMMServer"/>
157+
</bean>
158+
159+
<bean id="OvmDiscoverer" class="com.cloud.ovm.hypervisor.OvmDiscoverer">
160+
<property name="name" value="Ovm Discover"/>
161+
</bean>
162+
163+
<bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner">
164+
<property name="name" value="First Fit"/>
165+
</bean>
166+
167+
<bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner">
168+
<property name="name" value="UserDispersing"/>
169+
</bean>
70170

171+
<bean id="UserConcentratedPodPlanner" class="com.cloud.deploy.UserConcentratedPodPlanner">
172+
<property name="name" value="UserConcentratedPod"/>
173+
</bean>
174+
175+
<bean id="BareMetalPlanner" class="com.cloud.deploy.BareMetalPlanner">
176+
<property name="name" value="BareMetal Fit"/>
177+
</bean>
178+
179+
71180
<!--
72-
Gurus
181+
Network Gurus
73182
-->
183+
<bean id="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru">
184+
<property name="name" value="StorageNetworkGuru"/>
185+
</bean>
186+
<bean id="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru">
187+
<property name="name" value="ExternalGuestNetworkGuru"/>
188+
</bean>
189+
<bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru">
190+
<property name="name" value="PublicNetworkGuru"/>
191+
</bean>
192+
<bean id="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru">
193+
<property name="name" value="PodBasedNetworkGuru"/>
194+
</bean>
195+
<bean id="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru">
196+
<property name="name" value="ControlNetworkGuru"/>
197+
</bean>
198+
<bean id="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru">
199+
<property name="name" value="DirectNetworkGuru"/>
200+
</bean>
201+
<bean id="DirectPodBasedNetworkGuru" class="com.cloud.network.guru.DirectPodBasedNetworkGuru">
202+
<property name="name" value="DirectPodBasedNetworkGuru"/>
203+
</bean>
204+
<bean id="OvsGuestNetworkGuru" class="com.cloud.network.guru.OvsGuestNetworkGuru">
205+
<property name="name" value="OvsGuestNetworkGuru"/>
206+
</bean>
207+
<bean id="PrivateNetworkGuru" class="com.cloud.network.guru.PrivateNetworkGuru">
208+
<property name="name" value="PrivateNetworkGuru"/>
209+
</bean>
210+
<bean id="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru">
211+
<property name="name" value="NiciraNvpGuestNetworkGuru"/>
212+
</bean>
213+
214+
<!--
215+
Hypervisor Gurus
216+
-->
217+
<bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru">
218+
<property name="name" value="XenServerGuru"/>
219+
</bean>
74220

221+
<bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru">
222+
<property name="name" value="KVMGuru"/>
223+
</bean>
224+
225+
<bean id="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru">
226+
<property name="name" value="BareMetalGuru"/>
227+
</bean>
228+
229+
<bean id="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru">
230+
<property name="name" value="HypervGuru"/>
231+
</bean>
232+
233+
<bean id="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru">
234+
<property name="name" value="OvmGuru"/>
235+
</bean>
75236

76237
</beans>

‎plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
// This is the default API access checker that grab's the user's account
4545
// based on the account type, access is granted
46-
@Component
4746
@Local(value=APIChecker.class)
4847
public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIChecker {
4948

‎plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
import javax.ejb.Local;
2424

2525
import org.apache.log4j.Logger;
26-
import org.springframework.stereotype.Component;
2726

2827
import com.cloud.hypervisor.Hypervisor.HypervisorType;
2928
import com.cloud.utils.Pair;
3029
import com.cloud.vm.VirtualMachine;
3130
import com.cloud.vm.VirtualMachineProfile;
3231

33-
@Component
3432
@Local(value=DeploymentPlanner.class)
3533
public class UserConcentratedPodPlanner extends FirstFitPlanner implements DeploymentPlanner {
3634

‎plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import javax.naming.ConfigurationException;
2828

2929
import org.apache.log4j.Logger;
30-
import org.springframework.stereotype.Component;
3130

3231
import com.cloud.configuration.Config;
3332
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -36,7 +35,6 @@
3635
import com.cloud.vm.VirtualMachine;
3736
import com.cloud.vm.VirtualMachineProfile;
3837

39-
@Component
4038
@Local(value=DeploymentPlanner.class)
4139
public class UserDispersingPlanner extends FirstFitPlanner implements DeploymentPlanner {
4240

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import org.apache.log4j.Logger;
3232
import org.apache.xmlrpc.XmlRpcException;
33-
import org.springframework.stereotype.Component;
3433

3534
import com.cloud.configuration.Config;
3635
import com.cloud.agent.api.StartupCommand;
@@ -54,7 +53,6 @@
5453
import com.cloud.utils.exception.CloudRuntimeException;
5554
import com.cloud.utils.ssh.SSHCmdHelper;
5655

57-
@Component
5856
@Local(value = Discoverer.class)
5957
public class OvmDiscoverer extends DiscovererBase implements Discoverer,
6058
ResourceStateAdapter {

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import javax.naming.ConfigurationException;
2525

2626
import org.apache.log4j.Logger;
27-
import org.springframework.stereotype.Component;
2827

2928
import com.cloud.agent.AgentManager;
3029
import com.cloud.agent.api.FenceAnswer;
@@ -34,31 +33,22 @@
3433
import com.cloud.ha.FenceBuilder;
3534
import com.cloud.host.HostVO;
3635
import com.cloud.host.Status;
37-
import com.cloud.host.dao.HostDao;
3836
import com.cloud.hypervisor.Hypervisor.HypervisorType;
37+
import com.cloud.utils.component.AdapterBase;
3938
import com.cloud.vm.VMInstanceVO;
4039
import com.cloud.resource.ResourceManager;
4140

42-
@Component
4341
@Local(value=FenceBuilder.class)
44-
public class OvmFencer implements FenceBuilder {
42+
public class OvmFencer extends AdapterBase implements FenceBuilder {
4543
private static final Logger s_logger = Logger.getLogger(OvmFencer.class);
46-
String _name;
4744
@Inject AgentManager _agentMgr;
4845
@Inject ResourceManager _resourceMgr;
4946

5047
@Override
5148
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
52-
_name = name;
5349
return true;
5450
}
5551

56-
@Override
57-
public String getName() {
58-
// TODO Auto-generated method stub
59-
return _name;
60-
}
61-
6252
@Override
6353
public boolean start() {
6454
// TODO Auto-generated method stub

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import javax.ejb.Local;
2020
import javax.inject.Inject;
2121

22-
import org.springframework.stereotype.Component;
23-
2422
import com.cloud.agent.api.to.VirtualMachineTO;
2523
import com.cloud.hypervisor.HypervisorGuru;
2624
import com.cloud.hypervisor.HypervisorGuruBase;
@@ -30,7 +28,6 @@
3028
import com.cloud.vm.VirtualMachine;
3129
import com.cloud.vm.VirtualMachineProfile;
3230

33-
@Component
3431
@Local(value=HypervisorGuru.class)
3532
public class OvmGuru extends HypervisorGuruBase implements HypervisorGuru {
3633
@Inject GuestOSDao _guestOsDao;

‎plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import javax.naming.ConfigurationException;
2525

2626
import org.apache.log4j.Logger;
27-
import org.springframework.stereotype.Component;
2827

2928
import com.cloud.agent.AgentManager;
3029
import com.cloud.agent.api.Answer;
@@ -37,11 +36,11 @@
3736
import com.cloud.host.dao.HostDao;
3837
import com.cloud.hypervisor.Hypervisor.HypervisorType;
3938
import com.cloud.resource.ResourceManager;
39+
import com.cloud.utils.component.AdapterBase;
4040
import com.cloud.vm.VMInstanceVO;
4141

42-
@Component
4342
@Local(value=FenceBuilder.class)
44-
public class XenServerFencer implements FenceBuilder {
43+
public class XenServerFencer extends AdapterBase implements FenceBuilder {
4544
private static final Logger s_logger = Logger.getLogger(XenServerFencer.class);
4645
String _name;
4746

‎plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,14 @@
1919
import javax.ejb.Local;
2020
import javax.inject.Inject;
2121

22-
import org.springframework.stereotype.Component;
23-
2422
import com.cloud.agent.api.to.VirtualMachineTO;
2523
import com.cloud.hypervisor.Hypervisor.HypervisorType;
2624
import com.cloud.storage.GuestOSVO;
27-
import com.cloud.storage.Storage;
2825
import com.cloud.storage.dao.GuestOSDao;
29-
import com.cloud.template.VirtualMachineTemplate;
3026
import com.cloud.template.VirtualMachineTemplate.BootloaderType;
3127
import com.cloud.vm.VirtualMachine;
3228
import com.cloud.vm.VirtualMachineProfile;
3329

34-
@Component
3530
@Local(value=HypervisorGuru.class)
3631
public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru {
3732
@Inject GuestOSDao _guestOsDao;

‎plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import org.apache.log4j.Logger;
3535
import org.apache.xmlrpc.XmlRpcException;
36-
import org.springframework.stereotype.Component;
3736

3837
import com.cloud.agent.AgentManager;
3938
import com.cloud.agent.Listener;
@@ -99,7 +98,6 @@
9998
import com.xensource.xenapi.Types.SessionAuthenticationFailed;
10099
import com.xensource.xenapi.Types.XenAPIException;
101100

102-
@Component
103101
@Local(value=Discoverer.class)
104102
public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
105103
private static final Logger s_logger = Logger.getLogger(XcpServerDiscoverer.class);

0 commit comments

Comments
 (0)