Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.

Commit c062808

Browse files
kelvenykelveny
committed
CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly
1 parent 42ffac3 commit c062808

4 files changed

Lines changed: 352 additions & 234 deletions

File tree

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 108 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232

3333
<context:annotation-config />
3434

35+
<!--=====================================================================================================-->
36+
<!-- -->
37+
<!-- core OSS/non-OSS Common components -->
38+
<!-- -->
39+
<!--=====================================================================================================-->
40+
3541
<!--
3642
@DB support
3743
-->
@@ -640,7 +646,53 @@
640646

641647
<!--
642648
Managers
643-
-->
649+
-->
650+
<bean id="accountManagerImpl" class="com.cloud.user.AccountManagerImpl" >
651+
<property name="UserAuthenticators" value="#{userAuthenticators.Adapters}" />
652+
<property name="SecurityCheckers" value="#{securityCheckers.Adapters}" />
653+
</bean>
654+
655+
<bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl">
656+
<property name="UserAuthenticators" value="#{userAuthenticators.Adapters}" />
657+
<property name="HostAllocators" value="#{hostAllocators.Adapters}" />
658+
</bean>
659+
660+
<bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl">
661+
<property name="StoragePoolAllocators" value="#{storagePoolAllocators.Adapters}" />
662+
</bean>
663+
664+
<bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner">
665+
<property name="name" value="First Fit"/>
666+
<property name="StoragePoolAllocators" value="#{storagePoolAllocators.Adapters}" />
667+
<property name="HostAllocators" value="#{hostAllocators.Adapters}" />
668+
</bean>
669+
670+
<bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" >
671+
<property name="PodAllocators" value="#{podAllocators.Adapters}" />
672+
<property name="Discoverers" value="#{resourceDiscoverers.Adapters}" />
673+
</bean>
674+
675+
<bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" >
676+
<property name="Investigators" value="#{haInvestigators.Adapters}" />
677+
<property name="FenceBuilders" value="#{haFenceBuilders.Adapters}" />
678+
</bean>
679+
680+
<bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" >
681+
<property name="HostAllocators" value="#{hostAllocators.Adapters}" />
682+
<property name="Planners" value="#{deploymentPlanners.Adapters}" />
683+
</bean>
684+
685+
<bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" >
686+
<property name="NetworkGurus" value="#{networkGurus.Adapters}" />
687+
<property name="NetworkElements" value="#{networkElements.Adapters}" />
688+
<property name="IpDeployers" value="#{ipDeployers.Adapters}" />
689+
<property name="DhcpProviders" value="#{dhcpProviders.Adapters}" />
690+
</bean>
691+
692+
<bean id="networkModelImpl" class="com.cloud.network.NetworkModelImpl">
693+
<property name="NetworkElements" value="#{networkElements.Adapters}" />
694+
</bean>
695+
644696
<bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" />
645697

646698
<bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" />
@@ -700,49 +752,6 @@
700752
<bean id="vpcManagerImpl" class="com.cloud.network.vpc.VpcManagerImpl" />
701753
<bean id="vpcVirtualNetworkApplianceManagerImpl" class="com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl" />
702754

