Updated Branches: refs/heads/quickcloud a27a42211 -> d17aacbca
QuickCloud: option to build with componentContext tailored for quickcloud For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager Usage: mvn install -Dquickcloud Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d17aacbc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d17aacbc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d17aacbc Branch: refs/heads/quickcloud Commit: d17aacbcab6c5b496fa1144e95bf199a160d3e83 Parents: a27a422 Author: Chiradeep Vittal <chirad...@apache.org> Authored: Tue Mar 26 16:40:19 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Tue Mar 26 16:40:19 2013 -0700 ---------------------------------------------------------------------- client/pom.xml | 16 + .../tomcatconf/quickCloudComponentContext.xml.in | 336 +++++++++++++++ services/console-proxy/server/pom.xml | 5 - 3 files changed, 352 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d17aacbc/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 7ad2eff..05a1188 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -418,6 +418,22 @@ </target> </configuration> </execution> + <execution> + <id>process-quickcloud-spring-context</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target if="${quickcloud}"> + <echo>quickcloud</echo> + <replaceregexp + file="${basedir}/target/generated-webapp/WEB-INF/web.xml" + match="classpath:componentContext.xml" + replace="classpath:quickCloudComponentContext.xml" byline="true" /> + </target> + </configuration> + </execution> </executions> </plugin> <!-- there are the jasypt libs requires by some of the python scripts --> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d17aacbc/client/tomcatconf/quickCloudComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/quickCloudComponentContext.xml.in b/client/tomcatconf/quickCloudComponentContext.xml.in new file mode 100644 index 0000000..63e2266 --- /dev/null +++ b/client/tomcatconf/quickCloudComponentContext.xml.in @@ -0,0 +1,336 @@ +<!-- + 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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + 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-3.0.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + + + <!-- + Compose a CloudStack deployment with selected components here + --> + <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" /> + <bean id="encryptionSecretKeyChecker" class="com.cloud.utils.crypt.EncryptionSecretKeyChecker" /> + <bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" /> + + <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" > + <property name="UserAuthenticators"> + <list> + <ref bean="MD5UserAuthenticator"/> + <ref bean="LDAPUserAuthenticator"/> + </list> + </property> + </bean> + + <bean id ="AccountManagerImpl" class="com.cloud.user.AccountManagerImpl"> + <property name="UserAuthenticators"> + <list> + <ref bean="MD5UserAuthenticator"/> + <ref bean="LDAPUserAuthenticator"/> + </list> + </property> + </bean> + + <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" /> + <bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" /> + <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" /> + <bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" /> + <bean id="userVmManagerImpl" class="com.cloud.vm.UserVmManagerImpl" /> + <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.StaticConsoleProxyManager" /> + <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" /> + <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" /> + <bean id="userVmDaoImpl" class="com.cloud.vm.dao.UserVmDaoImpl" /> + <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" /> + + <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/> + <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/> + <bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/> + <bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/> + <bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl" /> + <bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" /> + <bean id="UcsManager" class="com.cloud.ucs.manager.UcsManagerImpl" /> + <bean id="UcsBladeDao" class="com.cloud.ucs.database.UcsBladeDaoImpl" /> + <bean id="UcsManagerDao" class="com.cloud.ucs.database.UcsManagerDaoImpl" /> + + + <!-- + Network Elements + --> + <bean id="Ovs" class="com.cloud.network.element.OvsElement"> + <property name="name" value="Ovs"/> + </bean> + <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement"> + <property name="name" value="BareMetalDhcp"/> + </bean> + <bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement"> + <property name="name" value="BareMetalPxe"/> + </bean> + <bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement"> + <property name="name" value="BareMetalUserdata"/> + </bean> + <bean id="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement"> + <property name="name" value="SecurityGroupProvider"/> + </bean> + <bean id="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"> + <property name="name" value="VirtualRouter"/> + </bean> + <bean id="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"> + <property name="name" value="VpcVirtualRouter"/> + </bean> + <!-- + <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"> + <property name="name" value="NiciraNvp"/> + </bean> + --> + +<!-- + <bean id="BigSwitchVnsElementService" class="com.cloud.network.element.BigSwitchVnsElement"> + <property name="name" value="BigSwitchVnsElementService"/> + </bean> +--> + + <!-- + Adapters + --> + <bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator"> + <property name="name" value="FirstFitRouting"/> + </bean> + + <bean id="hypervisorTemplateAdapter" class="com.cloud.template.HypervisorTemplateAdapter"> + <property name="name" value="HypervisorAdapter"/> + </bean> + + <!-- + Storage pool allocators + --> + + <bean id="LocalStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.LocalStoragePoolAllocator"> + <property name="name" value="LocalStorage"/> + </bean> + <!-- + <bean id="FirstFitStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.FirstFitStoragePoolAllocator"> + <property name="name" value="Storage"/> + </bean> + --> + + <bean id="UserConcentratedAllocator" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"> + <property name="name" value="User First"/> + </bean> + + <bean id="ConsoleProxyAllocator" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator"> + <property name="name" value="Balance"/> + </bean> + + <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/> + + <bean id="ExteralIpAddressAllocator" class="com.cloud.network.ExteralIpAddressAllocator"> + <property name="name" value="Basic"/> + </bean> + + <bean id="HypervisorTemplateAdapter" class="com.cloud.template.HypervisorTemplateAdapter"> + <property name="name" value="HypervisorAdapter"/> + </bean> + + <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" > + <property name="name" value="BareMetalTemplateAdapter"/> + </bean> + + <!-- + Authenticators + --> + <bean id="MD5UserAuthenticator" class="com.cloud.server.auth.MD5UserAuthenticator"> + <property name="name" value="MD5"/> + </bean> + + <bean id="LDAPUserAuthenticator" class="com.cloud.server.auth.LDAPUserAuthenticator"> + <property name="name" value="LDAP"/> + </bean> + + <!-- + Investigators + --> + <bean id="CheckOnAgentInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"> + <property name="name" value="SimpleInvestigator"/> + </bean> + + <bean id="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"> + <property name="name" value="XenServerInvestigator"/> + </bean> + + <bean id="UserVmDomRInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"> + <property name="name" value="PingInvestigator"/> + </bean> + + <bean id="ManagementIPSystemVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"> + <property name="name" value="ManagementIPSysVMInvestigator"/> + </bean> + + <!-- + Fencers + --> + <bean id="XenServerFencer" class="com.cloud.ha.XenServerFencer"> + <property name="name" value="XenServerFenceBuilder"/> + </bean> + <bean id="KVMFencer" class="com.cloud.ha.KVMFencer"> + <property name="name" value="KVMFenceBuilder"/> + </bean> + <bean id="OvmFencer" class="com.cloud.ovm.hypervisor.OvmFencer"> + <property name="name" value="OvmFenceBuilder"/> + </bean> + + <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer"> + <property name="name" value="XCP Agent"/> + </bean> + + <!-- + <bean id="SimulatorSecondaryStorageDiscoverer" class="com.cloud.resource.SimulatorSecondaryDiscoverer"> + <property name="name" value="SecondaryStorage"/> + </bean> + --> + + <bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"> + <property name="name" value="SecondaryStorage"/> + </bean> + + <bean id="KvmServerDiscoverer" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"> + <property name="name" value="KVM Agent"/> + </bean> + + <bean id="SimulatorDiscoverer" class="com.cloud.resource.SimulatorDiscoverer"> + <property name="name" value="Simulator Agent"/> + </bean> + + + <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer"> + <property name="name" value="Bare Metal Agent"/> + </bean> + + <bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"> + <property name="name" value="SCVMMServer"/> + </bean> + + <bean id="OvmDiscoverer" class="com.cloud.ovm.hypervisor.OvmDiscoverer"> + <property name="name" value="Ovm Discover"/> + </bean> + + <bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner"> + <property name="name" value="First Fit"/> + </bean> + + <bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner"> + <property name="name" value="UserDispersing"/> + </bean> + + <bean id="UserConcentratedPodPlanner" class="com.cloud.deploy.UserConcentratedPodPlanner"> + <property name="name" value="UserConcentratedPod"/> + </bean> + + <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner"> + <property name="name" value="BareMetal Fit"/> + </bean> + + <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector"> + <property name="name" value="BaremetalPlannerSelector"/> + </bean> + + <bean id="HypervisorPlannerSelector" class="com.cloud.deploy.HypervisorVmPlannerSelector"> + <property name="name" value="HypervisorPlannerSelector"/> + </bean> + + + <!-- + Network Gurus + --> + <bean id="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru"> + <property name="name" value="StorageNetworkGuru"/> + </bean> + <bean id="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru"> + <property name="name" value="ExternalGuestNetworkGuru"/> + </bean> + <bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru"> + <property name="name" value="PublicNetworkGuru"/> + </bean> + <bean id="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru"> + <property name="name" value="PodBasedNetworkGuru"/> + </bean> + <bean id="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru"> + <property name="name" value="ControlNetworkGuru"/> + </bean> + <bean id="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru"> + <property name="name" value="DirectNetworkGuru"/> + </bean> + <bean id="DirectPodBasedNetworkGuru" class="com.cloud.network.guru.DirectPodBasedNetworkGuru"> + <property name="name" value="DirectPodBasedNetworkGuru"/> + </bean> + <bean id="OvsGuestNetworkGuru" class="com.cloud.network.guru.OvsGuestNetworkGuru"> + <property name="name" value="OvsGuestNetworkGuru"/> + </bean> + <bean id="PrivateNetworkGuru" class="com.cloud.network.guru.PrivateNetworkGuru"> + <property name="name" value="PrivateNetworkGuru"/> + </bean> + <bean id="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru"> + <property name="name" value="NiciraNvpGuestNetworkGuru"/> + </bean> + +<!-- + <bean id="BigSwitchVnsGuestNetworkGuru" class=".BigSwitchVnsGuestNetworkGuru"> + <property name="name" value="com.cloud.network.guru.BigSwitchVnsGuestNetworkGuru"/> + </bean> +--> + + <!-- + Hypervisor Gurus + --> + <bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"> + <property name="name" value="XenServerGuru"/> + </bean> + + <bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru"> + <property name="name" value="KVMGuru"/> + </bean> + + <bean id="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru"> + <property name="name" value="HypervGuru"/> + </bean> + + <bean id="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru"> + <property name="name" value="OvmGuru"/> + </bean> + + <bean id="SimulatorGuru" class="com.cloud.simulator.SimulatorGuru"> + <property name="name" value="SimulatorGuru"/> + </bean> + + <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru"> + <property name="name" value="BaremetalGuru"/> + </bean> + + <bean id="ClassicalPrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl"> + </bean> + +</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d17aacbc/services/console-proxy/server/pom.xml ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index a618d1b..19d8eb4 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -244,11 +244,6 @@ </profile> <profile> <id>quickcloud</id> - <activation> - <property> - <name>quickcloud</name> - </property> - </activation> <build> <plugins> <plugin>
