CLOUDSTACK-1165, fix nonoss build startup issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e5866cf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e5866cf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e5866cf2 Branch: refs/heads/storage_refactor Commit: e5866cf2ef2668258bbe070f855a32a53bdcb997 Parents: 303fb65 Author: Kelven Yang <[email protected]> Authored: Tue Feb 5 14:26:16 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Tue Feb 5 14:27:57 2013 -0800 ---------------------------------------------------------------------- client/pom.xml | 2 +- client/tomcatconf/componentContext.xml.in | 4 ++-- client/tomcatconf/nonossComponentContext.xml.in | 12 ++++++++---- .../hypervisor/vmware/VmwareServerDiscoverer.java | 7 ++++++- 4 files changed, 17 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5866cf2/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 3ae9dc5..3651b79 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -230,7 +230,7 @@ </connectors> <jvmArgs>-XX:MaxPermSize=512m -Xmx2g</jvmArgs> <contextPath>/client</contextPath> - <webXml>${basedir}/WEB-INF/web.xml</webXml> + <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml> <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5866cf2/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index f65a8b6..11017fe 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -36,8 +36,8 @@ --> <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" /> - <bean id="management-server" class ="com.cloud.server.ManagementServerImpl" /> - <bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" /> + <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" /> + <bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" /> <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" /> <bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5866cf2/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 7dbb549..b306f52 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -37,8 +37,8 @@ --> <bean id="premiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/> - <bean id="management-server" class ="com.cloud.server.ManagementServerExtImpl" /> - <bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" /> + <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" /> + <bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" /> <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" /> <bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" /> @@ -51,6 +51,11 @@ <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" /> <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" /> + <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" /> + <bean id="ApiRateLimitService" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"> + <property name="name" value="ApiRateLimitService"/> + </bean> + <!-- bean id="bareMetalVmManagerImpl" class="com.cloud.baremetal.BareMetalVmManagerImpl" / --> <bean id="VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/> <bean id="NetappManager" class="com.cloud.netapp.NetappManagerImpl"/> @@ -92,8 +97,7 @@ <bean id="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement"> <property name="name" value="CiscoNexus1000vVSM"/> </bean> - - + <!-- Adapters --> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5866cf2/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index ac0f6f4..ddbce66 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import javax.annotation.PostConstruct; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -94,7 +95,11 @@ public class VmwareServerDiscoverer extends DiscovererBase implements CiscoNexusVSMDeviceDao _nexusDao; @Inject NetworkModel _netmgr; - + + public VmwareServerDiscoverer() { + s_logger.info("VmwareServerDiscoverer is constructed"); + } + @Override public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI url, String username,
