From 00d3bc59db2c9fa42313cb2534f7f347d3c28fdf Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Thu, 11 Apr 2013 18:52:09 +0900 Subject: [PATCH] Typos fixed Few typo fixed --- docs/it-IT/hypervisor-host-install-libvirt.po | 2 +- docs/ja-JP/hypervisor-host-install-libvirt.po | 2 +- docs/pot/hypervisor-host-install-libvirt.pot | 2 +- docs/pt-BR/hypervisor-host-install-libvirt.po | 2 +- docs/zh-CN/hypervisor-host-install-libvirt.po | 2 +- docs/zh-TW/hypervisor-host-install-libvirt.po | 2 +- .../engine/subsystem/api/network/NetworkSubsystem.java | 2 +- .../engine/subsystem/api/storage/TemplateProfile.java | 8 ++++---- .../cloudstack/storage/image/store/TemplateObject.java | 6 +++--- .../apache/cloudstack/storage/volume/VolumeObject.java | 4 ++-- .../cloud/hypervisor/vmware/resource/VmwareResource.java | 8 ++++---- .../com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- server/src/com/cloud/storage/TemplateProfile.java | 8 ++++---- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/it-IT/hypervisor-host-install-libvirt.po b/docs/it-IT/hypervisor-host-install-libvirt.po index a04f6c2a213..4dd36959a34 100644 --- a/docs/it-IT/hypervisor-host-install-libvirt.po +++ b/docs/it-IT/hypervisor-host-install-libvirt.po @@ -52,7 +52,7 @@ msgstr "Per abilitare le funzioni di live migration libvirt deve avere il serviz #. Tag: para #, no-c-format -msgid "Set the following paramaters:" +msgid "Set the following parameters:" msgstr "Impostare i seguenti parametri:" #. Tag: programlisting diff --git a/docs/ja-JP/hypervisor-host-install-libvirt.po b/docs/ja-JP/hypervisor-host-install-libvirt.po index a0b587d2251..144353e3eae 100644 --- a/docs/ja-JP/hypervisor-host-install-libvirt.po +++ b/docs/ja-JP/hypervisor-host-install-libvirt.po @@ -52,7 +52,7 @@ msgstr "libvirt を用いてライブマイグレーションを実施するに #. Tag: para #, no-c-format -msgid "Set the following paramaters:" +msgid "Set the following parameters:" msgstr "以下のパラメーターを設定してください。" #. Tag: programlisting diff --git a/docs/pot/hypervisor-host-install-libvirt.pot b/docs/pot/hypervisor-host-install-libvirt.pot index 6df34bbca42..266cda594c0 100644 --- a/docs/pot/hypervisor-host-install-libvirt.pot +++ b/docs/pot/hypervisor-host-install-libvirt.pot @@ -40,7 +40,7 @@ msgstr "" #. Tag: para #, no-c-format -msgid "Set the following paramaters:" +msgid "Set the following parameters:" msgstr "" #. Tag: programlisting diff --git a/docs/pt-BR/hypervisor-host-install-libvirt.po b/docs/pt-BR/hypervisor-host-install-libvirt.po index 6aad9b7f8a2..b7382dda9d1 100644 --- a/docs/pt-BR/hypervisor-host-install-libvirt.po +++ b/docs/pt-BR/hypervisor-host-install-libvirt.po @@ -51,7 +51,7 @@ msgstr "" #. Tag: para #, no-c-format -msgid "Set the following paramaters:" +msgid "Set the following parameters:" msgstr "" #. Tag: programlisting diff --git a/docs/zh-CN/hypervisor-host-install-libvirt.po b/docs/zh-CN/hypervisor-host-install-libvirt.po index 189be925ffa..5c7769abd15 100644 --- a/docs/zh-CN/hypervisor-host-install-libvirt.po +++ b/docs/zh-CN/hypervisor-host-install-libvirt.po @@ -51,7 +51,7 @@ msgstr "" #. Tag: para #, no-c-format -msgid "Set the following paramaters:" +msgid "Set the following parameters:" msgstr "" #. Tag: programlisting diff --git a/docs/zh-TW/hypervisor-host-install-libvirt.po b/docs/zh-TW/hypervisor-host-install-libvirt.po index 3e4ae9391d6..d2955cd6203 100644 --- a/docs/zh-TW/hypervisor-host-install-libvirt.po +++ b/docs/zh-TW/hypervisor-host-install-libvirt.po @@ -52,7 +52,7 @@ msgstr "為了具備live migration的能力 ,libviry必須傾聽不安全的TCP #. Tag: para #, no-c-format -msgid "Set the following paramaters:" +msgid "Set the following parameters:" msgstr "設定以下參數" #. Tag: programlisting diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java index 53254cce55f..af33ea1497f 100755 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java @@ -23,7 +23,7 @@ public interface NetworkSubsystem { String start(String network, String reservationId); - void shutdown(String nework, String reservationId); + void shutdown(String network, String reservationId); void prepare(String vm, String network, String reservationId); diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateProfile.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateProfile.java index e05e7db67fa..c79b741384d 100755 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateProfile.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateProfile.java @@ -28,7 +28,7 @@ public class TemplateProfile { String displayText; Integer bits; Boolean passwordEnabled; - Boolean sshKeyEnbaled; + Boolean sshKeyEnabled; Boolean requiresHvm; String url; Boolean isPublic; @@ -72,7 +72,7 @@ public class TemplateProfile { this.chksum = chksum; this.bootable = bootable; this.details = details; - this.sshKeyEnbaled = sshKeyEnabled; + this.sshKeyEnabled = sshKeyEnabled; } public TemplateProfile(Long userId, VirtualMachineTemplate template, Long zoneId) { @@ -246,11 +246,11 @@ public class TemplateProfile { } public void setSshKeyEnabled(Boolean enabled) { - this.sshKeyEnbaled = enabled; + this.sshKeyEnabled = enabled; } public Boolean getSshKeyEnabled() { - return this.sshKeyEnbaled; + return this.sshKeyEnabled; } public String getImageStorageUri() { diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java index 1b0661c7691..13eaab89e2f 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -47,7 +47,7 @@ public class TemplateObject implements TemplateInfo { @Inject ImageDataDao imageDao; @Inject - ObjectInDataStoreManager ojbectInStoreMgr; + ObjectInDataStoreManager objectInStoreMgr; protected TemplateObject() { } @@ -97,7 +97,7 @@ public class TemplateObject implements TemplateInfo { if (this.dataStore == null) { return image.getUrl(); } else { - ObjectInDataStoreVO obj = ojbectInStoreMgr.findObject( + ObjectInDataStoreVO obj = objectInStoreMgr.findObject( this.imageVO.getId(), DataObjectType.TEMPLATE, this.dataStore.getId(), this.dataStore.getRole()); StringBuilder builder = new StringBuilder(); @@ -124,7 +124,7 @@ public class TemplateObject implements TemplateInfo { if (this.dataStore == null) { return this.imageVO.getSize(); } - ObjectInDataStoreVO obj = ojbectInStoreMgr.findObject( + ObjectInDataStoreVO obj = objectInStoreMgr.findObject( this.imageVO.getId(), DataObjectType.TEMPLATE, this.dataStore.getId(), this.dataStore.getRole()); return obj.getSize(); diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java index 9e04909135e..e8e538b0651 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -45,7 +45,7 @@ public class VolumeObject implements VolumeInfo { @Inject VolumeManager volumeMgr; @Inject - ObjectInDataStoreManager ojbectInStoreMgr; + ObjectInDataStoreManager objectInStoreMgr; protected VolumeObject() { @@ -122,7 +122,7 @@ public class VolumeObject implements VolumeInfo { if (this.dataStore == null) { throw new CloudRuntimeException("datastore must be set before using this object"); } - ObjectInDataStoreVO obj = ojbectInStoreMgr.findObject(this.volumeVO.getId(), DataObjectType.VOLUME, this.dataStore.getId(), this.dataStore.getRole()); + ObjectInDataStoreVO obj = objectInStoreMgr.findObject(this.volumeVO.getId(), DataObjectType.VOLUME, this.dataStore.getId(), this.dataStore.getRole()); if (obj.getState() != ObjectInDataStoreStateMachine.State.Ready) { return this.dataStore.getUri() + "&" + EncodingType.OBJTYPE + "=" + DataObjectType.VOLUME + diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 8d01eb70b26..42425e879be 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -1438,11 +1438,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa protected void assignPublicIpAddress(VirtualMachineMO vmMo, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP, final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception { - String publicNeworkName = HypervisorHostHelper.getPublicNetworkNamePrefix(vlanId); - Pair publicNicInfo = vmMo.getNicDeviceIndex(publicNeworkName); + String publicNetworkName = HypervisorHostHelper.getPublicNetworkNamePrefix(vlanId); + Pair publicNicInfo = vmMo.getNicDeviceIndex(publicNetworkName); if (s_logger.isDebugEnabled()) { - s_logger.debug("Find public NIC index, public network name: " + publicNeworkName + ", index: " + publicNicInfo.first()); + s_logger.debug("Find public NIC index, public network name: " + publicNetworkName + ", index: " + publicNicInfo.first()); } boolean addVif = false; @@ -1463,7 +1463,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (addVif) { plugPublicNic(vmMo, vlanId, vifMacAddress); - publicNicInfo = vmMo.getNicDeviceIndex(publicNeworkName); + publicNicInfo = vmMo.getNicDeviceIndex(publicNetworkName); if (publicNicInfo.first().intValue() >= 0) { networkUsage(privateIpAddress, "addVif", "eth" + publicNicInfo.first()); } diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 52ea8e28d2a..64ea54b4001 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2226,7 +2226,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } else { network = _networkModel.getNetworkWithSecurityGroupEnabled(zoneId); if (network == null) { - throw new InvalidParameterValueException("Nework id is required for Direct vlan creation "); + throw new InvalidParameterValueException("Network id is required for Direct vlan creation "); } networkId = network.getId(); zoneId = network.getDataCenterId(); diff --git a/server/src/com/cloud/storage/TemplateProfile.java b/server/src/com/cloud/storage/TemplateProfile.java index 1d8b6bfc1a3..f6c51014796 100755 --- a/server/src/com/cloud/storage/TemplateProfile.java +++ b/server/src/com/cloud/storage/TemplateProfile.java @@ -28,7 +28,7 @@ public class TemplateProfile { String displayText; Integer bits; Boolean passwordEnabled; - Boolean sshKeyEnbaled; + Boolean sshKeyEnabled; Boolean requiresHvm; String url; Boolean isPublic; @@ -72,7 +72,7 @@ public class TemplateProfile { this.chksum = chksum; this.bootable = bootable; this.details = details; - this.sshKeyEnbaled = sshKeyEnabled; + this.sshKeyEnabled = sshKeyEnabled; } public TemplateProfile(Long userId, VMTemplateVO template, Long zoneId) { @@ -246,10 +246,10 @@ public class TemplateProfile { } public void setSshKeyEnabled(Boolean enabled) { - this.sshKeyEnbaled = enabled; + this.sshKeyEnabled = enabled; } public Boolean getSshKeyEnabled() { - return this.sshKeyEnbaled; + return this.sshKeyEnabled; } }