CLOUDSTACK-1323: retire some of no-longer used files
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/00f63c44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/00f63c44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/00f63c44 Branch: refs/heads/4.1 Commit: 00f63c44b6839c8b428e232b8a52c467ae062feb Parents: ddefdbf Author: Kelven Yang <[email protected]> Authored: Fri Mar 8 16:54:46 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Fri Mar 8 16:54:46 2013 -0800 ---------------------------------------------------------------------- client/tomcatconf/components-cloudzones.xml.in | 33 -- client/tomcatconf/components-nonoss.xml.in | 97 ----- client/tomcatconf/components.xml.in | 310 --------------- .../dao/RandomlyIncreasingVMInstanceDaoImpl.java | 36 -- 4 files changed, 0 insertions(+), 476 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/00f63c44/client/tomcatconf/components-cloudzones.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components-cloudzones.xml.in b/client/tomcatconf/components-cloudzones.xml.in deleted file mode 100755 index 4bd3910..0000000 --- a/client/tomcatconf/components-cloudzones.xml.in +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<!-- -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. ---> -<components-cloudzones.xml> - <system-integrity-checker class="com.cloud.upgrade.DatabaseUpgradeChecker"> - <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/> - <checker name="PremiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/> - </system-integrity-checker> - - <management-server class="com.cloud.server.ManagementServerExtImpl" library="com.cloud.configuration.CloudZonesComponentLibrary" extends="components-premium.xml:management-server"/> - - <configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server"> - <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> - <param name="premium">true</param> - </dao> - </configuration-server> -</components-cloudzones.xml> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/00f63c44/client/tomcatconf/components-nonoss.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components-nonoss.xml.in b/client/tomcatconf/components-nonoss.xml.in deleted file mode 100755 index fbfc5cc..0000000 --- a/client/tomcatconf/components-nonoss.xml.in +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0"?> -<!-- -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. ---> -<!-- - components.xml is the configuration file for the VM Ops - insertion servers. Someone can quickly pull together an - insertion server by selecting the correct adapters to use. - - Here are some places to look for information. - - To find out the general functionality that each Manager - or Adapter provide, look at the javadoc for the interface - that it implements. The interface is usually the - "key" attribute in the declaration. - - To find specific implementation of each Manager or - Adapter, look at the javadoc for the actual class. The - class can be found in the <class> element. - - To find out the configuration parameters for each Manager - or Adapter, look at the javadoc for the actual implementation - class. It should be documented in the description of the - class. - - To know more about the components.xml in general, look for - the javadoc for ComponentLocator.java. - - If you found that the Manager or Adapter are not properly - documented, please contact the author. ---> -<components-nonoss.xml> - <system-integrity-checker class="com.cloud.upgrade.DatabaseUpgradeChecker"> - <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/> - <checker name="PremiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/> - </system-integrity-checker> - - <management-server class="com.cloud.server.ManagementServerExtImpl" library="com.cloud.configuration.PremiumComponentLibrary" extends="components.xml:management-server"> - <adapters key="com.cloud.ha.Investigator"> - <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/> - </adapters> - - <adapters key="com.cloud.ha.FenceBuilder"> - <adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/> - </adapters> - - <adapters key="com.cloud.resource.Discoverer"> - <adapter name="VShpereServer" class="com.cloud.hypervisor.vmware.VmwareServerDiscoverer"/> - </adapters> - - <adapters key="com.cloud.network.element.NetworkElement"> - <adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> - <adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/> - <adapter name="F5BigIP" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> - <adapter name="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement"/> - </adapters> - - <adapters key="com.cloud.hypervisor.HypervisorGuru"> - <adapter name="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru"/> - </adapters> - - <manager name="VmwareManager" key="com.cloud.hypervisor.vmware.manager.VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/> - <manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/> - <pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/> - <pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> - <pluggableservice name="JuniperSRXFirewallElementService" key="com.cloud.network.element.JuniperSRXFirewallElementService" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> - <pluggableservice name="CiscoNexusVSMElementService" key="com.cloud.network.element.CiscoNexusVSMElementService" class="com.cloud.network.element.CiscoNexusVSMElement"/> - - <dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/> - <dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/> - <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/> - <dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/> - <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/> - <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> - <param name="premium">true</param> - </dao> - </management-server> - <configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server"> - <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> - <param name="premium">true</param> - </dao> - </configuration-server> - - - -</components-nonoss.xml> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/00f63c44/client/tomcatconf/components.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in deleted file mode 100755 index d94eac6..0000000 --- a/client/tomcatconf/components.xml.in +++ /dev/null @@ -1,310 +0,0 @@ -<?xml version="1.0"?> -<!-- -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. ---> -<!-- - components.xml is the configuration file for the VM Ops - insertion servers. Someone can quickly pull together an - insertion server by selecting the correct adapters to use. - - Here are some places to look for information. - - To find out the general functionality that each Manager - or Adapter provide, look at the javadoc for the interface - that it implements. The interface is usually the - "key" attribute in the declaration. - - To find specific implementation of each Manager or - Adapter, look at the javadoc for the actual class. The - class can be found in the <class> element. - - To find out the configuration parameters for each Manager - or Adapter, look at the javadoc for the actual implementation - class. It should be documented in the description of the - class. - - To know more about the components.xml in general, look for - the javadoc for ComponentLocator.java. - - If you found that the Manager or Adapter are not properly - documented, please contact the author. ---> -<components.xml> - <system-integrity-checker class="com.cloud.upgrade.DatabaseUpgradeChecker"> - <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/> - <checker name="EncryptionSecretKeyChecker" class="com.cloud.utils.crypt.EncryptionSecretKeyChecker"/> - <checker name="DatabaseIntegrityChecker" class="com.cloud.upgrade.DatabaseIntegrityChecker"/> - <checker name="DatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/> - </system-integrity-checker> - - <interceptor library="com.cloud.configuration.DefaultInterceptorLibrary"/> - <management-server class="com.cloud.server.ManagementServerExtImpl" library="com.cloud.configuration.PremiumComponentLibrary"> - <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl"> - <param name="premium">true</param> - </dao> - <adapters key="org.apache.cloudstack.acl.APIChecker"> - <adapter name="AccountBasedAPIRateLimit" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl" singleton="true"> - <param name="api.throttling.interval">1</param> - <param name="api.throttling.max">25</param> - <param name="api.throttling.cachesize">50000</param> - </adapter> - <adapter name="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/> - </adapters> - <adapters key="com.cloud.agent.manager.allocator.HostAllocator"> - <adapter name="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator"/> - <!--adapter name="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.RecreateHostAllocator"/--> - <!--adapter name="FirstFit" class="com.cloud.agent.manager.allocator.impl.FirstFitAllocator"/--> - </adapters> - <adapters key="com.cloud.storage.allocator.StoragePoolAllocator"> - <adapter name="LocalStorage" class="com.cloud.storage.allocator.LocalStoragePoolAllocator"/> - <adapter name="Storage" class="com.cloud.storage.allocator.FirstFitStoragePoolAllocator"/> - </adapters> - <adapters key="com.cloud.agent.manager.allocator.PodAllocator"> - <adapter name="User First" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"/> - </adapters> - <adapters key="com.cloud.consoleproxy.ConsoleProxyAllocator"> - <adapter name="Balance" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator"/> - </adapters> - <adapters key="com.cloud.network.guru.NetworkGuru"> - <!-- - NOTE: The order of those gurus implicates priority of network traffic types the guru implements. - The upper the higher priority. It effects listTafficTypeImplementors API which returns impelmentor - of a specific network traffic. - A fair question is, if two gurus implement the same two network traffic types, but these traffic types - have cross priority, how to rank them? For example: - GuruA (TrafficTypeA, TrafficTypeB) - GuruB (TrafficTypeA, TrafficTypeB) - we want GuruB.TrafficTypeB > GuruA.TrafficTypeB and GuruB.TrafficTypeA < GuruA.TrafficTypeA. As the priority - implicated by order can not map to multiple traffic type, you have to do implement GuruC which inherits GuruB - for TrafficTypeB. Then ranking them in order of: - GuruC (TrafficTypeB) - GuruA (TrafficTypeA, TrafficTypeB) - GuruB (TrafficTypeA, TrafficTypeB) - now GuruC represents TrafficTypeB with highest priority while GuruA represents TrafficTypeA with highest pirority. - - However, above case barely happens. - --> - - <adapter name="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru"/> - <adapter name="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru"/> - <adapter name="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru"/> - <adapter name="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru"/> - <adapter name="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru"/> - <adapter name="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru"/> - <adapter name="DirectPodBasedNetworkGuru" class="com.cloud.network.guru.DirectPodBasedNetworkGuru"/> - <adapter name="OvsGuestNetworkGuru" class="com.cloud.network.guru.OvsGuestNetworkGuru"/> - <adapter name="PrivateNetworkGuru" class="com.cloud.network.guru.PrivateNetworkGuru"/> - <adapter name="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru"/> - <adapter name="BigSwitchVnsGuestNetworkGuru" class="com.cloud.network.guru.BigSwitchVnsGuestNetworkGuru"/> - </adapters> - <adapters key="com.cloud.cluster.ClusterServiceAdapter"> - <adapter name="ClusterService" class="com.cloud.cluster.ClusterServiceServletAdapter"/> - </adapters> - <adapters key="com.cloud.storage.secondary.SecondaryStorageVmAllocator"> - <adapter name="Balance" class="com.cloud.storage.secondary.SecondaryStorageVmDefaultAllocator"/> - </adapters> - <adapters key="com.cloud.network.IpAddrAllocator"> - <adapter name="Basic" class="com.cloud.network.ExteralIpAddressAllocator"/> - </adapters> - <adapters key="com.cloud.server.auth.UserAuthenticator"> - <!-- <adapter name="SHA256SALT" class="com.cloud.server.auth.SHA256SaltedUserAuthenticator"/> --> - <adapter name="MD5" class="com.cloud.server.auth.MD5UserAuthenticator"/> - <adapter name="LDAP" class="com.cloud.server.auth.LDAPUserAuthenticator"/> - </adapters> - <adapters key="com.cloud.ha.Investigator"> - <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"/> - <adapter name="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"/> - <adapter name="PingInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"/> - <adapter name="ManagementIPSysVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"/> - </adapters> - <adapters key="com.cloud.ha.FenceBuilder"> - <adapter name="XenServerFenceBuilder" class="com.cloud.ha.XenServerFencer"/> - <adapter name="KVMFenceBuilder" class="com.cloud.ha.KVMFencer"/> - <adapter name="OvmFenceBuilder" class="com.cloud.ovm.hypervisor.OvmFencer"/> - </adapters> - <adapters key="com.cloud.hypervisor.HypervisorGuru"> - <adapter name="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"/> - <adapter name="KVMGuru" class="com.cloud.hypervisor.KVMGuru"/> - </adapters> - <adapters key="com.cloud.resource.Discoverer"> - <adapter name="XCP Agent" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer"/> - <adapter name="SecondaryStorage" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/> - <adapter name="KVM Agent" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"/> - <adapter name="Bare Metal Agent" class="com.cloud.baremetal.BareMetalDiscoverer"/> - <adapter name="SCVMMServer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"/> - <adapter name="Ovm Discover" class="com.cloud.ovm.hypervisor.OvmDiscoverer" /> - </adapters> - <adapters key="com.cloud.deploy.DeploymentPlanner"> - <adapter name="First Fit" class="com.cloud.deploy.FirstFitPlanner"/> - <adapter name="UserDispersing" class="com.cloud.deploy.UserDispersingPlanner"/> - <adapter name="UserConcentratedPod" class="com.cloud.deploy.UserConcentratedPodPlanner"/> - <adapter name="BareMetal Fit" class="com.cloud.deploy.BareMetalPlanner"/> - </adapters> - <adapters key="com.cloud.alert.AlertAdapter"> - <adapter name="ClusterAlert" class="com.cloud.alert.ClusterAlertAdapter"/> - <adapter name="ConsoleProxyAlert" class="com.cloud.alert.ConsoleProxyAlertAdapter"/> - <adapter name="SecondaryStorageVmAlert" class="com.cloud.alert.SecondaryStorageVmAlertAdapter"/> - </adapters> - <adapters key="org.apache.cloudstack.acl.SecurityChecker"> - <adapter name="DomainChecker" class="com.cloud.acl.DomainChecker"/> - </adapters> - <adapters key="com.cloud.network.element.NetworkElement"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="Ovs" class="com.cloud.network.element.OvsElement"/> - <adapter name="ExternalDhcpServer" class="com.cloud.network.element.ExternalDhcpElement"/> - <adapter name="BareMetal" class="com.cloud.network.element.BareMetalElement"/> - <adapter name="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/> - <adapter name="BigSwitchVns" class="com.cloud.network.element.BigSwitchVnsElement"/> - </adapters> - <adapters key="com.cloud.network.element.FirewallServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.DhcpServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="ExternalDhcpElement" class="com.cloud.network.element.ExternalDhcpElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.UserDataServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.SourceNatServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/> - </adapters> - <adapters key="com.cloud.network.element.StaticNatServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/> - </adapters> - <adapters key="com.cloud.network.element.PortForwardingServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/> - </adapters> - <adapters key="com.cloud.network.element.LoadBalancingServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.RemoteAccessVPNServiceProvider"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.Site2SiteVpnServiceProvider"> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.IpDeployer"> - <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/> - </adapters> - <adapters key="com.cloud.network.element.ConnectivityProvider"> - <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/> - <adapter name="BigSwitchVns" class="com.cloud.network.element.BigSwitchVnsElement"/> - </adapters> - <adapters key="com.cloud.network.element.NetworkACLServiceProvider"> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - <adapters key="com.cloud.network.element.VpcProvider"> - <adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/> - </adapters> - - <adapters key="com.cloud.cluster.agentlb.AgentLoadBalancerPlanner"> - <adapter name="ClusterBasedAgentLbPlanner" class="com.cloud.cluster.agentlb.ClusterBasedAgentLoadBalancerPlanner"/> - </adapters> - <adapters key="com.cloud.hypervisor.HypervisorGuru"> - <adapter name="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"/> - <adapter name="KVMGuru" class="com.cloud.hypervisor.KVMGuru"/> - <adapter name="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru"/> - <adapter name="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru"/> - <adapter name="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru" /> - </adapters> - <adapters key="com.cloud.agent.StartupCommandProcessor"> - <adapter name="BasicAgentAuthorizer" class="com.cloud.agent.manager.authn.impl.BasicAgentAuthManager"/> - </adapters> - <manager name="OvsTunnelManager" key="com.cloud.network.ovs.OvsTunnelManager" class="com.cloud.network.ovs.OvsTunnelManagerImpl"/> - <manager name="ElasticLoadBalancerManager" key="com.cloud.network.lb.ElasticLoadBalancerManager" class="com.cloud.network.lb.ElasticLoadBalancerManagerImpl"/> - <pluggableservice name="ApiDiscoveryService" key="org.apache.cloudstack.discovery.ApiDiscoveryService" class="org.apache.cloudstack.discovery.ApiDiscoveryServiceImpl"/> - <pluggableservice name="VirtualRouterElementService" key="com.cloud.network.element.VirtualRouterElementService" class="com.cloud.network.element.VirtualRouterElement"/> - <pluggableservice name="NiciraNvpElementService" key="com.cloud.network.element.NiciraNvpElementService" class="com.cloud.network.element.NiciraNvpElement"/> - <pluggableservice name="ApiRateLimitService" key="org.apache.cloudstack.ratelimit.ApiRateLimitService" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/> - <pluggableservice name="BigSwitchVnsElementService" key="com.cloud.network.element.BigSwitchVnsElementService" class="com.cloud.network.element.BigSwitchVnsElement"/> - <dao name="OvsTunnelInterfaceDao" class="com.cloud.network.ovs.dao.OvsTunnelInterfaceDaoImpl" singleton="false"/> - <dao name="OvsTunnelAccountDao" class="com.cloud.network.ovs.dao.OvsTunnelNetworkDaoImpl" singleton="false"/> - <dao name="NiciraNvpDao" class="com.cloud.network.dao.NiciraNvpDaoImpl" singleton="false"/> - <dao name="NiciraNvpNicMappingDao" class="com.cloud.network.dao.NiciraNvpNicMappingDaoImpl" singleton="false"/> - <dao name="NiciraNvpRouterMappingDao" class="com.cloud.network.dao.NiciraNvpRouterMappingDaoImpl" singleton="false"/> - <dao name="ElasticLbVmMapDao" class="com.cloud.network.lb.dao.ElasticLbVmMapDaoImpl" singleton="false"/> - <dao name="BigSwitchVnsDao" class="com.cloud.network.dao.BigSwitchVnsDaoImpl" singleton="false"/> - </management-server> - - <configuration-server class="com.cloud.server.ConfigurationServerImpl"> - <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> - <param name="premium">true</param> - </dao> - <dao name="Snapshot policy defaults" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl" singleton="false"/> - <dao name="DiskOffering configuration server" class="com.cloud.storage.dao.DiskOfferingDaoImpl" singleton="false"/> - <dao name="ServiceOffering configuration server" class="com.cloud.service.dao.ServiceOfferingDaoImpl" singleton="false"/> - <dao name="host zone configuration server" class="com.cloud.dc.dao.DataCenterDaoImpl" singleton="false"/> - <dao name="host pod configuration server" class="com.cloud.dc.dao.HostPodDaoImpl" singleton="false"/> - <dao name="DomainDao" class="com.cloud.domain.dao.DomainDaoImpl" singleton="false"/> - <dao name="NetworkOfferingDao" class="com.cloud.offerings.dao.NetworkOfferingDaoImpl" singleton="false"/> - <dao name="DataCenterDao" class="com.cloud.dc.dao.DataCenterDaoImpl" singleton="false"/> - <dao name="NetworkDao" class="com.cloud.network.dao.NetworkDaoImpl" singleton="false"/> - <dao name="IpAddressDao" class="com.cloud.network.dao.IPAddressDaoImpl" singleton="false"/> - <dao name="VlanDao" class="com.cloud.dc.dao.VlanDaoImpl" singleton="false"/> - <dao name="ResouceCountDao" class="com.cloud.configuration.dao.ResourceCountDaoImpl" singleton="false"/> - <dao name="AccountDao" class="com.cloud.user.dao.AccountDaoImpl" singleton="false"/> - <dao name="UserDao" class="com.cloud.user.dao.UserDaoImpl" singleton="false"/> - <dao name="NetworkOfferingServiceDao" class="com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl" singleton="false"/> - <dao name="VirtualRouterProviderDao" class="com.cloud.network.dao.VirtualRouterProviderDaoImpl" singleton="false"/> - <dao name="IdentityDao" class="com.cloud.uuididentity.dao.IdentityDaoImpl" singleton="false"/> - <dao name="Site2SiteCustomerGatewayDao" class="com.cloud.network.dao.Site2SiteCustomerGatewayDaoImpl" singleton="false"/> - <dao name="Site2SiteVpnGatewayDao" class="com.cloud.network.dao.Site2SiteVpnGatewayDaoImpl" singleton="false"/> - <dao name="Site2SiteVpnConnectionDao" class="com.cloud.network.dao.Site2SiteVpnConnectionDaoImpl" singleton="false"/> - <dao name="RegionDao" class="org.apache.cloudstack.region.dao.RegionDaoImpl" singleton="false"/> - <dao name="UserIpv6AddressDao" class="com.cloud.network.dao.UserIpv6AddressDaoImpl" singleton="false"/> - </configuration-server> - - <awsapi-ec2server class="com.cloud.bridge.service.EC2MainServlet"> - <dao name="CloudStackConfigurationDao" class="com.cloud.bridge.persist.dao.CloudStackConfigurationDaoImpl" singleton="false"/> - <dao name="UserCredentialsDao" class="com.cloud.bridge.persist.dao.UserCredentialsDaoImpl" singleton="false"/> - <dao name="CloudStackSvcOfferingDao" class="com.cloud.bridge.persist.dao.CloudStackSvcOfferingDaoImpl" singleton="false"/> - <dao name="OfferingDao" class="com.cloud.bridge.persist.dao.OfferingDaoImpl" singleton="false"/> - <dao name="CloudStackAccountDao" class="com.cloud.bridge.persist.dao.CloudStackAccountDaoImpl" singleton="false"/> - <dao name="CloudStackUserDao" class="com.cloud.bridge.persist.dao.CloudStackUserDaoImpl" singleton="false"/> - </awsapi-ec2server> - - <awsapi-s3server class="com.cloud.bridge.service.S3RestServlet"> - <dao name="CloudStackConfigurationDao" class="com.cloud.bridge.persist.dao.CloudStackConfigurationDaoImpl" singleton="false"/> - <dao name="MHostDao" class="com.cloud.bridge.persist.dao.MHostDaoImpl" singleton="false"/> - <dao name="SHostDao" class="com.cloud.bridge.persist.dao.SHostDaoImpl" singleton="false"/> - <dao name="UserCredentialsDao" class="com.cloud.bridge.persist.dao.UserCredentialsDaoImpl" singleton="false"/> - <dao name="BucketPolicyDao" class="com.cloud.bridge.persist.dao.BucketPolicyDaoImpl" singleton="false"/> - <dao name="MHostMountDao" class="com.cloud.bridge.persist.dao.MHostMountDaoImpl" singleton="false"/> - <dao name="SAclDao" class="com.cloud.bridge.persist.dao.SAclDaoImpl" singleton="false"/> - <dao name="SBucketDao" class="com.cloud.bridge.persist.dao.SBucketDaoImpl" singleton="false"/> - <dao name="SMetaDao" class="com.cloud.bridge.persist.dao.SMetaDaoImpl" singleton="false"/> - <dao name="SObjectDao" class="com.cloud.bridge.persist.dao.SObjectDaoImpl" singleton="false"/> - <dao name="SObjectItemDao" class="com.cloud.bridge.persist.dao.SObjectItemDaoImpl" singleton="false"/> - <dao name="MultiPartPartsDao" class="com.cloud.bridge.persist.dao.MultiPartPartsDaoImpl" singleton="false"/> - <dao name="MultiPartUploadsDao" class="com.cloud.bridge.persist.dao.MultiPartUploadsDaoImpl" singleton="false"/> - <dao name="MultipartMetaDao" class="com.cloud.bridge.persist.dao.MultipartMetaDaoImpl" singleton="false"/> - <dao name="UserCredentialsDao" class="com.cloud.bridge.persist.dao.UserCredentialsDaoImpl" singleton="false"/> - </awsapi-s3server> - -</components.xml> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/00f63c44/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java deleted file mode 100644 index cc5c536..0000000 --- a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.vm.dao; - - -import javax.ejb.Local; - -import org.apache.log4j.Logger; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -@Local(value = { UserVmDao.class }) -public class RandomlyIncreasingVMInstanceDaoImpl extends UserVmDaoImpl { - - public static final Logger s_logger = Logger.getLogger(RandomlyIncreasingVMInstanceDaoImpl.class); - - @Override - public <K> K getNextInSequence(final Class<K> clazz, final String name) { - return getRandomlyIncreasingNextInSequence(clazz, name); - } - -}
