From 9a9c96df6472546e2e78b799601ed51e14978b43 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 31 Jul 2012 10:38:11 -0700 Subject: [PATCH] Patch fixes file names and imports wherever used, in files introduced in 73be77a4c1877ae7e3613c7562d562ad96cde7ee I've renamed discover to discoverer to fix the issue. My ant debug fails with: [java] ERROR [utils.component.ComponentLocator] (main:) Unable to load configuration for management-server from components.xml [java] com.cloud.utils.exception.CloudRuntimeException: Unable to find class: com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer RB: https://reviews.apache.org/r/6239/ Send-by: rohit.yadav@citrix.com --- server/src/com/cloud/agent/manager/AgentManagerImpl.java | 2 +- .../kvm/{discover => discoverer}/KvmDummyResourceBase.java | 2 +- .../kvm/{discover => discoverer}/KvmServerDiscoverer.java | 4 ++-- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename server/src/com/cloud/hypervisor/kvm/{discover => discoverer}/KvmDummyResourceBase.java (98%) rename server/src/com/cloud/hypervisor/kvm/{discover => discoverer}/KvmServerDiscoverer.java (99%) mode change 100755 => 100644 diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 9fb90274558..62e8acb0642 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -88,7 +88,7 @@ import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostTagsDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorGuruManager; -import com.cloud.hypervisor.kvm.discover.KvmDummyResourceBase; +import com.cloud.hypervisor.kvm.discoverer.KvmDummyResourceBase; import com.cloud.network.dao.IPAddressDao; import com.cloud.resource.Discoverer; import com.cloud.resource.ResourceManager; diff --git a/server/src/com/cloud/hypervisor/kvm/discover/KvmDummyResourceBase.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java similarity index 98% rename from server/src/com/cloud/hypervisor/kvm/discover/KvmDummyResourceBase.java rename to server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java index 4069f551abe..3386ff792bb 100644 --- a/server/src/com/cloud/hypervisor/kvm/discover/KvmDummyResourceBase.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.kvm.discover; +package com.cloud.hypervisor.kvm.discoverer; import java.util.HashMap; import java.util.Map; diff --git a/server/src/com/cloud/hypervisor/kvm/discover/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java old mode 100755 new mode 100644 similarity index 99% rename from server/src/com/cloud/hypervisor/kvm/discover/KvmServerDiscoverer.java rename to server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 7b2492bdff9..03746e7b35b --- a/server/src/com/cloud/hypervisor/kvm/discover/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.kvm.discover; +package com.cloud.hypervisor.kvm.discoverer; import java.net.InetAddress; import java.net.URI; @@ -51,7 +51,7 @@ import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.hypervisor.kvm.discover.KvmDummyResourceBase; +import com.cloud.hypervisor.kvm.discoverer.KvmDummyResourceBase; import com.cloud.network.NetworkManager; import com.cloud.network.PhysicalNetworkSetupInfo; import com.cloud.resource.Discoverer; diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 7f00da989c4..14b5df57a4b 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -98,7 +98,7 @@ import com.cloud.host.dao.HostDetailsDao; import com.cloud.host.dao.HostTagsDao; import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.hypervisor.kvm.discover.KvmDummyResourceBase; +import com.cloud.hypervisor.kvm.discoverer.KvmDummyResourceBase; import com.cloud.network.IPAddressVO; import com.cloud.network.dao.IPAddressDao; import com.cloud.org.Cluster;