703-
<!--
704-
Baremetal components
705-
-->
706-
<!--
707-
<bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement">
708-
<property name="name" value="BareMetalDhcp"/>
709-
</bean>
710-
<bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement">
711-
<property name="name" value="BareMetalPxe"/>
712-
</bean>
713-
<bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement">
714-
<property name="name" value="BareMetalUserdata"/>
715-
</bean>
716-
717-
<bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" />
718-
719-
<bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer">
720-
<property name="name" value="Bare Metal Agent"/>
721-
</bean>
722-
723-
<bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner">
724-
<property name="name" value="BareMetal Fit"/>
725-
</bean>
726-
727-
<bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru">
728-
<property name="name" value="BaremetalGuru"/>
729-
</bean>
730-
731-
<bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector">
732-
<property name="name" value="BaremetalPlannerSelector"/>
733-
</bean>
734-
735-
<bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/>
736-
<bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/>
737-
<bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/>
738-
<bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl" />
739-
<bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" />
740-
741-
<bean id="bAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" />
742-
<bean id="baremetalDhcpDaoImpl" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl" />
743-
<bean id="baremetalPxeDaoImpl" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl" />
744-
-->
745-
746755
<!--
747756
Misc components
748757
-->
@@ -773,7 +782,7 @@
773782
<bean id="globalLoadBalancingRulesServiceImpl" class="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" />
774783
<bean id="hypervsiorHostEndPointRpcServer" class="org.apache.cloudstack.storage.HypervsiorHostEndPointRpcServer" />
775784
<bean id="iSCSI" class="org.apache.cloudstack.storage.datastore.type.ISCSI" />
776-
<bean id="iSO" class="org.apache.cloudstack.storage.image.format.ISO" />
785+
<bean id="ISO" class="org.apache.cloudstack.storage.image.format.ISO" />
777786
<bean id="imageDataFactoryImpl" class="org.apache.cloudstack.storage.image.ImageDataFactoryImpl" />
778787
<bean id="imageDataManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageDataManagerImpl" />
779788
<bean id="imageDataStoreHelper" class="org.apache.cloudstack.storage.image.datastore.ImageDataStoreHelper" />
@@ -783,12 +792,12 @@
783792
<bean id="iso" class="org.apache.cloudstack.engine.subsystem.api.storage.type.Iso" />
784793
<bean id="networkFileSystem" class="org.apache.cloudstack.storage.datastore.type.NetworkFileSystem" />
785794
<bean id="networkRestService" class="org.apache.cloudstack.engine.rest.service.api.NetworkRestService" />
786-
<bean id="oVA" class="org.apache.cloudstack.storage.image.format.OVA" />
795+
<bean id="OVA" class="org.apache.cloudstack.storage.image.format.OVA" />
787796
<bean id="objectInDataStoreManagerImpl" class="org.apache.cloudstack.storage.datastore.ObjectInDataStoreManagerImpl" />
788797
<bean id="podRestService" class="org.apache.cloudstack.engine.rest.service.api.PodRestService" />
789798
<bean id="primaryDataStoreHelper" class="org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper" />
790799
<bean id="provisioningServiceImpl" class="org.apache.cloudstack.engine.service.api.ProvisioningServiceImpl" />
791-
<bean id="qCOW2" class="org.apache.cloudstack.storage.image.format.QCOW2" />
800+
<bean id="QCOW2" class="org.apache.cloudstack.storage.image.format.QCOW2" />
792801
<bean id="registerCompleteServlet" class="com.cloud.servlet.RegisterCompleteServlet" />
793802
<bean id="rootDisk" class="org.apache.cloudstack.engine.subsystem.api.storage.type.RootDisk" />
794803
<bean id="snapshotDataFactoryImpl" class="org.apache.cloudstack.storage.snapshot.SnapshotDataFactoryImpl" />
@@ -800,7 +809,7 @@
800809
<bean id="unknown" class="org.apache.cloudstack.storage.image.format.Unknown" />
801810
<bean id="usageEventUtils" class="com.cloud.event.UsageEventUtils" />
802811
<bean id="userContextInitializer" class="com.cloud.user.UserContextInitializer" />
803-
<bean id="vHD" class="org.apache.cloudstack.storage.image.format.VHD" />
812+
<bean id="VHD" class="org.apache.cloudstack.storage.image.format.VHD" />
804813
<bean id="vMEntityManagerImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VMEntityManagerImpl" />
805814
<bean id="virtualMachineEntityFactory" class="org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntityFactory" />
806815
<bean id="virtualMachineEntityImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntityImpl" />
@@ -819,10 +828,60 @@
819828
<bean id="mockAgentManagerImpl" class="com.cloud.agent.manager.MockAgentManagerImpl" />
820829
<bean id="mockStorageManagerImpl" class="com.cloud.agent.manager.MockStorageManagerImpl" />
821830
<bean id="mockVmManagerImpl" class="com.cloud.agent.manager.MockVmManagerImpl" />
822-
<bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" />
823831
<bean id="simulatorManagerImpl" class="com.cloud.agent.manager.SimulatorManagerImpl" />
824832
<bean id="vMSnapshotManagerImpl" class="com.cloud.vm.snapshot.VMSnapshotManagerImpl" />
825833
<bean id="volumeManagerImpl" class="com.cloud.storage.VolumeManagerImpl" />
826834
<bean id="ClassicalPrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl" />
835+
836+
837+
<!--=======================================================================================================-->
838+
<!-- -->
839+
<!-- Module-basis OSS/non-OSS Common components -->
840+
<!-- -->
841+
<!--=======================================================================================================-->
842+
843+
<!--
844+
Baremetal components
845+
-->
846+
847+
<!--
848+
<bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement">
849+
<property name="name" value="BareMetalDhcp"/>
850+
</bean>
851+
<bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement">
852+
<property name="name" value="BareMetalPxe"/>
853+
</bean>
854+
<bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement">
855+
<property name="name" value="BareMetalUserdata"/>
856+
</bean>
857+
858+
<bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" />
859+
860+
<bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer">
861+
<property name="name" value="Bare Metal Agent"/>
862+
</bean>
863+
864+
<bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner">
865+
<property name="name" value="BareMetal Fit"/>
866+
</bean>
867+
868+
<bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru">
869+
<property name="name" value="BaremetalGuru"/>
870+
</bean>
871+
872+
<bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector">
873+
<property name="name" value="BaremetalPlannerSelector"/>
874+
</bean>
875+
876+
<bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/>
877+
<bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/>
878+
<bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/>
879+
<bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl" />
880+
<bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" />
881+
882+
<bean id="BAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" />
883+
<bean id="baremetalDhcpDaoImpl" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl" />
884+
<bean id="baremetalPxeDaoImpl" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl" />
885+
-->
827886

828887
</beans>

0 commit comments

Comments
 (0)