diff --git a/server/src/main/java/com/cloud/acl/DomainChecker.java b/server/src/main/java/com/cloud/acl/DomainChecker.java index aba0d456bfa2..29b1da722390 100644 --- a/server/src/main/java/com/cloud/acl/DomainChecker.java +++ b/server/src/main/java/com/cloud/acl/DomainChecker.java @@ -98,7 +98,8 @@ public class DomainChecker extends AdapterBase implements SecurityChecker { private AccountService accountService; public static final Logger s_logger = Logger.getLogger(DomainChecker.class.getName()); - protected DomainChecker() { + + public DomainChecker() { super(); } diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java index be6f4012f8f8..9212725b7c07 100644 --- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java +++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java @@ -141,7 +141,7 @@ public boolean configure(String name, Map params) throws Configu return true; } - protected RecreateHostAllocator() { + public RecreateHostAllocator() { super(); } } diff --git a/server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java index 3c28106ea6c6..44726c8a64c3 100644 --- a/server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java @@ -43,7 +43,7 @@ public class AffinityGroupJoinDaoImpl extends GenericDaoBase agIdSearch; - protected AffinityGroupJoinDaoImpl() { + public AffinityGroupJoinDaoImpl() { agSearch = createSearchBuilder(); agSearch.and("idIN", agSearch.entity().getId(), SearchCriteria.Op.IN); diff --git a/server/src/main/java/com/cloud/conf/MainConfiguration.java b/server/src/main/java/com/cloud/conf/MainConfiguration.java new file mode 100644 index 000000000000..16b21f2d11e6 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/MainConfiguration.java @@ -0,0 +1,65 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf; + +import com.cloud.conf.com.cloud.upgrade.DatabaseCreatorContext; +import com.cloud.conf.meta_inf.cloudstack.core.SpringServerCoreManagersContext; +import com.cloud.conf.meta_inf.cloudstack.core.SpringServerCoreMiscContext; +import com.cloud.conf.meta_inf.cloudstack.server_alert_adapter_backend.SpringServerAlertAdapterBackendContext; +import com.cloud.conf.meta_inf.cloudstack.server_alert_adapter_compute.SpringServerAlertAdapterComputeContext; +import com.cloud.conf.meta_inf.cloudstack.server_alert_adapter_storage.SpringServerAlertAdapterStorageContext; +import com.cloud.conf.meta_inf.cloudstack.server_allocator.SpringServerAllocatorContext; +import com.cloud.conf.meta_inf.cloudstack.server_api.SpringServerApiContext; +import com.cloud.conf.meta_inf.cloudstack.server_compute.SpringServerComputeContext; +import com.cloud.conf.meta_inf.cloudstack.server_discoverer.SpringServerDiscovererContext; +import com.cloud.conf.meta_inf.cloudstack.server_fencer.SpringServerFencerContext; +import com.cloud.conf.meta_inf.cloudstack.server_investigator.SpringServerInvestigatorContext; +import com.cloud.conf.meta_inf.cloudstack.server_network.SpringServerNetworkContext; +import com.cloud.conf.meta_inf.cloudstack.server_planner.SpringServerPlannerContext; +import com.cloud.conf.meta_inf.cloudstack.server_storage.SpringServerStorageContext; +import com.cloud.conf.meta_inf.cloudstack.server_template_adapter.SpringServerTemplateAdapterContext; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + + +/** + * Generated Main Java based configuration + * + */ +@Configuration +@Import({ + SpringServerComputeContext.class, + SpringServerApiContext.class, + SpringServerCoreManagersContext.class, + DatabaseCreatorContext.class, + SpringServerAllocatorContext.class, + SpringServerCoreMiscContext.class, + SpringServerPlannerContext.class, + SpringServerAlertAdapterComputeContext.class, + SpringServerInvestigatorContext.class, + SpringServerNetworkContext.class, + SpringServerDiscovererContext.class, + SpringServerFencerContext.class, + SpringServerAlertAdapterStorageContext.class, + SpringServerTemplateAdapterContext.class, + SpringServerAlertAdapterBackendContext.class, + SpringServerStorageContext.class +}) +public class MainConfiguration { + + +} diff --git a/server/src/main/java/com/cloud/conf/com/cloud/upgrade/DatabaseCreatorContext.java b/server/src/main/java/com/cloud/conf/com/cloud/upgrade/DatabaseCreatorContext.java new file mode 100644 index 000000000000..27bd18759d0b --- /dev/null +++ b/server/src/main/java/com/cloud/conf/com/cloud/upgrade/DatabaseCreatorContext.java @@ -0,0 +1,70 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.com.cloud.upgrade; + +import com.cloud.upgrade.DatabaseUpgradeChecker; +import com.cloud.upgrade.dao.VersionDaoImpl; +import com.cloud.utils.component.ComponentContext; +import com.cloud.utils.component.ComponentInstantiationPostProcessor; +import com.cloud.utils.db.TransactionContextBuilder; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class DatabaseCreatorContext { + + + @Bean("instantiatePostProcessor") + public ComponentInstantiationPostProcessor instantiatePostProcessor( + @Qualifier("transactionContextBuilder") + TransactionContextBuilder transactionContextBuilder) { + ComponentInstantiationPostProcessor bean = new ComponentInstantiationPostProcessor(); + ArrayList list0 = new ArrayList(); + list0 .add(transactionContextBuilder); + bean.setInterceptors(list0); + return bean; + } + + @Bean("databaseUpgradeChecker") + public DatabaseUpgradeChecker databaseUpgradeChecker() { + return new DatabaseUpgradeChecker(); + } + + @Bean("componentContext") + public ComponentContext componentContext() { + return new ComponentContext(); + } + + @Bean("transactionContextBuilder") + public TransactionContextBuilder transactionContextBuilder() { + return new TransactionContextBuilder(); + } + + @Bean("versionDaoImpl") + public VersionDaoImpl versionDaoImpl() { + return new VersionDaoImpl(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/core/SpringServerCoreManagersContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/core/SpringServerCoreManagersContext.java new file mode 100644 index 000000000000..117f4601cecc --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/core/SpringServerCoreManagersContext.java @@ -0,0 +1,433 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.core; + +import com.cloud.alert.AlertManagerImpl; +import com.cloud.api.ApiAsyncJobDispatcher; +import com.cloud.api.query.QueryManagerImpl; +import com.cloud.api.query.dao.AffinityGroupJoinDaoImpl; +import com.cloud.capacity.CapacityManagerImpl; +import com.cloud.deploy.dao.PlannerHostReservationDaoImpl; +import com.cloud.metadata.ResourceMetaDataManagerImpl; +import com.cloud.network.ExternalDeviceUsageManagerImpl; +import com.cloud.network.ExternalNetworkDeviceManagerImpl; +import com.cloud.network.IpAddressManagerImpl; +import com.cloud.network.Ipv6AddressManagerImpl; +import com.cloud.network.NetworkMigrationManagerImpl; +import com.cloud.network.NetworkUsageManagerImpl; +import com.cloud.network.StorageNetworkManagerImpl; +import com.cloud.network.as.AutoScaleManagerImpl; +import com.cloud.network.lb.LBHealthCheckManagerImpl; +import com.cloud.network.router.CommandSetupHelper; +import com.cloud.network.router.NetworkHelperImpl; +import com.cloud.network.router.NicProfileHelperImpl; +import com.cloud.network.router.RouterControlHelper; +import com.cloud.network.router.VirtualNetworkApplianceManagerImpl; +import com.cloud.network.router.VpcNetworkHelperImpl; +import com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl; +import com.cloud.network.rules.RulesManagerImpl; +import com.cloud.network.rules.VirtualNetworkApplianceFactory; +import com.cloud.network.security.SecurityGroupManagerImpl2; +import com.cloud.network.vpc.NetworkACLServiceImpl; +import com.cloud.network.vpc.VpcPrivateGatewayTransactionCallable; +import com.cloud.projects.ProjectManagerImpl; +import com.cloud.resourceicon.ResourceIconManagerImpl; +import com.cloud.resourcelimit.ResourceLimitManagerImpl; +import com.cloud.server.ConfigurationServerImpl; +import com.cloud.server.StatsCollector; +import com.cloud.storage.ImageStoreServiceImpl; +import com.cloud.storage.ImageStoreUploadMonitorImpl; +import com.cloud.storage.JavaStorageLayer; +import com.cloud.storage.OCFS2ManagerImpl; +import com.cloud.storage.StorageManagerImpl; +import com.cloud.storage.StoragePoolAutomationImpl; +import com.cloud.storage.download.DownloadMonitorImpl; +import com.cloud.storage.snapshot.SnapshotManagerImpl; +import com.cloud.storage.snapshot.SnapshotSchedulerImpl; +import com.cloud.storage.upload.UploadMonitorImpl; +import com.cloud.tags.ResourceManagerUtilImpl; +import com.cloud.tags.TaggedResourceManagerImpl; +import com.cloud.usage.UsageServiceImpl; +import com.cloud.user.DomainManagerImpl; +import com.cloud.uuididentity.UUIDManagerImpl; +import com.cloud.vm.UserVmManagerImpl; +import com.cloud.vm.snapshot.VMSnapshotManagerImpl; +import org.apache.cloudstack.acl.ProjectRoleManagerImpl; +import org.apache.cloudstack.acl.RoleManagerImpl; +import org.apache.cloudstack.agent.lb.IndirectAgentLBServiceImpl; +import org.apache.cloudstack.diagnostics.DiagnosticsServiceImpl; +import org.apache.cloudstack.direct.download.DirectDownloadManagerImpl; +import org.apache.cloudstack.network.lb.ApplicationLoadBalancerManagerImpl; +import org.apache.cloudstack.network.ssl.CertServiceImpl; +import org.apache.cloudstack.network.topology.AdvancedNetworkTopology; +import org.apache.cloudstack.network.topology.AdvancedNetworkVisitor; +import org.apache.cloudstack.network.topology.BasicNetworkTopology; +import org.apache.cloudstack.network.topology.BasicNetworkVisitor; +import org.apache.cloudstack.network.topology.NetworkTopologyContext; +import org.apache.cloudstack.poll.BackgroundPollManagerImpl; +import org.apache.cloudstack.region.RegionManagerImpl; +import org.apache.cloudstack.region.RegionServiceImpl; +import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + */ +@Configuration +public class SpringServerCoreManagersContext { + + + @Bean("capacityManagerImpl") + public CapacityManagerImpl capacityManagerImpl() { + return new CapacityManagerImpl(); + } + + @Bean("ApiAsyncJobDispatcher") + public ApiAsyncJobDispatcher ApiAsyncJobDispatcher() { + ApiAsyncJobDispatcher bean = new ApiAsyncJobDispatcher(); + bean.setName("ApiAsyncJobDispatcher"); + return bean; + } + + @Bean("lBHealthCheckManagerImpl") + public LBHealthCheckManagerImpl lBHealthCheckManagerImpl() { + return new LBHealthCheckManagerImpl(); + } + + @Bean("vpcVirtualNetworkApplianceManagerImpl") + public VpcVirtualNetworkApplianceManagerImpl vpcVirtualNetworkApplianceManagerImpl() { + return new VpcVirtualNetworkApplianceManagerImpl(); + } + + @Bean("projRoleManagerImpl") + public ProjectRoleManagerImpl projRoleManagerImpl() { + return new ProjectRoleManagerImpl(); + } + + @Bean("NetworkMigrationManagerImpl") + public NetworkMigrationManagerImpl NetworkMigrationManagerImpl() { + return new NetworkMigrationManagerImpl(); + } + + @Bean("oCFS2ManagerImpl") + public OCFS2ManagerImpl oCFS2ManagerImpl() { + return new OCFS2ManagerImpl(); + } + + @Bean("vpcTxCallable") + public VpcPrivateGatewayTransactionCallable vpcTxCallable() { + return new VpcPrivateGatewayTransactionCallable(); + } + + @Bean("imageStoreUploadMonitorImpl") + public ImageStoreUploadMonitorImpl imageStoreUploadMonitorImpl() { + return new ImageStoreUploadMonitorImpl(); + } + + @Bean("configurationServerImpl") + public ConfigurationServerImpl configurationServerImpl() { + return new ConfigurationServerImpl(); + } + + @Bean("networkACLServiceImpl") + public NetworkACLServiceImpl networkACLServiceImpl() { + return new NetworkACLServiceImpl(); + } + + @Bean("storagePoolAutomationImpl") + public StoragePoolAutomationImpl storagePoolAutomationImpl() { + return new StoragePoolAutomationImpl(); + } + + @Bean("usageServiceImpl") + public UsageServiceImpl usageServiceImpl() { + return new UsageServiceImpl(); + } + + @Bean("imageStoreServiceImpl") + public ImageStoreServiceImpl imageStoreServiceImpl() { + return new ImageStoreServiceImpl(); + } + + @Bean("AffinityGroupJoinDaoImpl") + public AffinityGroupJoinDaoImpl AffinityGroupJoinDaoImpl() { + return new AffinityGroupJoinDaoImpl(); + } + + @Bean("autoScaleManagerImpl") + public AutoScaleManagerImpl autoScaleManagerImpl() { + return new AutoScaleManagerImpl(); + } + + @Bean("ipv6AddressManagerImpl") + public Ipv6AddressManagerImpl ipv6AddressManagerImpl() { + return new Ipv6AddressManagerImpl(); + } + + @Bean("PlannerHostReservationDaoImpl") + public PlannerHostReservationDaoImpl PlannerHostReservationDaoImpl() { + return new PlannerHostReservationDaoImpl(); + } + + @Bean("resourceMetaDataManagerImpl") + public ResourceMetaDataManagerImpl resourceMetaDataManagerImpl() { + return new ResourceMetaDataManagerImpl(); + } + + @Bean("indirectAgentLBService") + public IndirectAgentLBServiceImpl indirectAgentLBService() { + return new IndirectAgentLBServiceImpl(); + } + + @Bean("vpcNetworkHelper") + public VpcNetworkHelperImpl vpcNetworkHelper() { + return new VpcNetworkHelperImpl(); + } + + @Bean("certServiceImpl") + public CertServiceImpl certServiceImpl() { + return new CertServiceImpl(); + } + + @Bean("advancedNetworkVisitor") + public AdvancedNetworkVisitor advancedNetworkVisitor() { + return new AdvancedNetworkVisitor(); + } + + @Bean("statsCollector") + public StatsCollector statsCollector() { + return new StatsCollector(); + } + + @Bean("routerControlHelper") + public RouterControlHelper routerControlHelper() { + return new RouterControlHelper(); + } + + @Bean("projectManagerImpl") + public ProjectManagerImpl projectManagerImpl() { + return new ProjectManagerImpl(); + } + + @Bean("networkUsageManagerImpl") + public NetworkUsageManagerImpl networkUsageManagerImpl() { + return new NetworkUsageManagerImpl(); + } + + @Bean("resourceManagerUtilImpl") + public ResourceManagerUtilImpl resourceManagerUtilImpl() { + return new ResourceManagerUtilImpl(); + } + + @Bean("commandSetupHelper") + public CommandSetupHelper commandSetupHelper() { + return new CommandSetupHelper(); + } + + @Bean("externalNetworkDeviceManagerImpl") + public ExternalNetworkDeviceManagerImpl externalNetworkDeviceManagerImpl() { + return new ExternalNetworkDeviceManagerImpl(); + } + + @Bean("networkHelper") + public NetworkHelperImpl networkHelper() { + return new NetworkHelperImpl(); + } + + @Bean("DiagnosticsService") + public DiagnosticsServiceImpl DiagnosticsService() { + return new DiagnosticsServiceImpl(); + } + + @Bean("regionServiceImpl") + public RegionServiceImpl regionServiceImpl() { + return new RegionServiceImpl(); + } + + @Bean("storageManagerImpl") + public StorageManagerImpl storageManagerImpl() { + return new StorageManagerImpl(); + } + + @Bean("externalDeviceUsageManagerImpl") + public ExternalDeviceUsageManagerImpl externalDeviceUsageManagerImpl() { + return new ExternalDeviceUsageManagerImpl(); + } + + @Bean("uploadMonitorImpl") + public UploadMonitorImpl uploadMonitorImpl() { + return new UploadMonitorImpl(); + } + + @Bean("uUIDManagerImpl") + public UUIDManagerImpl uUIDManagerImpl() { + return new UUIDManagerImpl(); + } + + @Bean("resourceLimitManagerImpl") + public ResourceLimitManagerImpl resourceLimitManagerImpl() { + return new ResourceLimitManagerImpl(); + } + + @Bean("snapshotManagerImpl") + public SnapshotManagerImpl snapshotManagerImpl() { + return new SnapshotManagerImpl(); + } + + @Bean("userVmManagerImpl") + public UserVmManagerImpl userVmManagerImpl() { + return new UserVmManagerImpl(); + } + + @Bean("advancedNetworkTopology") + public AdvancedNetworkTopology advancedNetworkTopology() { + return new AdvancedNetworkTopology(); + } + + @Bean("virtualNetworkApplianceFactory") + public VirtualNetworkApplianceFactory virtualNetworkApplianceFactory() { + return new VirtualNetworkApplianceFactory(); + } + + @Bean("downloadMonitorImpl") + public DownloadMonitorImpl downloadMonitorImpl() { + return new DownloadMonitorImpl(); + } + + @Bean("directDownloadManager") + public DirectDownloadManagerImpl directDownloadManager() { + return new DirectDownloadManagerImpl(); + } + + @Bean("nicProfileHelper") + public NicProfileHelperImpl nicProfileHelper() { + return new NicProfileHelperImpl(); + } + + @Bean("regionManagerImpl") + public RegionManagerImpl regionManagerImpl() { + return new RegionManagerImpl(); + } + + @Bean("snapshotSchedulerImpl") + public SnapshotSchedulerImpl snapshotSchedulerImpl( + @Qualifier("ApiAsyncJobDispatcher") + ApiAsyncJobDispatcher ApiAsyncJobDispatcher) { + SnapshotSchedulerImpl bean = new SnapshotSchedulerImpl(); + bean.setAsyncJobDispatcher(ApiAsyncJobDispatcher); + return bean; + } + + @Bean("securityGroupManagerImpl2") + public SecurityGroupManagerImpl2 securityGroupManagerImpl2() { + return new SecurityGroupManagerImpl2(); + } + + @Bean("taggedResourceManagerImpl") + public TaggedResourceManagerImpl taggedResourceManagerImpl() { + return new TaggedResourceManagerImpl(); + } + + @Bean("resourceIconManager") + public ResourceIconManagerImpl resourceIconManager() { + return new ResourceIconManagerImpl(); + } + + @Bean("bgPollManager") + public BackgroundPollManagerImpl bgPollManager() { + return new BackgroundPollManagerImpl(); + } + + @Bean("domainManagerImpl") + public DomainManagerImpl domainManagerImpl() { + return new DomainManagerImpl(); + } + + @Bean("basicNetworkVisitor") + public BasicNetworkVisitor basicNetworkVisitor() { + return new BasicNetworkVisitor(); + } + + @Bean("roleManagerImpl") + public RoleManagerImpl roleManagerImpl() { + return new RoleManagerImpl(); + } + + @Bean("routerDeploymentDefinitionBuilder") + public RouterDeploymentDefinitionBuilder routerDeploymentDefinitionBuilder() { + return new RouterDeploymentDefinitionBuilder(); + } + + @Bean("rulesManagerImpl") + public RulesManagerImpl rulesManagerImpl() { + return new RulesManagerImpl(); + } + + @Bean("vMSnapshotManagerImpl") + public VMSnapshotManagerImpl vMSnapshotManagerImpl() { + return new VMSnapshotManagerImpl(); + } + + @Bean("alertManagerImpl") + public AlertManagerImpl alertManagerImpl() { + return new AlertManagerImpl(); + } + + @Bean("storageLayer") + public JavaStorageLayer storageLayer() { + return new JavaStorageLayer(); + } + + @Bean("queryManagerImpl") + public QueryManagerImpl queryManagerImpl() { + return new QueryManagerImpl(); + } + + @Bean("ipAddressManagerImpl") + public IpAddressManagerImpl ipAddressManagerImpl() { + return new IpAddressManagerImpl(); + } + + @Bean("virtualNetworkApplianceManagerImpl") + public VirtualNetworkApplianceManagerImpl virtualNetworkApplianceManagerImpl() { + return new VirtualNetworkApplianceManagerImpl(); + } + + @Bean("basicNetworkTopology") + public BasicNetworkTopology basicNetworkTopology() { + return new BasicNetworkTopology(); + } + + @Bean("storageNetworkManagerImpl") + public StorageNetworkManagerImpl storageNetworkManagerImpl() { + return new StorageNetworkManagerImpl(); + } + + @Bean("ApplicationLoadBalancerService") + public ApplicationLoadBalancerManagerImpl ApplicationLoadBalancerService() { + return new ApplicationLoadBalancerManagerImpl(); + } + + @Bean(name = "topologyContext", initMethod = "init") + public NetworkTopologyContext topologyContext() { + return new NetworkTopologyContext(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/core/SpringServerCoreMiscContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/core/SpringServerCoreMiscContext.java new file mode 100644 index 000000000000..4d5f2590e31c --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/core/SpringServerCoreMiscContext.java @@ -0,0 +1,132 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.core; + +import com.cloud.agent.manager.authn.impl.BasicAgentAuthManager; +import com.cloud.api.ApiDBUtils; +import com.cloud.api.ApiDispatcher; +import com.cloud.api.ApiResponseHelper; +import com.cloud.api.dispatch.CommandCreationWorker; +import com.cloud.api.dispatch.DispatchChainFactory; +import com.cloud.api.dispatch.ParamGenericValidationWorker; +import com.cloud.api.dispatch.ParamUnpackWorker; +import com.cloud.api.dispatch.SpecificCmdValidationWorker; +import com.cloud.event.ActionEventUtils; +import com.cloud.event.AlertGenerator; +import com.cloud.hypervisor.CloudZonesStartupProcessor; +import com.cloud.hypervisor.kvm.dpdk.DpdkHelperImpl; +import com.cloud.network.ExternalIpAddressAllocator; +import com.cloud.network.element.VpcVirtualRouterElement; +import org.apache.cloudstack.utils.identity.ManagementServerNode; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + */ +@Configuration +public class SpringServerCoreMiscContext { + + + @Bean("ExternalIpAddressAllocator") + public ExternalIpAddressAllocator ExternalIpAddressAllocator() { + ExternalIpAddressAllocator bean = new ExternalIpAddressAllocator(); + bean.setName("Basic"); + return bean; + } + + @Bean("apiResponseHelper") + public ApiResponseHelper apiResponseHelper() { + return new ApiResponseHelper(); + } + + @Bean("actionEventUtils") + public ActionEventUtils actionEventUtils() { + return new ActionEventUtils(); + } + + @Bean("paramUnpackWorker") + public ParamUnpackWorker paramUnpackWorker() { + return new ParamUnpackWorker(); + } + + @Bean("DPDKHelper") + public DpdkHelperImpl DPDKHelper() { + return new DpdkHelperImpl(); + } + + @Bean("paramGenericValidationWorker") + public ParamGenericValidationWorker paramGenericValidationWorker() { + return new ParamGenericValidationWorker(); + } + + @Bean("apiDispatcher") + public ApiDispatcher apiDispatcher() { + return new ApiDispatcher(); + } + + @Bean("dispatchChainFactory") + public DispatchChainFactory dispatchChainFactory() { + return new DispatchChainFactory(); + } + + @Bean("specificCmdValidationWorker") + public SpecificCmdValidationWorker specificCmdValidationWorker() { + return new SpecificCmdValidationWorker(); + } + + @Bean("apiDBUtils") + public ApiDBUtils apiDBUtils() { + return new ApiDBUtils(); + } + + @Bean("basicAgentAuthManager") + public BasicAgentAuthManager basicAgentAuthManager() { + BasicAgentAuthManager bean = new BasicAgentAuthManager(); + bean.setName("BASIC"); + return bean; + } + + @Bean("managementServerNode") + public ManagementServerNode managementServerNode() { + return new ManagementServerNode(); + } + + @Bean("commandCreationWorker") + public CommandCreationWorker commandCreationWorker() { + return new CommandCreationWorker(); + } + + @Bean("VpcVirtualRouter") + public VpcVirtualRouterElement VpcVirtualRouter() { + VpcVirtualRouterElement bean = new VpcVirtualRouterElement(); + bean.setName("VpcVirtualRouter"); + return bean; + } + + @Bean("alertGenerator") + public AlertGenerator alertGenerator() { + return new AlertGenerator(); + } + + @Bean("cloudZonesStartupProcessor") + public CloudZonesStartupProcessor cloudZonesStartupProcessor() { + return new CloudZonesStartupProcessor(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_backend/SpringServerAlertAdapterBackendContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_backend/SpringServerAlertAdapterBackendContext.java new file mode 100644 index 000000000000..4923f99c5335 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_backend/SpringServerAlertAdapterBackendContext.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_alert_adapter_backend; + +import com.cloud.alert.ClusterAlertAdapter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerAlertAdapterBackendContext { + + + @Bean("clusterAlertAdapter") + public ClusterAlertAdapter clusterAlertAdapter() { + return new ClusterAlertAdapter(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_compute/SpringServerAlertAdapterComputeContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_compute/SpringServerAlertAdapterComputeContext.java new file mode 100644 index 000000000000..d898f2a2758a --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_compute/SpringServerAlertAdapterComputeContext.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_alert_adapter_compute; + +import com.cloud.alert.ConsoleProxyAlertAdapter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerAlertAdapterComputeContext { + + + @Bean("consoleProxyAlertAdapter") + public ConsoleProxyAlertAdapter consoleProxyAlertAdapter() { + return new ConsoleProxyAlertAdapter(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_storage/SpringServerAlertAdapterStorageContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_storage/SpringServerAlertAdapterStorageContext.java new file mode 100644 index 000000000000..54e9fdc2b660 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_alert_adapter_storage/SpringServerAlertAdapterStorageContext.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_alert_adapter_storage; + +import com.cloud.alert.SecondaryStorageVmAlertAdapter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerAlertAdapterStorageContext { + + + @Bean("secondaryStorageVmAlertAdapter") + public SecondaryStorageVmAlertAdapter secondaryStorageVmAlertAdapter() { + return new SecondaryStorageVmAlertAdapter(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_allocator/SpringServerAllocatorContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_allocator/SpringServerAllocatorContext.java new file mode 100644 index 000000000000..ad3120c9da33 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_allocator/SpringServerAllocatorContext.java @@ -0,0 +1,65 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_allocator; + +import com.cloud.agent.manager.allocator.impl.FirstFitAllocator; +import com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator; +import com.cloud.agent.manager.allocator.impl.RecreateHostAllocator; +import com.cloud.agent.manager.allocator.impl.TestingAllocator; +import com.cloud.consoleproxy.ConsoleProxyBalanceAllocator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerAllocatorContext { + + + @Bean("FirstFitRouting") + public FirstFitRoutingAllocator FirstFitRouting() { + FirstFitRoutingAllocator bean = new FirstFitRoutingAllocator(); + bean.setName("FirstFitRouting"); + return bean; + } + + @Bean("testingAllocator") + public TestingAllocator testingAllocator() { + return new TestingAllocator(); + } + + @Bean("ConsoleProxyAllocator") + public ConsoleProxyBalanceAllocator ConsoleProxyAllocator() { + ConsoleProxyBalanceAllocator bean = new ConsoleProxyBalanceAllocator(); + bean.setName("Balance"); + return bean; + } + + @Bean("firstFitAllocator") + public FirstFitAllocator firstFitAllocator() { + return new FirstFitAllocator(); + } + + @Bean("recreateHostAllocator") + public RecreateHostAllocator recreateHostAllocator() { + return new RecreateHostAllocator(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_api/SpringServerApiContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_api/SpringServerApiContext.java new file mode 100644 index 000000000000..0f6d1ba9beb7 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_api/SpringServerApiContext.java @@ -0,0 +1,43 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_api; + +import com.cloud.acl.AffinityGroupAccessChecker; +import com.cloud.acl.DomainChecker; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerApiContext { + + + @Bean("domainChecker") + public DomainChecker domainChecker() { + return new DomainChecker(); + } + + @Bean("affinityGroupAccessChecker") + public AffinityGroupAccessChecker affinityGroupAccessChecker() { + return new AffinityGroupAccessChecker(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_compute/SpringServerComputeContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_compute/SpringServerComputeContext.java new file mode 100644 index 000000000000..ff0fb9d6e0e4 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_compute/SpringServerComputeContext.java @@ -0,0 +1,53 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_compute; + +import com.cloud.hypervisor.KVMGuru; +import com.cloud.hypervisor.LXCGuru; +import org.apache.cloudstack.vm.UnmanagedVMsManagerImpl; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerComputeContext { + + + @Bean("LXCGuru") + public LXCGuru LXCGuru() { + LXCGuru bean = new LXCGuru(); + bean.setName("LXCGuru"); + return bean; + } + + @Bean("vmImportService") + public UnmanagedVMsManagerImpl vmImportService() { + return new UnmanagedVMsManagerImpl(); + } + + @Bean("KVMGuru") + public KVMGuru KVMGuru() { + KVMGuru bean = new KVMGuru(); + bean.setName("KVMGuru"); + return bean; + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_discoverer/SpringServerDiscovererContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_discoverer/SpringServerDiscovererContext.java new file mode 100644 index 000000000000..e03df46a65a0 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_discoverer/SpringServerDiscovererContext.java @@ -0,0 +1,55 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_discoverer; + +import com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer; +import com.cloud.hypervisor.kvm.discoverer.LxcServerDiscoverer; +import com.cloud.resource.DummyHostDiscoverer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerDiscovererContext { + + + @Bean("dummyHostDiscoverer") + public DummyHostDiscoverer dummyHostDiscoverer() { + DummyHostDiscoverer bean = new DummyHostDiscoverer(); + bean.setName("dummyHostDiscoverer"); + return bean; + } + + @Bean("KvmServerDiscoverer") + public KvmServerDiscoverer KvmServerDiscoverer() { + KvmServerDiscoverer bean = new KvmServerDiscoverer(); + bean.setName("KVM Agent"); + return bean; + } + + @Bean("LxcServerDiscoverer") + public LxcServerDiscoverer LxcServerDiscoverer() { + LxcServerDiscoverer bean = new LxcServerDiscoverer(); + bean.setName("Lxc Discover"); + return bean; + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_fencer/SpringServerFencerContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_fencer/SpringServerFencerContext.java new file mode 100644 index 000000000000..e00569a31ed5 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_fencer/SpringServerFencerContext.java @@ -0,0 +1,45 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_fencer; + +import com.cloud.ha.KVMFencer; +import com.cloud.ha.RecreatableFencer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerFencerContext { + + + @Bean("recreatableFencer") + public RecreatableFencer recreatableFencer() { + return new RecreatableFencer(); + } + + @Bean("KVMFencer") + public KVMFencer KVMFencer() { + KVMFencer bean = new KVMFencer(); + bean.setName("KVMFenceBuilder"); + return bean; + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_investigator/SpringServerInvestigatorContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_investigator/SpringServerInvestigatorContext.java new file mode 100644 index 000000000000..98fd3626e06c --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_investigator/SpringServerInvestigatorContext.java @@ -0,0 +1,63 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_investigator; + +import com.cloud.ha.CheckOnAgentInvestigator; +import com.cloud.ha.ManagementIPSystemVMInvestigator; +import com.cloud.ha.UserVmDomRInvestigator; +import com.cloud.ha.XenServerInvestigator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerInvestigatorContext { + + + @Bean("ManagementIPSystemVMInvestigator") + public ManagementIPSystemVMInvestigator ManagementIPSystemVMInvestigator() { + ManagementIPSystemVMInvestigator bean = new ManagementIPSystemVMInvestigator(); + bean.setName("ManagementIPSysVMInvestigator"); + return bean; + } + + @Bean("UserVmDomRInvestigator") + public UserVmDomRInvestigator UserVmDomRInvestigator() { + UserVmDomRInvestigator bean = new UserVmDomRInvestigator(); + bean.setName("PingInvestigator"); + return bean; + } + + @Bean("XenServerInvestigator") + public XenServerInvestigator XenServerInvestigator() { + XenServerInvestigator bean = new XenServerInvestigator(); + bean.setName("XenServerInvestigator"); + return bean; + } + + @Bean("CheckOnAgentInvestigator") + public CheckOnAgentInvestigator CheckOnAgentInvestigator() { + CheckOnAgentInvestigator bean = new CheckOnAgentInvestigator(); + bean.setName("SimpleInvestigator"); + return bean; + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_network/SpringServerNetworkContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_network/SpringServerNetworkContext.java new file mode 100644 index 000000000000..076a81eb471d --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_network/SpringServerNetworkContext.java @@ -0,0 +1,119 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_network; + +import com.cloud.network.element.ConfigDriveNetworkElement; +import com.cloud.network.element.SecurityGroupElement; +import com.cloud.network.element.VirtualRouterElement; +import com.cloud.network.guru.ControlNetworkGuru; +import com.cloud.network.guru.DirectNetworkGuru; +import com.cloud.network.guru.DirectPodBasedNetworkGuru; +import com.cloud.network.guru.ExternalGuestNetworkGuru; +import com.cloud.network.guru.PodBasedNetworkGuru; +import com.cloud.network.guru.PrivateNetworkGuru; +import com.cloud.network.guru.PublicNetworkGuru; +import com.cloud.network.guru.StorageNetworkGuru; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerNetworkContext { + + + @Bean("PodBasedNetworkGuru") + public PodBasedNetworkGuru PodBasedNetworkGuru() { + PodBasedNetworkGuru bean = new PodBasedNetworkGuru(); + bean.setName("PodBasedNetworkGuru"); + return bean; + } + + @Bean("ControlNetworkGuru") + public ControlNetworkGuru ControlNetworkGuru() { + ControlNetworkGuru bean = new ControlNetworkGuru(); + bean.setName("ControlNetworkGuru"); + return bean; + } + + @Bean("StorageNetworkGuru") + public StorageNetworkGuru StorageNetworkGuru() { + StorageNetworkGuru bean = new StorageNetworkGuru(); + bean.setName("StorageNetworkGuru"); + return bean; + } + + @Bean("PrivateNetworkGuru") + public PrivateNetworkGuru PrivateNetworkGuru() { + PrivateNetworkGuru bean = new PrivateNetworkGuru(); + bean.setName("PrivateNetworkGuru"); + return bean; + } + + @Bean("ConfigDrive") + public ConfigDriveNetworkElement ConfigDrive() { + ConfigDriveNetworkElement bean = new ConfigDriveNetworkElement(); + bean.setName("ConfigDrive"); + return bean; + } + + @Bean("ExternalGuestNetworkGuru") + public ExternalGuestNetworkGuru ExternalGuestNetworkGuru() { + ExternalGuestNetworkGuru bean = new ExternalGuestNetworkGuru(); + bean.setName("ExternalGuestNetworkGuru"); + return bean; + } + + @Bean("DirectNetworkGuru") + public DirectNetworkGuru DirectNetworkGuru() { + DirectNetworkGuru bean = new DirectNetworkGuru(); + bean.setName("DirectNetworkGuru"); + return bean; + } + + @Bean("PublicNetworkGuru") + public PublicNetworkGuru PublicNetworkGuru() { + PublicNetworkGuru bean = new PublicNetworkGuru(); + bean.setName("PublicNetworkGuru"); + return bean; + } + + @Bean("DirectPodBasedNetworkGuru") + public DirectPodBasedNetworkGuru DirectPodBasedNetworkGuru() { + DirectPodBasedNetworkGuru bean = new DirectPodBasedNetworkGuru(); + bean.setName("DirectPodBasedNetworkGuru"); + return bean; + } + + @Bean("SecurityGroupProvider") + public SecurityGroupElement SecurityGroupProvider() { + SecurityGroupElement bean = new SecurityGroupElement(); + bean.setName("SecurityGroupProvider"); + return bean; + } + + @Bean("VirtualRouter") + public VirtualRouterElement VirtualRouter() { + VirtualRouterElement bean = new VirtualRouterElement(); + bean.setName("VirtualRouter"); + return bean; + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_planner/SpringServerPlannerContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_planner/SpringServerPlannerContext.java new file mode 100644 index 000000000000..eb3485410665 --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_planner/SpringServerPlannerContext.java @@ -0,0 +1,39 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_planner; + +import com.cloud.deploy.FirstFitPlanner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerPlannerContext { + + + @Bean("FirstFitPlanner") + public FirstFitPlanner FirstFitPlanner() { + FirstFitPlanner bean = new FirstFitPlanner(); + bean.setName("FirstFitPlanner"); + return bean; + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_storage/SpringServerStorageContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_storage/SpringServerStorageContext.java new file mode 100644 index 000000000000..f5dea248e8da --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_storage/SpringServerStorageContext.java @@ -0,0 +1,43 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_storage; + +import com.cloud.storage.listener.SnapshotStateListener; +import com.cloud.storage.secondary.SecondaryStorageVmDefaultAllocator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerStorageContext { + + + @Bean("snapshotStateListener") + public SnapshotStateListener snapshotStateListener() { + return new SnapshotStateListener(); + } + + @Bean("secondaryStorageVmDefaultAllocator") + public SecondaryStorageVmDefaultAllocator secondaryStorageVmDefaultAllocator() { + return new SecondaryStorageVmDefaultAllocator(); + } + +} diff --git a/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_template_adapter/SpringServerTemplateAdapterContext.java b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_template_adapter/SpringServerTemplateAdapterContext.java new file mode 100644 index 000000000000..7b861b294c7a --- /dev/null +++ b/server/src/main/java/com/cloud/conf/meta_inf/cloudstack/server_template_adapter/SpringServerTemplateAdapterContext.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.conf.meta_inf.cloudstack.server_template_adapter; + +import com.cloud.template.HypervisorTemplateAdapter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + + +/** + * Generated Java based configuration + * + */ +@Configuration +public class SpringServerTemplateAdapterContext { + + + @Bean("hypervisorTemplateAdapter") + public HypervisorTemplateAdapter hypervisorTemplateAdapter() { + return new HypervisorTemplateAdapter(); + } + +} diff --git a/server/src/main/java/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/main/java/com/cloud/ha/CheckOnAgentInvestigator.java index f6409a5c0bdc..37e4f2b4eca3 100644 --- a/server/src/main/java/com/cloud/ha/CheckOnAgentInvestigator.java +++ b/server/src/main/java/com/cloud/ha/CheckOnAgentInvestigator.java @@ -36,7 +36,7 @@ public class CheckOnAgentInvestigator extends AdapterBase implements Investigato @Inject AgentManager _agentMgr; - protected CheckOnAgentInvestigator() { + public CheckOnAgentInvestigator() { } @Override diff --git a/server/src/main/java/com/cloud/ha/XenServerInvestigator.java b/server/src/main/java/com/cloud/ha/XenServerInvestigator.java index 896642176659..f72a569686df 100644 --- a/server/src/main/java/com/cloud/ha/XenServerInvestigator.java +++ b/server/src/main/java/com/cloud/ha/XenServerInvestigator.java @@ -44,7 +44,7 @@ public class XenServerInvestigator extends AdapterBase implements Investigator { @Inject ResourceManager _resourceMgr; - protected XenServerInvestigator() { + public XenServerInvestigator() { } @Override diff --git a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java index c18f39a3a6ba..adcf0b20f609 100644 --- a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java @@ -70,7 +70,7 @@ public HypervisorType getHypervisorType() { return HypervisorType.KVM; } - protected KVMGuru() { + public KVMGuru() { super(); } diff --git a/server/src/main/java/com/cloud/hypervisor/LXCGuru.java b/server/src/main/java/com/cloud/hypervisor/LXCGuru.java index 285f9628d8d4..bdaa260fa671 100644 --- a/server/src/main/java/com/cloud/hypervisor/LXCGuru.java +++ b/server/src/main/java/com/cloud/hypervisor/LXCGuru.java @@ -43,7 +43,7 @@ public HypervisorType getHypervisorType() { return HypervisorType.LXC; } - protected LXCGuru() { + public LXCGuru() { super(); } diff --git a/server/src/main/java/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/ControlNetworkGuru.java index 99f4ad0f1f7f..7988e075b207 100644 --- a/server/src/main/java/com/cloud/network/guru/ControlNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/ControlNetworkGuru.java @@ -104,7 +104,7 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network spe return config; } - protected ControlNetworkGuru() { + public ControlNetworkGuru() { super(); } diff --git a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java index 07a563591d98..2cf338811703 100644 --- a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java @@ -223,7 +223,7 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network use return config; } - protected DirectNetworkGuru() { + public DirectNetworkGuru() { super(); _isolationMethods = new IsolationMethod[] { new IsolationMethod("VLAN"), new IsolationMethod("VXLAN") }; } diff --git a/server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java index 9f9771e7cfb1..72f5c541643d 100644 --- a/server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java @@ -89,7 +89,7 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network use return config; } - protected PodBasedNetworkGuru() { + public PodBasedNetworkGuru() { super(); } diff --git a/server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java index 3b3dabe1da63..66790e76bf73 100644 --- a/server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java @@ -66,7 +66,7 @@ public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru { private static final TrafficType[] TrafficTypes = {TrafficType.Guest}; - protected PrivateNetworkGuru() { + public PrivateNetworkGuru() { super(); } diff --git a/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java index 330a3652b2f6..034fdc324c94 100644 --- a/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/PublicNetworkGuru.java @@ -108,7 +108,7 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network net } } - protected PublicNetworkGuru() { + public PublicNetworkGuru() { super(); } diff --git a/server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java index a26705e6d2c6..758b4fdbcff9 100644 --- a/server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java @@ -51,7 +51,7 @@ public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGu @Inject NetworkDao _nwDao; - protected StorageNetworkGuru() { + public StorageNetworkGuru() { super(); } diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 893ac58fba83..8f0c346cc40a 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -719,7 +719,7 @@ public boolean stop() { return true; } - protected VirtualNetworkApplianceManagerImpl() { + public VirtualNetworkApplianceManagerImpl() { } protected class NetworkUsageTask extends ManagedContextRunnable { diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml index d79908ecedf7..8d8647d76064 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml @@ -21,312 +21,153 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util" - - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd - http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util.xsd" - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml index 19007173b1df..37da3def9d0c 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml @@ -20,65 +20,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + + + + + + + + + + + + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml index a8f83b012bd1..8fefc8acebf2 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml @@ -20,13 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml index 71cef6c4e1bb..511f8a13be57 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml @@ -20,13 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml index d765063f0145..2901175dbf15 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml @@ -20,13 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml b/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml index 664e7de8c65d..b0b9fc602ac7 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml @@ -20,29 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml b/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml index 30e7647fd12c..ebd7bd2a804f 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-api/spring-server-api-context.xml @@ -20,14 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - \ No newline at end of file + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml b/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml index 0215abf44b4c..c89635a0fa2f 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml @@ -20,21 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml b/server/src/main/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml index 3a7e0ffb04ae..8ab0e0ff9cf9 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-discoverer/spring-server-discoverer-context.xml @@ -20,26 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml b/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml index f11fea6eb2cb..79525c1cb7c0 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml @@ -20,18 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml b/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml index dd5ce62147e4..e343091dfdda 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml @@ -20,27 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml b/server/src/main/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml index 3df3a05182dd..ba5d08f4c148 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml @@ -20,49 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml b/server/src/main/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml index c1997e2d56bf..580ef18876ab 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-planner/spring-server-planner-context.xml @@ -20,15 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml b/server/src/main/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml index c67602949c80..c59a6a9759db 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-storage/spring-server-storage-context.xml @@ -20,16 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml index 96c3aa7f12c0..16c7f862ae59 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml @@ -20,13 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd" - > - - - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml b/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml index ba00d19781c1..cc426e357b6d 100644 --- a/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml +++ b/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml @@ -17,35 +17,11 @@ under the License. --> - - - - - - - - - - - - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:aop="http://www.springframework.org/schema/aop" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + +