diff --git a/agent/src/com/cloud/agent/dao/StorageComponent.java b/agent/src/com/cloud/agent/dao/StorageComponent.java index afb9467ee50..e98007322b5 100755 --- a/agent/src/com/cloud/agent/dao/StorageComponent.java +++ b/agent/src/com/cloud/agent/dao/StorageComponent.java @@ -19,7 +19,7 @@ package com.cloud.agent.dao; import com.cloud.utils.component.Manager; /** - * + * */ public interface StorageComponent extends Manager { String get(String key); diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java index f37dbf36f6f..c573f29b843 100755 --- a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -33,7 +33,7 @@ import com.cloud.utils.PropertiesUtil; /** * Uses Properties to implement storage. - * + * * @config {@table || Param Name | Description | Values | Default || || path | * path to the properties _file | String | db/db.properties || * } **/ diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java index 06df4da433b..c3dea2e987f 100644 --- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java +++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java @@ -66,7 +66,7 @@ import com.cloud.utils.net.NetUtils; import com.cloud.utils.script.Script; /** - * + * * I don't want to introduce extra cross-cutting concerns into console proxy * process, as it involves configurations like zone/pod, agent auto self-upgrade * etc. I also don't want to introduce more module dependency issues into our @@ -74,12 +74,12 @@ import com.cloud.utils.script.Script; * will be done through reflection. As a result, come out with following * solution to solve the problem of building a communication channel between * consoole proxy and management server. - * + * * We will deploy an agent shell inside console proxy VM, and this agent shell * will launch current console proxy from within this special server resource, * through it console proxy can build a communication channel with management * server. - * + * */ public class ConsoleProxyResource extends ServerResourceBase implements ServerResource { static final Logger s_logger = Logger.getLogger(ConsoleProxyResource.class); diff --git a/agent/src/com/cloud/agent/vmdata/VmDataServer.java b/agent/src/com/cloud/agent/vmdata/VmDataServer.java index 2d85b9bd87e..0a81a6b3288 100644 --- a/agent/src/com/cloud/agent/vmdata/VmDataServer.java +++ b/agent/src/com/cloud/agent/vmdata/VmDataServer.java @@ -24,7 +24,7 @@ import com.cloud.utils.component.Manager; /** * Maintains vm data (user data, meta-data, password) that can be fetched via * HTTP by user vms - * + * */ public interface VmDataServer extends Manager { diff --git a/api/src/com/cloud/agent/api/HostVmStateReportEntry.java b/api/src/com/cloud/agent/api/HostVmStateReportEntry.java index f582d90d123..4f0fb911225 100644 --- a/api/src/com/cloud/agent/api/HostVmStateReportEntry.java +++ b/api/src/com/cloud/agent/api/HostVmStateReportEntry.java @@ -23,7 +23,7 @@ import com.cloud.vm.VirtualMachine.PowerState; // TODO vmsync // We should also have a HostVmStateReport class instead of using raw Map<> data structure, // for now, we store host-specific info at each VM entry and host fields are fixed -// +// // This needs to be refactor-ed afterwards // public class HostVmStateReportEntry { diff --git a/api/src/com/cloud/agent/manager/allocator/HostAllocator.java b/api/src/com/cloud/agent/manager/allocator/HostAllocator.java index 98274257643..604720aaa29 100755 --- a/api/src/com/cloud/agent/manager/allocator/HostAllocator.java +++ b/api/src/com/cloud/agent/manager/allocator/HostAllocator.java @@ -52,11 +52,11 @@ public interface HostAllocator extends Adapter { /** * Determines which physical hosts are suitable to allocate the guest * virtual machines on - * + * * Allocators must set any other hosts not considered for allocation in the * ExcludeList avoid. Thus the avoid set and the list of hosts suitable, * together must cover the entire host set in the cluster. - * + * * @param VirtualMachineProfile * vmProfile * @param DeploymentPlan @@ -81,8 +81,8 @@ public interface HostAllocator extends Adapter { * Allocators must set any other hosts not considered for allocation in the * ExcludeList avoid. Thus the avoid set and the list of hosts suitable, * together must cover the entire host set in the cluster. - * - * + * + * * @param VirtualMachineProfile * vmProfile * @param DeploymentPlan diff --git a/api/src/com/cloud/ha/FenceBuilder.java b/api/src/com/cloud/ha/FenceBuilder.java index 8b638694e39..d157bf1e11f 100644 --- a/api/src/com/cloud/ha/FenceBuilder.java +++ b/api/src/com/cloud/ha/FenceBuilder.java @@ -23,7 +23,7 @@ import com.cloud.vm.VirtualMachine; public interface FenceBuilder extends Adapter { /** * Fence off the vm. - * + * * @param vm vm * @param host host where the vm was running on. */ diff --git a/api/src/com/cloud/ha/Investigator.java b/api/src/com/cloud/ha/Investigator.java index a5de1ba5e1b..7dd8b3f503c 100644 --- a/api/src/com/cloud/ha/Investigator.java +++ b/api/src/com/cloud/ha/Investigator.java @@ -24,7 +24,7 @@ import com.cloud.vm.VirtualMachine; public interface Investigator extends Adapter { /** * Returns if the vm is still alive. - * + * * @param vm to work on. */ public Boolean isVmAlive(VirtualMachine vm, Host host); diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/com/cloud/hypervisor/Hypervisor.java index 35346c40d2c..f8b98cf49dd 100644 --- a/api/src/com/cloud/hypervisor/Hypervisor.java +++ b/api/src/com/cloud/hypervisor/Hypervisor.java @@ -68,7 +68,7 @@ public class Hypervisor { /** * This method really needs to be part of the properties of the hypervisor type itself. - * + * * @param hyperType * @return */ diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/com/cloud/hypervisor/HypervisorGuru.java index cc276808201..03493726176 100644 --- a/api/src/com/cloud/hypervisor/HypervisorGuru.java +++ b/api/src/com/cloud/hypervisor/HypervisorGuru.java @@ -72,7 +72,7 @@ public interface HypervisorGuru extends Adapter { /** * Give the hypervisor guru the opportinity to decide if additional clean is * required for nics before expunging the VM - * + * */ List finalizeExpungeNics(VirtualMachine vm, List nics); } diff --git a/api/src/com/cloud/network/NetworkMigrationResponder.java b/api/src/com/cloud/network/NetworkMigrationResponder.java index 951e1c2b4d2..2a99036c050 100644 --- a/api/src/com/cloud/network/NetworkMigrationResponder.java +++ b/api/src/com/cloud/network/NetworkMigrationResponder.java @@ -23,13 +23,13 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; /** - * NetworkGuru and NetworkElements that implement this interface + * NetworkGuru and NetworkElements that implement this interface * will be called during Virtual Machine migration. */ public interface NetworkMigrationResponder { /** * Prepare for migration. - * + * * This method will be called per nic before the vm migration. * @param nic * @param network @@ -42,9 +42,9 @@ public interface NetworkMigrationResponder { /** * Cancel for migration preparation. - * - * This method will be called per nic when the entire vm migration - * process failed and need to release the resouces that was + * + * This method will be called per nic when the entire vm migration + * process failed and need to release the resouces that was * allocated at the migration preparation. * @param nic destination nic * @param network destination network @@ -56,9 +56,9 @@ public interface NetworkMigrationResponder { /** * Commit the migration resource. - * - * This method will be called per nic when the entire vm migration - * process was successful. This is useful to release the resource of + * + * This method will be called per nic when the entire vm migration + * process was successful. This is useful to release the resource of * source deployment where vm has left. * @param nic source nic * @param network source network diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java index 8c627cd743e..9bf5d27eea8 100644 --- a/api/src/com/cloud/network/NetworkModel.java +++ b/api/src/com/cloud/network/NetworkModel.java @@ -42,14 +42,14 @@ import com.cloud.vm.VirtualMachine; /** * The NetworkModel presents a read-only view into the Network data such as L2 networks, * Nics, PublicIps, NetworkOfferings, traffic labels, physical networks and the like - * The idea is that only the orchestration core should be able to modify the data, while other + * The idea is that only the orchestration core should be able to modify the data, while other * participants in the orchestration can use this interface to query the data. */ public interface NetworkModel { /** * Lists IP addresses that belong to VirtualNetwork VLANs - * + * * @param accountId * - account that the IP address should belong to * @param associatedNetworkId diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java index b03f14afa55..e15ed463657 100755 --- a/api/src/com/cloud/network/Networks.java +++ b/api/src/com/cloud/network/Networks.java @@ -23,7 +23,7 @@ import com.cloud.utils.exception.CloudRuntimeException; /** * Network includes all of the enums used within networking. - * + * */ public class Networks { diff --git a/api/src/com/cloud/network/element/IpDeployer.java b/api/src/com/cloud/network/element/IpDeployer.java index e7c8702e6dd..6ef2acd2619 100644 --- a/api/src/com/cloud/network/element/IpDeployer.java +++ b/api/src/com/cloud/network/element/IpDeployer.java @@ -30,7 +30,7 @@ public interface IpDeployer extends Adapter { /** * Modify ip addresses on this network * Depending on the State of the ip addresses the element should take - * appropriate action. + * appropriate action. * If state is Releasing the ip address should be de-allocated * If state is Allocating or Allocated the ip address should be provisioned * @param network diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java index 5f68e80ce94..5d4bda62813 100644 --- a/api/src/com/cloud/network/element/NetworkElement.java +++ b/api/src/com/cloud/network/element/NetworkElement.java @@ -44,13 +44,13 @@ public interface NetworkElement extends Adapter { Map> getCapabilities(); /** - * NOTE: + * NOTE: * NetworkElement -> Network.Provider is a one-to-one mapping. While adding a new NetworkElement, one must add a new Provider name to Network.Provider. */ Provider getProvider(); /** - * Implement the network configuration as specified. + * Implement the network configuration as specified. * @param config fully specified network configuration. * @param offering network offering that originated the network configuration. * @return true if network configuration is now usable; false if not; null if not handled by this element. @@ -124,7 +124,7 @@ public interface NetworkElement extends Adapter { boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException; /** - * This should return true if out of multiple services provided by this element, only some can be enabled. If all the services MUST be provided, this should return false. + * This should return true if out of multiple services provided by this element, only some can be enabled. If all the services MUST be provided, this should return false. * @return true/false */ boolean canEnableIndividualServices(); diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/com/cloud/network/vpc/Vpc.java index 58a662f3be8..fb5f2cc8991 100644 --- a/api/src/com/cloud/network/vpc/Vpc.java +++ b/api/src/com/cloud/network/vpc/Vpc.java @@ -27,7 +27,7 @@ public interface Vpc extends ControlledEntity, Identity, InternalIdentity { } /** - * + * * @return VPC name */ String getName(); @@ -43,31 +43,31 @@ public interface Vpc extends ControlledEntity, Identity, InternalIdentity { String getCidr(); /** - * + * * @return VPC state */ State getState(); /** - * + * * @return VPC offering id - the offering that VPC is created from */ long getVpcOfferingId(); /** - * + * * @return VPC display text */ String getDisplayText(); /** - * + * * @return VPC network domain. All networks participating in the VPC, become the part of the same network domain */ String getNetworkDomain(); /** - * + * * @return true if restart is required for the VPC; false otherwise */ boolean isRestartRequired(); diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/com/cloud/network/vpc/VpcOffering.java index 320cf93e4c5..6e75a2f2500 100644 --- a/api/src/com/cloud/network/vpc/VpcOffering.java +++ b/api/src/com/cloud/network/vpc/VpcOffering.java @@ -28,7 +28,7 @@ public interface VpcOffering extends InternalIdentity, Identity { public static final String defaultVPCNSOfferingName = "Default VPC offering with Netscaler"; /** - * + * * @return VPC offering name */ String getName(); @@ -39,13 +39,13 @@ public interface VpcOffering extends InternalIdentity, Identity { String getDisplayText(); /** - * + * * @return VPC offering state */ State getState(); /** - * + * * @return true if offering is default - came with the cloudStack fresh install; false otherwise */ boolean isDefault(); diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java index 8f254244ede..8223ae612d5 100644 --- a/api/src/com/cloud/network/vpc/VpcService.java +++ b/api/src/com/cloud/network/vpc/VpcService.java @@ -35,7 +35,7 @@ public interface VpcService { /** * Persists VPC record in the database - * + * * @param zoneId * @param vpcOffId * @param vpcOwnerId @@ -50,7 +50,7 @@ public interface VpcService { /** * Deletes a VPC - * + * * @param vpcId * @return * @throws InsufficientCapacityException @@ -61,7 +61,7 @@ public interface VpcService { /** * Updates VPC with new name/displayText - * + * * @param vpcId * @param vpcName * @param displayText @@ -71,7 +71,7 @@ public interface VpcService { /** * Lists VPC(s) based on the parameters passed to the method call - * + * * @param id * @param vpcName * @param displayText @@ -98,7 +98,7 @@ public interface VpcService { /** * Starts VPC which includes starting VPC provider and applying all the neworking rules on the backend - * + * * @param vpcId * @param destroyOnFailure TODO * @return @@ -110,7 +110,7 @@ public interface VpcService { /** * Shuts down the VPC which includes shutting down all VPC provider and rules cleanup on the backend - * + * * @param vpcId * @return * @throws ConcurrentOperationException @@ -120,7 +120,7 @@ public interface VpcService { /** * Restarts the VPC. VPC gets shutdown and started as a part of it - * + * * @param id * @return * @throws InsufficientCapacityException @@ -129,7 +129,7 @@ public interface VpcService { /** * Returns a Private gateway found in the VPC by id - * + * * @param id * @return */ @@ -137,7 +137,7 @@ public interface VpcService { /** * Persists VPC private gateway in the Database. - * + * * * @param vpcId TODO * @param physicalNetworkId @@ -159,7 +159,7 @@ public interface VpcService { /** * Applies VPC private gateway on the backend, so it becomes functional - * + * * @param gatewayId * @param destroyOnFailure TODO * @return @@ -170,7 +170,7 @@ public interface VpcService { /** * Deletes VPC private gateway - * + * * @param id * @return * @throws ResourceUnavailableException @@ -180,7 +180,7 @@ public interface VpcService { /** * Returns the list of Private gateways existing in the VPC - * + * * @param listPrivateGatewaysCmd * @return */ @@ -188,7 +188,7 @@ public interface VpcService { /** * Returns Static Route found by Id - * + * * @param routeId * @return */ @@ -196,7 +196,7 @@ public interface VpcService { /** * Applies existing Static Routes to the VPC elements - * + * * @param vpcId * @return * @throws ResourceUnavailableException @@ -205,7 +205,7 @@ public interface VpcService { /** * Deletes static route from the backend and the database - * + * * @param routeId * @return TODO * @throws ResourceUnavailableException @@ -214,7 +214,7 @@ public interface VpcService { /** * Persists static route entry in the Database - * + * * @param gatewayId * @param cidr * @return @@ -223,7 +223,7 @@ public interface VpcService { /** * Lists static routes based on parameters passed to the call - * + * * @param listStaticRoutesCmd * @return */ @@ -231,7 +231,7 @@ public interface VpcService { /** * Associates IP address from the Public network, to the VPC - * + * * @param ipId * @param vpcId * @return diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/com/cloud/user/DomainService.java index 18588bdb5e4..4c1f93d0737 100644 --- a/api/src/com/cloud/user/DomainService.java +++ b/api/src/com/cloud/user/DomainService.java @@ -49,7 +49,7 @@ public interface DomainService { /** * find the domain by its path - * + * * @param domainPath * the path to use to lookup a domain * @return domainVO the domain with the matching path, or null if no domain with the given path exists diff --git a/api/src/com/cloud/vm/ConsoleProxy.java b/api/src/com/cloud/vm/ConsoleProxy.java index cea4d4152c9..ef42c89b1ed 100644 --- a/api/src/com/cloud/vm/ConsoleProxy.java +++ b/api/src/com/cloud/vm/ConsoleProxy.java @@ -17,7 +17,7 @@ package com.cloud.vm; /** - * ConsoleProxy is a system VM instance that is used + * ConsoleProxy is a system VM instance that is used * to proxy VNC traffic */ public interface ConsoleProxy extends SystemVm { diff --git a/api/src/com/cloud/vm/SecondaryStorageVm.java b/api/src/com/cloud/vm/SecondaryStorageVm.java index fe941864d95..716bbb30456 100644 --- a/api/src/com/cloud/vm/SecondaryStorageVm.java +++ b/api/src/com/cloud/vm/SecondaryStorageVm.java @@ -17,7 +17,7 @@ package com.cloud.vm; /** - * Secondary Storage VM is a system VM instance that is used + * Secondary Storage VM is a system VM instance that is used * to interface the management server to secondary storage */ public interface SecondaryStorageVm extends SystemVm { diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 7f4fb3ca404..f189881c2a1 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -290,7 +290,7 @@ public interface UserVmService { /** * Creates a User VM in Advanced Zone (Security Group feature is disabled) * in the database and returns the VM to the caller. - * + * * * @param zone * - availability zone for the virtual machine @@ -397,7 +397,7 @@ public interface UserVmService { * @param cmd * - the command specifying vmId and new serviceOfferingId * @return the vm - * @throws ResourceAllocationException + * @throws ResourceAllocationException */ UserVm upgradeVirtualMachine(UpgradeVMCmd cmd) throws ResourceAllocationException; diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java index db58e7d2fcc..ad133993973 100755 --- a/api/src/com/cloud/vm/VirtualMachine.java +++ b/api/src/com/cloud/vm/VirtualMachine.java @@ -29,7 +29,7 @@ import com.cloud.utils.fsm.StateObject; /** * VirtualMachine describes the properties held by a virtual machine - * + * */ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, InternalIdentity, StateObject { @@ -258,7 +258,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I /** * returns the guest OS ID - * + * * @return guestOSId */ long getGuestOSId(); diff --git a/api/src/com/cloud/vm/VirtualMachineName.java b/api/src/com/cloud/vm/VirtualMachineName.java index 86f5f8e533e..c5fc3de5ab1 100755 --- a/api/src/com/cloud/vm/VirtualMachineName.java +++ b/api/src/com/cloud/vm/VirtualMachineName.java @@ -21,7 +21,7 @@ import java.util.Formatter; import com.cloud.dc.Vlan; /** - * VM Name. + * VM Name. */ public class VirtualMachineName { public static final String SEPARATOR = "-"; diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java index b312b8bc47b..7ee46a2e09c 100644 --- a/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java @@ -78,7 +78,7 @@ public interface AffinityGroupProcessor extends Adapter { * subDomainAccess() should return true if the affinity/anti-affinity group * can be created for a domain and used by the sub-domains. If true, all * accounts under the sub-domains can see this group and use it. - * + * * @return boolean true/false */ boolean subDomainAccess(); diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java index 2645de2a71f..5ad43357267 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java index 3ccf6d1effb..bdbb954df03 100644 --- a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java @@ -23,7 +23,7 @@ import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; /** - * + * * Load Balancer instance is the User Vm instance participating in the Load Balancer * */ diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/org/apache/cloudstack/context/CallContext.java index 0645583628e..6f65091c3ef 100644 --- a/api/src/org/apache/cloudstack/context/CallContext.java +++ b/api/src/org/apache/cloudstack/context/CallContext.java @@ -118,7 +118,7 @@ public class CallContext { /** * This method should only be called if you can propagate the context id * from another CallContext. - * + * * @param callingUser calling user * @param callingAccount calling account * @param contextId context id propagated from another call context @@ -131,7 +131,7 @@ public class CallContext { protected static CallContext register(User callingUser, Account callingAccount, Long userId, Long accountId, String contextId) { /* Unit tests will have multiple times of setup/tear-down call to this, remove assertions to all unit test to run - + assert s_currentContext.get() == null : "There's a context already so what does this new register context mean? " + s_currentContext.get().toString(); if (s_currentContext.get() != null) { // FIXME: This should be removed soon. I added this check only to surface all the places that have this problem. throw new CloudRuntimeException("There's a context already so what does this new register context mean? " + s_currentContext.get().toString()); diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java b/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java index e043e3fc977..4908918c539 100644 --- a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java +++ b/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java @@ -5,7 +5,7 @@ // 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, diff --git a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java index 2d81efdc2cb..194481fa747 100644 --- a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java +++ b/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java @@ -5,7 +5,7 @@ // 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, diff --git a/api/src/org/apache/cloudstack/region/RegionService.java b/api/src/org/apache/cloudstack/region/RegionService.java index b5a28668958..afefcc7672e 100644 --- a/api/src/org/apache/cloudstack/region/RegionService.java +++ b/api/src/org/apache/cloudstack/region/RegionService.java @@ -79,7 +79,7 @@ public interface RegionService { /** * Updates an account - * isPopagate falg is set to true if sent from peer Region + * isPopagate falg is set to true if sent from peer Region * * @param cmd * - the parameter containing accountId or account nameand domainId @@ -91,8 +91,8 @@ public interface RegionService { * Disables an account by accountName and domainId or accountId * @param cmd * @return - * @throws ResourceUnavailableException - * @throws ConcurrentOperationException + * @throws ResourceUnavailableException + * @throws ConcurrentOperationException */ Account disableAccount(DisableAccountCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException; @@ -112,7 +112,7 @@ public interface RegionService { /** * update an existing domain - * + * * @param cmd * - the command containing domainId and new domainName * @return Domain object if the command succeeded diff --git a/api/src/org/apache/cloudstack/usage/UsageService.java b/api/src/org/apache/cloudstack/usage/UsageService.java index d8468abe9e8..cae37bd6f88 100755 --- a/api/src/org/apache/cloudstack/usage/UsageService.java +++ b/api/src/org/apache/cloudstack/usage/UsageService.java @@ -29,7 +29,7 @@ public interface UsageService { /** * Generate Billing Records from the last time it was generated to the * time specified. - * + * * @param cmd the command wrapping the generate parameters * - userId unique id of the user, pass in -1 to generate billing records * for all users @@ -41,7 +41,7 @@ public interface UsageService { /** * Retrieves all Usage Records generated between the start and end date specified - * + * * @param userId unique id of the user, pass in -1 to retrieve billing records * for all users * @param startDate inclusive. diff --git a/api/test/com/cloud/network/NetworksTest.java b/api/test/com/cloud/network/NetworksTest.java index 438e49e3c0c..df2985f8f0e 100644 --- a/api/test/com/cloud/network/NetworksTest.java +++ b/api/test/com/cloud/network/NetworksTest.java @@ -29,7 +29,7 @@ import com.cloud.utils.exception.CloudRuntimeException; /** * @author dhoogland - * + * */ public class NetworksTest { diff --git a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java index 77b18bad835..f01c4d70bb6 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java @@ -69,22 +69,22 @@ public class AddAccountToProjectCmdTest extends TestCase { /**** * Condition not handled in the code - * + * *****/ /* * @Test public void testGetEntityOwnerIdForNullProject() { - * + * * ProjectService projectService = Mockito.mock(ProjectService.class); * Mockito * .when(projectService.getProject(Mockito.anyLong())).thenReturn(null); * addAccountToProjectCmd._projectService = projectService; - * + * * try { addAccountToProjectCmd.getEntityOwnerId(); } * catch(InvalidParameterValueException exception) { * Assert.assertEquals("Unable to find project by id 2", * exception.getLocalizedMessage()); } - * + * * } */ @@ -110,32 +110,32 @@ public class AddAccountToProjectCmdTest extends TestCase { /** * To run the test uncomment the return statement for getAccountName() in * setup() and return null - * + * * **/ /* * @Test public void testGetEventDescriptionForNullAccount() { - * + * * String result = addAccountToProjectCmd.getEventDescription(); String * expected = "Sending invitation to email null to join project: 2"; * Assert.assertEquals(expected, result); - * + * * } */ /*** - * - * - * + * + * + * * ***/ /* * @Test public void testGetEventDescriptionForAccount() { - * + * * String result = addAccountToProjectCmd.getEventDescription(); String * expected = "Adding account accountName to project: 2"; * Assert.assertEquals(expected, result); - * + * * } */ @@ -152,20 +152,20 @@ public class AddAccountToProjectCmdTest extends TestCase { /* * @Test public void testExecuteForAccountNameEmail() { - * + * * try { - * + * * ComponentLocator c = Mockito.mock(ComponentLocator.class); UserContext * userContext = Mockito.mock(UserContext.class); - * + * * // Mockito.when(userContext.current()).thenReturn(userContext); - * - * + * + * * addAccountToProjectCmd.execute(); } catch(InvalidParameterValueException * exception) { * Assert.assertEquals("Either accountName or email is required", * exception.getLocalizedMessage()); } - * + * * } */ diff --git a/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java index 36e66ce102a..09e4fb6937a 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java @@ -97,7 +97,7 @@ public class AddHostCmdTest extends TestCase { /* * @Test public void testExecuteForResult() throws Exception { - * + * * addHostCmd._resourceService = resourceService; * addHostCmd._responseGenerator = responseGenerator; MockHost mockInstance * = new MockHost(); MockHost[] mockArray = new MockHost[]{mockInstance}; diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java index 16f2ac26d4a..59d2e8ea662 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java @@ -69,27 +69,27 @@ public class AddVpnUserCmdTest extends TestCase { /* * @Test public void testExecuteVpnUserNotFound() { - * + * * EntityManager entityManager = Mockito.mock(EntityManager.class); - * + * * Mockito.when(entityManager.findById(VpnUser.class, * Mockito.anyLong())).thenReturn(null); - * + * * addVpnUserCmd._entityMgr = entityManager; try { addVpnUserCmd.execute(); * } catch (Exception e) { } - * + * * } - * - * + * + * * @Test public void testExecuteVpnUserFound() { - * + * * EntityManager entityManager = Mockito.mock(EntityManager.class); * addVpnUserCmd._entityMgr = entityManager; - * + * * VpnUser vpnUser = Mockito.mock(VpnUser.class); * Mockito.when(entityManager.findById(VpnUser.class, * Mockito.anyLong())).thenReturn(vpnUser); addVpnUserCmd.execute(); - * + * * } */ diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java index 8aa62ebe881..ec0f982e674 100644 --- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java +++ b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java @@ -30,7 +30,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describePlacementGroups0 */ @@ -41,7 +41,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSecurityGroup2 */ @@ -52,7 +52,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetNetworkInterfaceAttribute4 */ @@ -63,7 +63,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createDhcpOptions6 */ @@ -74,7 +74,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createRouteTable8 */ @@ -85,7 +85,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSubnets10 */ @@ -96,7 +96,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deactivateLicense12 */ @@ -107,7 +107,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpc14 */ @@ -118,7 +118,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelSpotInstanceRequests16 */ @@ -129,7 +129,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSubnet18 */ @@ -140,7 +140,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpnGateway20 */ @@ -151,7 +151,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createNetworkAclEntry22 */ @@ -162,7 +162,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param requestSpotInstances24 */ @@ -173,7 +173,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVolumeAttribute26 */ @@ -184,7 +184,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param associateDhcpOptions28 */ @@ -195,7 +195,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeTags30 */ @@ -206,7 +206,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param importKeyPair32 */ @@ -217,7 +217,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteNetworkInterface34 */ @@ -228,7 +228,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVpcs36 */ @@ -239,7 +239,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeLicenses38 */ @@ -250,7 +250,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param bundleInstance40 */ @@ -261,7 +261,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVpnConnections42 */ @@ -272,7 +272,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeImages44 */ @@ -283,7 +283,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createInternetGateway46 */ @@ -294,7 +294,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param disassociateRouteTable48 */ @@ -305,7 +305,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceNetworkAclEntry50 */ @@ -316,7 +316,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param authorizeSecurityGroupIngress52 */ @@ -327,7 +327,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSnapshotAttribute54 */ @@ -338,7 +338,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpnGateway56 */ @@ -349,7 +349,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetInstanceAttribute58 */ @@ -360,7 +360,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createTags60 */ @@ -371,7 +371,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param authorizeSecurityGroupEgress62 */ @@ -382,7 +382,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param associateAddress64 */ @@ -393,7 +393,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeImageAttribute66 */ @@ -404,7 +404,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSpotPriceHistory68 */ @@ -415,7 +415,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifySnapshotAttribute70 */ @@ -426,7 +426,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSpotInstanceRequests72 */ @@ -437,7 +437,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param importInstance74 */ @@ -448,7 +448,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeKeyPairs76 */ @@ -459,7 +459,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param revokeSecurityGroupIngress78 */ @@ -470,7 +470,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createPlacementGroup80 */ @@ -481,7 +481,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteNetworkAclEntry82 */ @@ -492,7 +492,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param activateLicense84 */ @@ -503,7 +503,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteRouteTable86 */ @@ -514,7 +514,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param unmonitorInstances88 */ @@ -525,7 +525,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param startInstances90 */ @@ -536,7 +536,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param confirmProductInstance92 */ @@ -547,7 +547,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeNetworkInterfaceAttribute94 */ @@ -559,7 +559,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param runInstances96 */ @@ -570,7 +570,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createReservedInstancesListing98 */ @@ -581,7 +581,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createCustomerGateway100 */ @@ -592,7 +592,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createNetworkAcl102 */ @@ -603,7 +603,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetImageAttribute104 */ @@ -614,7 +614,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyVolumeAttribute106 */ @@ -625,7 +625,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeReservedInstances108 */ @@ -636,7 +636,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetSnapshotAttribute110 */ @@ -647,7 +647,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVolume112 */ @@ -658,7 +658,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeAvailabilityZones114 */ @@ -669,7 +669,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpnConnection116 */ @@ -680,7 +680,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelBundleTask118 */ @@ -691,7 +691,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceNetworkAclAssociation120 */ @@ -702,7 +702,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachVpnGateway122 */ @@ -713,7 +713,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSnapshots124 */ @@ -724,7 +724,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSubnet126 */ @@ -735,7 +735,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeBundleTasks128 */ @@ -746,7 +746,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createKeyPair130 */ @@ -757,7 +757,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createImage132 */ @@ -768,7 +768,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param enableVgwRoutePropagation134 */ @@ -779,7 +779,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param unassignPrivateIpAddresses136 */ @@ -790,7 +790,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deregisterImage138 */ @@ -801,7 +801,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpnConnectionRoute140 */ @@ -812,7 +812,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyImageAttribute142 */ @@ -823,7 +823,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelConversionTask144 */ @@ -834,7 +834,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVolumes146 */ @@ -845,7 +845,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelReservedInstancesListing148 */ @@ -856,7 +856,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param getPasswordData150 */ @@ -867,7 +867,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param allocateAddress152 */ @@ -878,7 +878,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSecurityGroup154 */ @@ -889,7 +889,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deletePlacementGroup156 */ @@ -900,7 +900,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param disassociateAddress158 */ @@ -911,7 +911,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteDhcpOptions160 */ @@ -922,7 +922,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSpotDatafeedSubscription162 */ @@ -934,7 +934,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeNetworkAcls164 */ @@ -945,7 +945,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param enableVolumeIO166 */ @@ -956,7 +956,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachVpnGateway168 */ @@ -967,7 +967,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInternetGateways170 */ @@ -978,7 +978,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeDhcpOptions172 */ @@ -989,7 +989,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSpotDatafeedSubscription174 */ @@ -1000,7 +1000,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeReservedInstancesListings176 */ @@ -1012,7 +1012,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInstanceStatus178 */ @@ -1023,7 +1023,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyNetworkInterfaceAttribute180 */ @@ -1035,7 +1035,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param disableVgwRoutePropagation182 */ @@ -1046,7 +1046,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVolumeStatus184 */ @@ -1057,7 +1057,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachNetworkInterface186 */ @@ -1068,7 +1068,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSecurityGroups188 */ @@ -1079,7 +1079,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInstances190 */ @@ -1090,7 +1090,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeNetworkInterfaces192 */ @@ -1101,7 +1101,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteKeyPair194 */ @@ -1112,7 +1112,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSnapshot196 */ @@ -1123,7 +1123,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVpnGateways198 */ @@ -1134,7 +1134,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteTags200 */ @@ -1145,7 +1145,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSnapshot202 */ @@ -1156,7 +1156,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteCustomerGateway204 */ @@ -1167,7 +1167,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVolume206 */ @@ -1178,7 +1178,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelExportTask208 */ @@ -1189,7 +1189,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param registerImage210 */ @@ -1200,7 +1200,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachVolume212 */ @@ -1211,7 +1211,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param stopInstances214 */ @@ -1222,7 +1222,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createRoute216 */ @@ -1233,7 +1233,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param releaseAddress218 */ @@ -1244,7 +1244,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeRouteTables220 */ @@ -1255,7 +1255,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeCustomerGateways222 */ @@ -1266,7 +1266,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteNetworkAcl224 */ @@ -1277,7 +1277,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteRoute226 */ @@ -1288,7 +1288,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param rebootInstances228 */ @@ -1299,7 +1299,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyInstanceAttribute230 */ @@ -1310,7 +1310,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param terminateInstances232 */ @@ -1321,7 +1321,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpnConnectionRoute234 */ @@ -1332,7 +1332,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeConversionTasks236 */ @@ -1343,7 +1343,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeAddresses238 */ @@ -1354,7 +1354,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInstanceAttribute240 */ @@ -1365,7 +1365,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachInternetGateway242 */ @@ -1376,7 +1376,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpc244 */ @@ -1387,7 +1387,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceRouteTableAssociation246 */ @@ -1398,7 +1398,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param associateRouteTable248 */ @@ -1409,7 +1409,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachInternetGateway250 */ @@ -1420,7 +1420,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param purchaseReservedInstancesOffering252 */ @@ -1432,7 +1432,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param importVolume254 */ @@ -1443,7 +1443,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeExportTasks256 */ @@ -1454,7 +1454,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createInstanceExportTask258 */ @@ -1465,7 +1465,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param assignPrivateIpAddresses260 */ @@ -1476,7 +1476,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param reportInstanceStatus262 */ @@ -1487,7 +1487,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeReservedInstancesOfferings264 */ @@ -1499,7 +1499,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpnConnection266 */ @@ -1510,7 +1510,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteInternetGateway268 */ @@ -1521,7 +1521,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSpotDatafeedSubscription270 */ @@ -1532,7 +1532,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachNetworkInterface272 */ @@ -1543,7 +1543,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createNetworkInterface274 */ @@ -1554,7 +1554,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param revokeSecurityGroupEgress276 */ @@ -1565,7 +1565,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param monitorInstances278 */ @@ -1576,7 +1576,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceRoute280 */ @@ -1587,7 +1587,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachVolume282 */ @@ -1598,7 +1598,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param getConsoleOutput284 */ @@ -1609,7 +1609,7 @@ public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeRegions286 */ diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java index a692173b652..40f1113489e 100644 --- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java +++ b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java @@ -30,7 +30,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describePlacementGroups */ @@ -38,7 +38,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSecurityGroup */ @@ -46,7 +46,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetNetworkInterfaceAttribute */ @@ -54,7 +54,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createDhcpOptions */ @@ -62,7 +62,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createRouteTable */ @@ -70,7 +70,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSubnets */ @@ -78,7 +78,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deactivateLicense */ @@ -86,7 +86,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpc */ @@ -94,7 +94,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelSpotInstanceRequests */ @@ -102,7 +102,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSubnet */ @@ -110,7 +110,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpnGateway */ @@ -118,7 +118,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createNetworkAclEntry */ @@ -126,7 +126,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param requestSpotInstances */ @@ -134,7 +134,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVolumeAttribute */ @@ -142,7 +142,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param associateDhcpOptions */ @@ -150,7 +150,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeTags */ @@ -158,7 +158,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param importKeyPair */ @@ -166,7 +166,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteNetworkInterface */ @@ -174,7 +174,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVpcs */ @@ -182,7 +182,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeLicenses */ @@ -190,7 +190,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param bundleInstance */ @@ -198,7 +198,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVpnConnections */ @@ -206,7 +206,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeImages */ @@ -214,7 +214,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createInternetGateway */ @@ -222,7 +222,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param disassociateRouteTable */ @@ -230,7 +230,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceNetworkAclEntry */ @@ -238,7 +238,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param authorizeSecurityGroupIngress */ @@ -246,7 +246,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSnapshotAttribute */ @@ -254,7 +254,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpnGateway */ @@ -262,7 +262,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetInstanceAttribute */ @@ -270,7 +270,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createTags */ @@ -278,7 +278,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param authorizeSecurityGroupEgress */ @@ -286,7 +286,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param associateAddress */ @@ -294,7 +294,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeImageAttribute */ @@ -302,7 +302,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSpotPriceHistory */ @@ -310,7 +310,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifySnapshotAttribute */ @@ -318,7 +318,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSpotInstanceRequests */ @@ -326,7 +326,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param importInstance */ @@ -334,7 +334,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeKeyPairs */ @@ -342,7 +342,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param revokeSecurityGroupIngress */ @@ -350,7 +350,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createPlacementGroup */ @@ -358,7 +358,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteNetworkAclEntry */ @@ -366,7 +366,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param activateLicense */ @@ -374,7 +374,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteRouteTable */ @@ -382,7 +382,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param unmonitorInstances */ @@ -390,7 +390,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param startInstances */ @@ -398,7 +398,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param confirmProductInstance */ @@ -406,7 +406,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeNetworkInterfaceAttribute */ @@ -415,7 +415,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param runInstances */ @@ -423,7 +423,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createReservedInstancesListing */ @@ -431,7 +431,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createCustomerGateway */ @@ -439,7 +439,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createNetworkAcl */ @@ -447,7 +447,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetImageAttribute */ @@ -455,7 +455,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyVolumeAttribute */ @@ -463,7 +463,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeReservedInstances */ @@ -471,7 +471,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param resetSnapshotAttribute */ @@ -479,7 +479,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVolume */ @@ -487,7 +487,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeAvailabilityZones */ @@ -495,7 +495,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpnConnection */ @@ -503,7 +503,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelBundleTask */ @@ -511,7 +511,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceNetworkAclAssociation */ @@ -519,7 +519,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachVpnGateway */ @@ -527,7 +527,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSnapshots */ @@ -535,7 +535,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSubnet */ @@ -543,7 +543,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeBundleTasks */ @@ -551,7 +551,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createKeyPair */ @@ -559,7 +559,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createImage */ @@ -567,7 +567,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param enableVgwRoutePropagation */ @@ -575,7 +575,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param unassignPrivateIpAddresses */ @@ -583,7 +583,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deregisterImage */ @@ -591,7 +591,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpnConnectionRoute */ @@ -599,7 +599,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyImageAttribute */ @@ -607,7 +607,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelConversionTask */ @@ -615,7 +615,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVolumes */ @@ -623,7 +623,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelReservedInstancesListing */ @@ -631,7 +631,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param getPasswordData */ @@ -639,7 +639,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param allocateAddress */ @@ -647,7 +647,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSecurityGroup */ @@ -655,7 +655,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deletePlacementGroup */ @@ -663,7 +663,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param disassociateAddress */ @@ -671,7 +671,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteDhcpOptions */ @@ -679,7 +679,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSpotDatafeedSubscription */ @@ -688,7 +688,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeNetworkAcls */ @@ -696,7 +696,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param enableVolumeIO */ @@ -704,7 +704,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachVpnGateway */ @@ -712,7 +712,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInternetGateways */ @@ -720,7 +720,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeDhcpOptions */ @@ -728,7 +728,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSpotDatafeedSubscription */ @@ -736,7 +736,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeReservedInstancesListings */ @@ -745,7 +745,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInstanceStatus */ @@ -753,7 +753,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyNetworkInterfaceAttribute */ @@ -761,7 +761,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param disableVgwRoutePropagation */ @@ -769,7 +769,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVolumeStatus */ @@ -777,7 +777,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachNetworkInterface */ @@ -785,7 +785,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeSecurityGroups */ @@ -793,7 +793,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInstances */ @@ -801,7 +801,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeNetworkInterfaces */ @@ -809,7 +809,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteKeyPair */ @@ -817,7 +817,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createSnapshot */ @@ -825,7 +825,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeVpnGateways */ @@ -833,7 +833,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteTags */ @@ -841,7 +841,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSnapshot */ @@ -849,7 +849,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteCustomerGateway */ @@ -857,7 +857,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVolume */ @@ -865,7 +865,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param cancelExportTask */ @@ -873,7 +873,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param registerImage */ @@ -881,7 +881,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachVolume */ @@ -889,7 +889,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param stopInstances */ @@ -897,7 +897,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createRoute */ @@ -905,7 +905,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param releaseAddress */ @@ -913,7 +913,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeRouteTables */ @@ -921,7 +921,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeCustomerGateways */ @@ -929,7 +929,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteNetworkAcl */ @@ -937,7 +937,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteRoute */ @@ -945,7 +945,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param rebootInstances */ @@ -953,7 +953,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param modifyInstanceAttribute */ @@ -961,7 +961,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param terminateInstances */ @@ -969,7 +969,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpnConnectionRoute */ @@ -977,7 +977,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeConversionTasks */ @@ -985,7 +985,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeAddresses */ @@ -993,7 +993,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeInstanceAttribute */ @@ -1001,7 +1001,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachInternetGateway */ @@ -1009,7 +1009,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createVpc */ @@ -1017,7 +1017,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceRouteTableAssociation */ @@ -1025,7 +1025,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param associateRouteTable */ @@ -1033,7 +1033,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param detachInternetGateway */ @@ -1041,7 +1041,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param purchaseReservedInstancesOffering */ @@ -1050,7 +1050,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param importVolume */ @@ -1058,7 +1058,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeExportTasks */ @@ -1066,7 +1066,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createInstanceExportTask */ @@ -1074,7 +1074,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param assignPrivateIpAddresses */ @@ -1082,7 +1082,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param reportInstanceStatus */ @@ -1090,7 +1090,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeReservedInstancesOfferings */ @@ -1099,7 +1099,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteVpnConnection */ @@ -1107,7 +1107,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteInternetGateway */ @@ -1115,7 +1115,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteSpotDatafeedSubscription */ @@ -1123,7 +1123,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachNetworkInterface */ @@ -1131,7 +1131,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param createNetworkInterface */ @@ -1139,7 +1139,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param revokeSecurityGroupEgress */ @@ -1147,7 +1147,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param monitorInstances */ @@ -1155,7 +1155,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param replaceRoute */ @@ -1163,7 +1163,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param attachVolume */ @@ -1171,7 +1171,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param getConsoleOutput */ @@ -1179,7 +1179,7 @@ public interface AmazonEC2SkeletonInterface { /** * Auto generated method signature - * + * * @param describeRegions */ diff --git a/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java index bf9335cbeeb..0b739ca86d3 100644 --- a/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java +++ b/awsapi/src/com/amazon/ec2/client/AmazonEC2Stub.java @@ -1123,10 +1123,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describePlacementGroups * @param describePlacementGroups0 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribePlacementGroupsResponse describePlacementGroups( @@ -1224,10 +1224,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribePlacementGroups * @param describePlacementGroups0 - + */ public void startdescribePlacementGroups( @@ -1353,10 +1353,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createSecurityGroup * @param createSecurityGroup2 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateSecurityGroupResponse createSecurityGroup( @@ -1454,10 +1454,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateSecurityGroup * @param createSecurityGroup2 - + */ public void startcreateSecurityGroup( @@ -1583,10 +1583,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#resetNetworkInterfaceAttribute * @param resetNetworkInterfaceAttribute4 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute( @@ -1684,10 +1684,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startresetNetworkInterfaceAttribute * @param resetNetworkInterfaceAttribute4 - + */ public void startresetNetworkInterfaceAttribute( @@ -1813,10 +1813,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createDhcpOptions * @param createDhcpOptions6 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateDhcpOptionsResponse createDhcpOptions( @@ -1914,10 +1914,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateDhcpOptions * @param createDhcpOptions6 - + */ public void startcreateDhcpOptions( @@ -2043,10 +2043,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createRouteTable * @param createRouteTable8 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateRouteTableResponse createRouteTable( @@ -2144,10 +2144,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateRouteTable * @param createRouteTable8 - + */ public void startcreateRouteTable( @@ -2273,10 +2273,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSubnets * @param describeSubnets10 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSubnetsResponse describeSubnets( @@ -2374,10 +2374,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSubnets * @param describeSubnets10 - + */ public void startdescribeSubnets( @@ -2503,10 +2503,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deactivateLicense * @param deactivateLicense12 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeactivateLicenseResponse deactivateLicense( @@ -2604,10 +2604,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeactivateLicense * @param deactivateLicense12 - + */ public void startdeactivateLicense( @@ -2733,10 +2733,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteVpc * @param deleteVpc14 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpcResponse deleteVpc( @@ -2833,10 +2833,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteVpc * @param deleteVpc14 - + */ public void startdeleteVpc( @@ -2962,10 +2962,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#cancelSpotInstanceRequests * @param cancelSpotInstanceRequests16 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests( @@ -3063,10 +3063,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcancelSpotInstanceRequests * @param cancelSpotInstanceRequests16 - + */ public void startcancelSpotInstanceRequests( @@ -3192,10 +3192,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createSubnet * @param createSubnet18 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateSubnetResponse createSubnet( @@ -3293,10 +3293,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateSubnet * @param createSubnet18 - + */ public void startcreateSubnet( @@ -3422,10 +3422,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteVpnGateway * @param deleteVpnGateway20 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnGatewayResponse deleteVpnGateway( @@ -3523,10 +3523,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteVpnGateway * @param deleteVpnGateway20 - + */ public void startdeleteVpnGateway( @@ -3652,10 +3652,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createNetworkAclEntry * @param createNetworkAclEntry22 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclEntryResponse createNetworkAclEntry( @@ -3753,10 +3753,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateNetworkAclEntry * @param createNetworkAclEntry22 - + */ public void startcreateNetworkAclEntry( @@ -3882,10 +3882,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#requestSpotInstances * @param requestSpotInstances24 - + */ public com.amazon.ec2.client.AmazonEC2Stub.RequestSpotInstancesResponse requestSpotInstances( @@ -3983,10 +3983,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startrequestSpotInstances * @param requestSpotInstances24 - + */ public void startrequestSpotInstances( @@ -4112,10 +4112,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeVolumeAttribute * @param describeVolumeAttribute26 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeAttributeResponse describeVolumeAttribute( @@ -4213,10 +4213,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeVolumeAttribute * @param describeVolumeAttribute26 - + */ public void startdescribeVolumeAttribute( @@ -4342,10 +4342,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#associateDhcpOptions * @param associateDhcpOptions28 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AssociateDhcpOptionsResponse associateDhcpOptions( @@ -4443,10 +4443,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startassociateDhcpOptions * @param associateDhcpOptions28 - + */ public void startassociateDhcpOptions( @@ -4572,10 +4572,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeTags * @param describeTags30 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeTagsResponse describeTags( @@ -4673,10 +4673,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeTags * @param describeTags30 - + */ public void startdescribeTags( @@ -4802,10 +4802,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#importKeyPair * @param importKeyPair32 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ImportKeyPairResponse importKeyPair( @@ -4903,10 +4903,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startimportKeyPair * @param importKeyPair32 - + */ public void startimportKeyPair( @@ -5032,10 +5032,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteNetworkInterface * @param deleteNetworkInterface34 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkInterfaceResponse deleteNetworkInterface( @@ -5133,10 +5133,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteNetworkInterface * @param deleteNetworkInterface34 - + */ public void startdeleteNetworkInterface( @@ -5262,10 +5262,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeVpcs * @param describeVpcs36 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpcsResponse describeVpcs( @@ -5363,10 +5363,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeVpcs * @param describeVpcs36 - + */ public void startdescribeVpcs( @@ -5492,10 +5492,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeLicenses * @param describeLicenses38 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeLicensesResponse describeLicenses( @@ -5593,10 +5593,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeLicenses * @param describeLicenses38 - + */ public void startdescribeLicenses( @@ -5722,10 +5722,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#bundleInstance * @param bundleInstance40 - + */ public com.amazon.ec2.client.AmazonEC2Stub.BundleInstanceResponse bundleInstance( @@ -5823,10 +5823,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startbundleInstance * @param bundleInstance40 - + */ public void startbundleInstance( @@ -5952,10 +5952,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeVpnConnections * @param describeVpnConnections42 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnConnectionsResponse describeVpnConnections( @@ -6053,10 +6053,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeVpnConnections * @param describeVpnConnections42 - + */ public void startdescribeVpnConnections( @@ -6182,10 +6182,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeImages * @param describeImages44 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeImagesResponse describeImages( @@ -6283,10 +6283,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeImages * @param describeImages44 - + */ public void startdescribeImages( @@ -6412,10 +6412,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createInternetGateway * @param createInternetGateway46 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateInternetGatewayResponse createInternetGateway( @@ -6513,10 +6513,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateInternetGateway * @param createInternetGateway46 - + */ public void startcreateInternetGateway( @@ -6642,10 +6642,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#disassociateRouteTable * @param disassociateRouteTable48 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DisassociateRouteTableResponse disassociateRouteTable( @@ -6743,10 +6743,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdisassociateRouteTable * @param disassociateRouteTable48 - + */ public void startdisassociateRouteTable( @@ -6872,10 +6872,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#replaceNetworkAclEntry * @param replaceNetworkAclEntry50 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclEntryResponse replaceNetworkAclEntry( @@ -6973,10 +6973,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startreplaceNetworkAclEntry * @param replaceNetworkAclEntry50 - + */ public void startreplaceNetworkAclEntry( @@ -7102,10 +7102,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#authorizeSecurityGroupIngress * @param authorizeSecurityGroupIngress52 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngress( @@ -7203,10 +7203,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startauthorizeSecurityGroupIngress * @param authorizeSecurityGroupIngress52 - + */ public void startauthorizeSecurityGroupIngress( @@ -7332,10 +7332,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSnapshotAttribute * @param describeSnapshotAttribute54 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotAttributeResponse describeSnapshotAttribute( @@ -7433,10 +7433,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSnapshotAttribute * @param describeSnapshotAttribute54 - + */ public void startdescribeSnapshotAttribute( @@ -7562,10 +7562,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createVpnGateway * @param createVpnGateway56 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateVpnGatewayResponse createVpnGateway( @@ -7663,10 +7663,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateVpnGateway * @param createVpnGateway56 - + */ public void startcreateVpnGateway( @@ -7792,10 +7792,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#resetInstanceAttribute * @param resetInstanceAttribute58 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ResetInstanceAttributeResponse resetInstanceAttribute( @@ -7893,10 +7893,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startresetInstanceAttribute * @param resetInstanceAttribute58 - + */ public void startresetInstanceAttribute( @@ -8022,10 +8022,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createTags * @param createTags60 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateTagsResponse createTags( @@ -8123,10 +8123,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateTags * @param createTags60 - + */ public void startcreateTags( @@ -8252,10 +8252,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#authorizeSecurityGroupEgress * @param authorizeSecurityGroupEgress62 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgress( @@ -8353,10 +8353,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startauthorizeSecurityGroupEgress * @param authorizeSecurityGroupEgress62 - + */ public void startauthorizeSecurityGroupEgress( @@ -8482,10 +8482,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#associateAddress * @param associateAddress64 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AssociateAddressResponse associateAddress( @@ -8583,10 +8583,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startassociateAddress * @param associateAddress64 - + */ public void startassociateAddress( @@ -8712,10 +8712,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeImageAttribute * @param describeImageAttribute66 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeImageAttributeResponse describeImageAttribute( @@ -8813,10 +8813,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeImageAttribute * @param describeImageAttribute66 - + */ public void startdescribeImageAttribute( @@ -8942,10 +8942,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSpotPriceHistory * @param describeSpotPriceHistory68 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotPriceHistoryResponse describeSpotPriceHistory( @@ -9043,10 +9043,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSpotPriceHistory * @param describeSpotPriceHistory68 - + */ public void startdescribeSpotPriceHistory( @@ -9172,10 +9172,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#modifySnapshotAttribute * @param modifySnapshotAttribute70 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ModifySnapshotAttributeResponse modifySnapshotAttribute( @@ -9273,10 +9273,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startmodifySnapshotAttribute * @param modifySnapshotAttribute70 - + */ public void startmodifySnapshotAttribute( @@ -9402,10 +9402,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSpotInstanceRequests * @param describeSpotInstanceRequests72 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequests( @@ -9503,10 +9503,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSpotInstanceRequests * @param describeSpotInstanceRequests72 - + */ public void startdescribeSpotInstanceRequests( @@ -9632,10 +9632,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#importInstance * @param importInstance74 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ImportInstanceResponse importInstance( @@ -9733,10 +9733,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startimportInstance * @param importInstance74 - + */ public void startimportInstance( @@ -9862,10 +9862,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeKeyPairs * @param describeKeyPairs76 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeKeyPairsResponse describeKeyPairs( @@ -9963,10 +9963,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeKeyPairs * @param describeKeyPairs76 - + */ public void startdescribeKeyPairs( @@ -10092,10 +10092,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#revokeSecurityGroupIngress * @param revokeSecurityGroupIngress78 - + */ public com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngress( @@ -10193,10 +10193,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startrevokeSecurityGroupIngress * @param revokeSecurityGroupIngress78 - + */ public void startrevokeSecurityGroupIngress( @@ -10322,10 +10322,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createPlacementGroup * @param createPlacementGroup80 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreatePlacementGroupResponse createPlacementGroup( @@ -10423,10 +10423,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreatePlacementGroup * @param createPlacementGroup80 - + */ public void startcreatePlacementGroup( @@ -10552,10 +10552,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteNetworkAclEntry * @param deleteNetworkAclEntry82 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclEntryResponse deleteNetworkAclEntry( @@ -10653,10 +10653,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteNetworkAclEntry * @param deleteNetworkAclEntry82 - + */ public void startdeleteNetworkAclEntry( @@ -10782,10 +10782,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#activateLicense * @param activateLicense84 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ActivateLicenseResponse activateLicense( @@ -10883,10 +10883,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startactivateLicense * @param activateLicense84 - + */ public void startactivateLicense( @@ -11012,10 +11012,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteRouteTable * @param deleteRouteTable86 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteTableResponse deleteRouteTable( @@ -11113,10 +11113,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteRouteTable * @param deleteRouteTable86 - + */ public void startdeleteRouteTable( @@ -11242,10 +11242,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#unmonitorInstances * @param unmonitorInstances88 - + */ public com.amazon.ec2.client.AmazonEC2Stub.UnmonitorInstancesResponse unmonitorInstances( @@ -11343,10 +11343,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startunmonitorInstances * @param unmonitorInstances88 - + */ public void startunmonitorInstances( @@ -11472,10 +11472,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#startInstances * @param startInstances90 - + */ public com.amazon.ec2.client.AmazonEC2Stub.StartInstancesResponse startInstances( @@ -11573,10 +11573,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startstartInstances * @param startInstances90 - + */ public void startstartInstances( @@ -11702,10 +11702,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#confirmProductInstance * @param confirmProductInstance92 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ConfirmProductInstanceResponse confirmProductInstance( @@ -11803,10 +11803,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startconfirmProductInstance * @param confirmProductInstance92 - + */ public void startconfirmProductInstance( @@ -11932,10 +11932,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeNetworkInterfaceAttribute * @param describeNetworkInterfaceAttribute94 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute( @@ -12033,10 +12033,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeNetworkInterfaceAttribute * @param describeNetworkInterfaceAttribute94 - + */ public void startdescribeNetworkInterfaceAttribute( @@ -12162,10 +12162,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#runInstances * @param runInstances96 - + */ public com.amazon.ec2.client.AmazonEC2Stub.RunInstancesResponse runInstances( @@ -12263,10 +12263,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startrunInstances * @param runInstances96 - + */ public void startrunInstances( @@ -12392,10 +12392,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createReservedInstancesListing * @param createReservedInstancesListing98 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateReservedInstancesListingResponse createReservedInstancesListing( @@ -12493,10 +12493,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateReservedInstancesListing * @param createReservedInstancesListing98 - + */ public void startcreateReservedInstancesListing( @@ -12622,10 +12622,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createCustomerGateway * @param createCustomerGateway100 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateCustomerGatewayResponse createCustomerGateway( @@ -12723,10 +12723,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateCustomerGateway * @param createCustomerGateway100 - + */ public void startcreateCustomerGateway( @@ -12852,10 +12852,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createNetworkAcl * @param createNetworkAcl102 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkAclResponse createNetworkAcl( @@ -12953,10 +12953,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateNetworkAcl * @param createNetworkAcl102 - + */ public void startcreateNetworkAcl( @@ -13082,10 +13082,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#resetImageAttribute * @param resetImageAttribute104 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ResetImageAttributeResponse resetImageAttribute( @@ -13183,10 +13183,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startresetImageAttribute * @param resetImageAttribute104 - + */ public void startresetImageAttribute( @@ -13312,10 +13312,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#modifyVolumeAttribute * @param modifyVolumeAttribute106 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ModifyVolumeAttributeResponse modifyVolumeAttribute( @@ -13413,10 +13413,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startmodifyVolumeAttribute * @param modifyVolumeAttribute106 - + */ public void startmodifyVolumeAttribute( @@ -13542,10 +13542,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeReservedInstances * @param describeReservedInstances108 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesResponse describeReservedInstances( @@ -13643,10 +13643,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeReservedInstances * @param describeReservedInstances108 - + */ public void startdescribeReservedInstances( @@ -13772,10 +13772,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#resetSnapshotAttribute * @param resetSnapshotAttribute110 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ResetSnapshotAttributeResponse resetSnapshotAttribute( @@ -13873,10 +13873,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startresetSnapshotAttribute * @param resetSnapshotAttribute110 - + */ public void startresetSnapshotAttribute( @@ -14002,10 +14002,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteVolume * @param deleteVolume112 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteVolumeResponse deleteVolume( @@ -14103,10 +14103,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteVolume * @param deleteVolume112 - + */ public void startdeleteVolume( @@ -14232,10 +14232,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeAvailabilityZones * @param describeAvailabilityZones114 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeAvailabilityZonesResponse describeAvailabilityZones( @@ -14333,10 +14333,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeAvailabilityZones * @param describeAvailabilityZones114 - + */ public void startdescribeAvailabilityZones( @@ -14462,10 +14462,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createVpnConnection * @param createVpnConnection116 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionResponse createVpnConnection( @@ -14563,10 +14563,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateVpnConnection * @param createVpnConnection116 - + */ public void startcreateVpnConnection( @@ -14692,10 +14692,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#cancelBundleTask * @param cancelBundleTask118 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CancelBundleTaskResponse cancelBundleTask( @@ -14793,10 +14793,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcancelBundleTask * @param cancelBundleTask118 - + */ public void startcancelBundleTask( @@ -14922,10 +14922,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#replaceNetworkAclAssociation * @param replaceNetworkAclAssociation120 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation( @@ -15023,10 +15023,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startreplaceNetworkAclAssociation * @param replaceNetworkAclAssociation120 - + */ public void startreplaceNetworkAclAssociation( @@ -15152,10 +15152,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#detachVpnGateway * @param detachVpnGateway122 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DetachVpnGatewayResponse detachVpnGateway( @@ -15253,10 +15253,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdetachVpnGateway * @param detachVpnGateway122 - + */ public void startdetachVpnGateway( @@ -15382,10 +15382,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSnapshots * @param describeSnapshots124 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSnapshotsResponse describeSnapshots( @@ -15483,10 +15483,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSnapshots * @param describeSnapshots124 - + */ public void startdescribeSnapshots( @@ -15612,10 +15612,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteSubnet * @param deleteSubnet126 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteSubnetResponse deleteSubnet( @@ -15713,10 +15713,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteSubnet * @param deleteSubnet126 - + */ public void startdeleteSubnet( @@ -15842,10 +15842,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeBundleTasks * @param describeBundleTasks128 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeBundleTasksResponse describeBundleTasks( @@ -15943,10 +15943,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeBundleTasks * @param describeBundleTasks128 - + */ public void startdescribeBundleTasks( @@ -16072,10 +16072,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createKeyPair * @param createKeyPair130 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateKeyPairResponse createKeyPair( @@ -16173,10 +16173,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateKeyPair * @param createKeyPair130 - + */ public void startcreateKeyPair( @@ -16302,10 +16302,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createImage * @param createImage132 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateImageResponse createImage( @@ -16403,10 +16403,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateImage * @param createImage132 - + */ public void startcreateImage( @@ -16532,10 +16532,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#enableVgwRoutePropagation * @param enableVgwRoutePropagation134 - + */ public com.amazon.ec2.client.AmazonEC2Stub.EnableVgwRoutePropagationResponse enableVgwRoutePropagation( @@ -16633,10 +16633,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startenableVgwRoutePropagation * @param enableVgwRoutePropagation134 - + */ public void startenableVgwRoutePropagation( @@ -16762,10 +16762,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#unassignPrivateIpAddresses * @param unassignPrivateIpAddresses136 - + */ public com.amazon.ec2.client.AmazonEC2Stub.UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses( @@ -16863,10 +16863,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startunassignPrivateIpAddresses * @param unassignPrivateIpAddresses136 - + */ public void startunassignPrivateIpAddresses( @@ -16992,10 +16992,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deregisterImage * @param deregisterImage138 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeregisterImageResponse deregisterImage( @@ -17093,10 +17093,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startderegisterImage * @param deregisterImage138 - + */ public void startderegisterImage( @@ -17222,10 +17222,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteVpnConnectionRoute * @param deleteVpnConnectionRoute140 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute( @@ -17323,10 +17323,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteVpnConnectionRoute * @param deleteVpnConnectionRoute140 - + */ public void startdeleteVpnConnectionRoute( @@ -17452,10 +17452,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#modifyImageAttribute * @param modifyImageAttribute142 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ModifyImageAttributeResponse modifyImageAttribute( @@ -17553,10 +17553,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startmodifyImageAttribute * @param modifyImageAttribute142 - + */ public void startmodifyImageAttribute( @@ -17682,10 +17682,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#cancelConversionTask * @param cancelConversionTask144 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CancelConversionTaskResponse cancelConversionTask( @@ -17783,10 +17783,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcancelConversionTask * @param cancelConversionTask144 - + */ public void startcancelConversionTask( @@ -17912,10 +17912,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeVolumes * @param describeVolumes146 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumesResponse describeVolumes( @@ -18013,10 +18013,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeVolumes * @param describeVolumes146 - + */ public void startdescribeVolumes( @@ -18142,10 +18142,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#cancelReservedInstancesListing * @param cancelReservedInstancesListing148 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CancelReservedInstancesListingResponse cancelReservedInstancesListing( @@ -18243,10 +18243,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcancelReservedInstancesListing * @param cancelReservedInstancesListing148 - + */ public void startcancelReservedInstancesListing( @@ -18372,10 +18372,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#getPasswordData * @param getPasswordData150 - + */ public com.amazon.ec2.client.AmazonEC2Stub.GetPasswordDataResponse getPasswordData( @@ -18473,10 +18473,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startgetPasswordData * @param getPasswordData150 - + */ public void startgetPasswordData( @@ -18602,10 +18602,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#allocateAddress * @param allocateAddress152 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AllocateAddressResponse allocateAddress( @@ -18703,10 +18703,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startallocateAddress * @param allocateAddress152 - + */ public void startallocateAddress( @@ -18832,10 +18832,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteSecurityGroup * @param deleteSecurityGroup154 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteSecurityGroupResponse deleteSecurityGroup( @@ -18933,10 +18933,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteSecurityGroup * @param deleteSecurityGroup154 - + */ public void startdeleteSecurityGroup( @@ -19062,10 +19062,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deletePlacementGroup * @param deletePlacementGroup156 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeletePlacementGroupResponse deletePlacementGroup( @@ -19163,10 +19163,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeletePlacementGroup * @param deletePlacementGroup156 - + */ public void startdeletePlacementGroup( @@ -19292,10 +19292,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#disassociateAddress * @param disassociateAddress158 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DisassociateAddressResponse disassociateAddress( @@ -19393,10 +19393,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdisassociateAddress * @param disassociateAddress158 - + */ public void startdisassociateAddress( @@ -19522,10 +19522,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteDhcpOptions * @param deleteDhcpOptions160 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteDhcpOptionsResponse deleteDhcpOptions( @@ -19623,10 +19623,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteDhcpOptions * @param deleteDhcpOptions160 - + */ public void startdeleteDhcpOptions( @@ -19752,10 +19752,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSpotDatafeedSubscription * @param describeSpotDatafeedSubscription162 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription( @@ -19853,10 +19853,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSpotDatafeedSubscription * @param describeSpotDatafeedSubscription162 - + */ public void startdescribeSpotDatafeedSubscription( @@ -19982,10 +19982,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeNetworkAcls * @param describeNetworkAcls164 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkAclsResponse describeNetworkAcls( @@ -20083,10 +20083,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeNetworkAcls * @param describeNetworkAcls164 - + */ public void startdescribeNetworkAcls( @@ -20212,10 +20212,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#enableVolumeIO * @param enableVolumeIO166 - + */ public com.amazon.ec2.client.AmazonEC2Stub.EnableVolumeIOResponse enableVolumeIO( @@ -20313,10 +20313,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startenableVolumeIO * @param enableVolumeIO166 - + */ public void startenableVolumeIO( @@ -20442,10 +20442,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#attachVpnGateway * @param attachVpnGateway168 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AttachVpnGatewayResponse attachVpnGateway( @@ -20543,10 +20543,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startattachVpnGateway * @param attachVpnGateway168 - + */ public void startattachVpnGateway( @@ -20672,10 +20672,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeInternetGateways * @param describeInternetGateways170 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeInternetGatewaysResponse describeInternetGateways( @@ -20773,10 +20773,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeInternetGateways * @param describeInternetGateways170 - + */ public void startdescribeInternetGateways( @@ -20902,10 +20902,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeDhcpOptions * @param describeDhcpOptions172 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeDhcpOptionsResponse describeDhcpOptions( @@ -21003,10 +21003,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeDhcpOptions * @param describeDhcpOptions172 - + */ public void startdescribeDhcpOptions( @@ -21132,10 +21132,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createSpotDatafeedSubscription * @param createSpotDatafeedSubscription174 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription( @@ -21233,10 +21233,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateSpotDatafeedSubscription * @param createSpotDatafeedSubscription174 - + */ public void startcreateSpotDatafeedSubscription( @@ -21362,10 +21362,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeReservedInstancesListings * @param describeReservedInstancesListings176 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesListingsResponse describeReservedInstancesListings( @@ -21463,10 +21463,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeReservedInstancesListings * @param describeReservedInstancesListings176 - + */ public void startdescribeReservedInstancesListings( @@ -21592,10 +21592,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeInstanceStatus * @param describeInstanceStatus178 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceStatusResponse describeInstanceStatus( @@ -21693,10 +21693,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeInstanceStatus * @param describeInstanceStatus178 - + */ public void startdescribeInstanceStatus( @@ -21822,10 +21822,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#modifyNetworkInterfaceAttribute * @param modifyNetworkInterfaceAttribute180 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute( @@ -21923,10 +21923,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startmodifyNetworkInterfaceAttribute * @param modifyNetworkInterfaceAttribute180 - + */ public void startmodifyNetworkInterfaceAttribute( @@ -22052,10 +22052,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#disableVgwRoutePropagation * @param disableVgwRoutePropagation182 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DisableVgwRoutePropagationResponse disableVgwRoutePropagation( @@ -22153,10 +22153,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdisableVgwRoutePropagation * @param disableVgwRoutePropagation182 - + */ public void startdisableVgwRoutePropagation( @@ -22282,10 +22282,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeVolumeStatus * @param describeVolumeStatus184 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeVolumeStatusResponse describeVolumeStatus( @@ -22383,10 +22383,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeVolumeStatus * @param describeVolumeStatus184 - + */ public void startdescribeVolumeStatus( @@ -22512,10 +22512,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#detachNetworkInterface * @param detachNetworkInterface186 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DetachNetworkInterfaceResponse detachNetworkInterface( @@ -22613,10 +22613,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdetachNetworkInterface * @param detachNetworkInterface186 - + */ public void startdetachNetworkInterface( @@ -22742,10 +22742,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeSecurityGroups * @param describeSecurityGroups188 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeSecurityGroupsResponse describeSecurityGroups( @@ -22843,10 +22843,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeSecurityGroups * @param describeSecurityGroups188 - + */ public void startdescribeSecurityGroups( @@ -22972,10 +22972,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeInstances * @param describeInstances190 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeInstancesResponse describeInstances( @@ -23073,10 +23073,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeInstances * @param describeInstances190 - + */ public void startdescribeInstances( @@ -23202,10 +23202,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeNetworkInterfaces * @param describeNetworkInterfaces192 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeNetworkInterfacesResponse describeNetworkInterfaces( @@ -23303,10 +23303,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeNetworkInterfaces * @param describeNetworkInterfaces192 - + */ public void startdescribeNetworkInterfaces( @@ -23432,10 +23432,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteKeyPair * @param deleteKeyPair194 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteKeyPairResponse deleteKeyPair( @@ -23533,10 +23533,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteKeyPair * @param deleteKeyPair194 - + */ public void startdeleteKeyPair( @@ -23662,10 +23662,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createSnapshot * @param createSnapshot196 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateSnapshotResponse createSnapshot( @@ -23763,10 +23763,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateSnapshot * @param createSnapshot196 - + */ public void startcreateSnapshot( @@ -23892,10 +23892,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeVpnGateways * @param describeVpnGateways198 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeVpnGatewaysResponse describeVpnGateways( @@ -23993,10 +23993,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeVpnGateways * @param describeVpnGateways198 - + */ public void startdescribeVpnGateways( @@ -24122,10 +24122,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteTags * @param deleteTags200 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteTagsResponse deleteTags( @@ -24223,10 +24223,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteTags * @param deleteTags200 - + */ public void startdeleteTags( @@ -24352,10 +24352,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteSnapshot * @param deleteSnapshot202 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteSnapshotResponse deleteSnapshot( @@ -24453,10 +24453,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteSnapshot * @param deleteSnapshot202 - + */ public void startdeleteSnapshot( @@ -24582,10 +24582,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteCustomerGateway * @param deleteCustomerGateway204 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteCustomerGatewayResponse deleteCustomerGateway( @@ -24683,10 +24683,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteCustomerGateway * @param deleteCustomerGateway204 - + */ public void startdeleteCustomerGateway( @@ -24812,10 +24812,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createVolume * @param createVolume206 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateVolumeResponse createVolume( @@ -24913,10 +24913,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateVolume * @param createVolume206 - + */ public void startcreateVolume( @@ -25042,10 +25042,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#cancelExportTask * @param cancelExportTask208 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CancelExportTaskResponse cancelExportTask( @@ -25143,10 +25143,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcancelExportTask * @param cancelExportTask208 - + */ public void startcancelExportTask( @@ -25272,10 +25272,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#registerImage * @param registerImage210 - + */ public com.amazon.ec2.client.AmazonEC2Stub.RegisterImageResponse registerImage( @@ -25373,10 +25373,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startregisterImage * @param registerImage210 - + */ public void startregisterImage( @@ -25502,10 +25502,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#detachVolume * @param detachVolume212 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DetachVolumeResponse detachVolume( @@ -25603,10 +25603,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdetachVolume * @param detachVolume212 - + */ public void startdetachVolume( @@ -25732,10 +25732,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#stopInstances * @param stopInstances214 - + */ public com.amazon.ec2.client.AmazonEC2Stub.StopInstancesResponse stopInstances( @@ -25833,10 +25833,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startstopInstances * @param stopInstances214 - + */ public void startstopInstances( @@ -25962,10 +25962,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createRoute * @param createRoute216 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateRouteResponse createRoute( @@ -26063,10 +26063,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateRoute * @param createRoute216 - + */ public void startcreateRoute( @@ -26192,10 +26192,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#releaseAddress * @param releaseAddress218 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ReleaseAddressResponse releaseAddress( @@ -26293,10 +26293,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startreleaseAddress * @param releaseAddress218 - + */ public void startreleaseAddress( @@ -26422,10 +26422,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeRouteTables * @param describeRouteTables220 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeRouteTablesResponse describeRouteTables( @@ -26523,10 +26523,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeRouteTables * @param describeRouteTables220 - + */ public void startdescribeRouteTables( @@ -26652,10 +26652,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeCustomerGateways * @param describeCustomerGateways222 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeCustomerGatewaysResponse describeCustomerGateways( @@ -26753,10 +26753,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeCustomerGateways * @param describeCustomerGateways222 - + */ public void startdescribeCustomerGateways( @@ -26882,10 +26882,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteNetworkAcl * @param deleteNetworkAcl224 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteNetworkAclResponse deleteNetworkAcl( @@ -26983,10 +26983,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteNetworkAcl * @param deleteNetworkAcl224 - + */ public void startdeleteNetworkAcl( @@ -27112,10 +27112,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteRoute * @param deleteRoute226 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteRouteResponse deleteRoute( @@ -27213,10 +27213,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteRoute * @param deleteRoute226 - + */ public void startdeleteRoute( @@ -27342,10 +27342,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#rebootInstances * @param rebootInstances228 - + */ public com.amazon.ec2.client.AmazonEC2Stub.RebootInstancesResponse rebootInstances( @@ -27443,10 +27443,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startrebootInstances * @param rebootInstances228 - + */ public void startrebootInstances( @@ -27572,10 +27572,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#modifyInstanceAttribute * @param modifyInstanceAttribute230 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ModifyInstanceAttributeResponse modifyInstanceAttribute( @@ -27673,10 +27673,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startmodifyInstanceAttribute * @param modifyInstanceAttribute230 - + */ public void startmodifyInstanceAttribute( @@ -27802,10 +27802,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#terminateInstances * @param terminateInstances232 - + */ public com.amazon.ec2.client.AmazonEC2Stub.TerminateInstancesResponse terminateInstances( @@ -27903,10 +27903,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startterminateInstances * @param terminateInstances232 - + */ public void startterminateInstances( @@ -28032,10 +28032,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createVpnConnectionRoute * @param createVpnConnectionRoute234 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateVpnConnectionRouteResponse createVpnConnectionRoute( @@ -28133,10 +28133,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateVpnConnectionRoute * @param createVpnConnectionRoute234 - + */ public void startcreateVpnConnectionRoute( @@ -28262,10 +28262,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeConversionTasks * @param describeConversionTasks236 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeConversionTasksResponse describeConversionTasks( @@ -28363,10 +28363,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeConversionTasks * @param describeConversionTasks236 - + */ public void startdescribeConversionTasks( @@ -28492,10 +28492,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeAddresses * @param describeAddresses238 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeAddressesResponse describeAddresses( @@ -28593,10 +28593,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeAddresses * @param describeAddresses238 - + */ public void startdescribeAddresses( @@ -28722,10 +28722,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeInstanceAttribute * @param describeInstanceAttribute240 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeInstanceAttributeResponse describeInstanceAttribute( @@ -28823,10 +28823,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeInstanceAttribute * @param describeInstanceAttribute240 - + */ public void startdescribeInstanceAttribute( @@ -28952,10 +28952,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#attachInternetGateway * @param attachInternetGateway242 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AttachInternetGatewayResponse attachInternetGateway( @@ -29053,10 +29053,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startattachInternetGateway * @param attachInternetGateway242 - + */ public void startattachInternetGateway( @@ -29182,10 +29182,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createVpc * @param createVpc244 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateVpcResponse createVpc( @@ -29282,10 +29282,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateVpc * @param createVpc244 - + */ public void startcreateVpc( @@ -29411,10 +29411,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#replaceRouteTableAssociation * @param replaceRouteTableAssociation246 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteTableAssociationResponse replaceRouteTableAssociation( @@ -29512,10 +29512,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startreplaceRouteTableAssociation * @param replaceRouteTableAssociation246 - + */ public void startreplaceRouteTableAssociation( @@ -29641,10 +29641,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#associateRouteTable * @param associateRouteTable248 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AssociateRouteTableResponse associateRouteTable( @@ -29742,10 +29742,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startassociateRouteTable * @param associateRouteTable248 - + */ public void startassociateRouteTable( @@ -29871,10 +29871,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#detachInternetGateway * @param detachInternetGateway250 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DetachInternetGatewayResponse detachInternetGateway( @@ -29972,10 +29972,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdetachInternetGateway * @param detachInternetGateway250 - + */ public void startdetachInternetGateway( @@ -30101,10 +30101,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#purchaseReservedInstancesOffering * @param purchaseReservedInstancesOffering252 - + */ public com.amazon.ec2.client.AmazonEC2Stub.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering( @@ -30202,10 +30202,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startpurchaseReservedInstancesOffering * @param purchaseReservedInstancesOffering252 - + */ public void startpurchaseReservedInstancesOffering( @@ -30331,10 +30331,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#importVolume * @param importVolume254 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ImportVolumeResponse importVolume( @@ -30432,10 +30432,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startimportVolume * @param importVolume254 - + */ public void startimportVolume( @@ -30561,10 +30561,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeExportTasks * @param describeExportTasks256 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeExportTasksResponse describeExportTasks( @@ -30662,10 +30662,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeExportTasks * @param describeExportTasks256 - + */ public void startdescribeExportTasks( @@ -30791,10 +30791,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createInstanceExportTask * @param createInstanceExportTask258 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateInstanceExportTaskResponse createInstanceExportTask( @@ -30892,10 +30892,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateInstanceExportTask * @param createInstanceExportTask258 - + */ public void startcreateInstanceExportTask( @@ -31021,10 +31021,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#assignPrivateIpAddresses * @param assignPrivateIpAddresses260 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AssignPrivateIpAddressesResponse assignPrivateIpAddresses( @@ -31122,10 +31122,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startassignPrivateIpAddresses * @param assignPrivateIpAddresses260 - + */ public void startassignPrivateIpAddresses( @@ -31251,10 +31251,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#reportInstanceStatus * @param reportInstanceStatus262 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ReportInstanceStatusResponse reportInstanceStatus( @@ -31352,10 +31352,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startreportInstanceStatus * @param reportInstanceStatus262 - + */ public void startreportInstanceStatus( @@ -31481,10 +31481,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeReservedInstancesOfferings * @param describeReservedInstancesOfferings264 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings( @@ -31582,10 +31582,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeReservedInstancesOfferings * @param describeReservedInstancesOfferings264 - + */ public void startdescribeReservedInstancesOfferings( @@ -31711,10 +31711,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteVpnConnection * @param deleteVpnConnection266 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteVpnConnectionResponse deleteVpnConnection( @@ -31812,10 +31812,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteVpnConnection * @param deleteVpnConnection266 - + */ public void startdeleteVpnConnection( @@ -31941,10 +31941,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteInternetGateway * @param deleteInternetGateway268 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteInternetGatewayResponse deleteInternetGateway( @@ -32042,10 +32042,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteInternetGateway * @param deleteInternetGateway268 - + */ public void startdeleteInternetGateway( @@ -32171,10 +32171,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#deleteSpotDatafeedSubscription * @param deleteSpotDatafeedSubscription270 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription( @@ -32272,10 +32272,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdeleteSpotDatafeedSubscription * @param deleteSpotDatafeedSubscription270 - + */ public void startdeleteSpotDatafeedSubscription( @@ -32401,10 +32401,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#attachNetworkInterface * @param attachNetworkInterface272 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AttachNetworkInterfaceResponse attachNetworkInterface( @@ -32502,10 +32502,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startattachNetworkInterface * @param attachNetworkInterface272 - + */ public void startattachNetworkInterface( @@ -32631,10 +32631,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#createNetworkInterface * @param createNetworkInterface274 - + */ public com.amazon.ec2.client.AmazonEC2Stub.CreateNetworkInterfaceResponse createNetworkInterface( @@ -32732,10 +32732,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startcreateNetworkInterface * @param createNetworkInterface274 - + */ public void startcreateNetworkInterface( @@ -32861,10 +32861,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#revokeSecurityGroupEgress * @param revokeSecurityGroupEgress276 - + */ public com.amazon.ec2.client.AmazonEC2Stub.RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress( @@ -32962,10 +32962,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startrevokeSecurityGroupEgress * @param revokeSecurityGroupEgress276 - + */ public void startrevokeSecurityGroupEgress( @@ -33091,10 +33091,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#monitorInstances * @param monitorInstances278 - + */ public com.amazon.ec2.client.AmazonEC2Stub.MonitorInstancesResponse monitorInstances( @@ -33192,10 +33192,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startmonitorInstances * @param monitorInstances278 - + */ public void startmonitorInstances( @@ -33321,10 +33321,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#replaceRoute * @param replaceRoute280 - + */ public com.amazon.ec2.client.AmazonEC2Stub.ReplaceRouteResponse replaceRoute( @@ -33422,10 +33422,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startreplaceRoute * @param replaceRoute280 - + */ public void startreplaceRoute( @@ -33551,10 +33551,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#attachVolume * @param attachVolume282 - + */ public com.amazon.ec2.client.AmazonEC2Stub.AttachVolumeResponse attachVolume( @@ -33652,10 +33652,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startattachVolume * @param attachVolume282 - + */ public void startattachVolume( @@ -33781,10 +33781,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#getConsoleOutput * @param getConsoleOutput284 - + */ public com.amazon.ec2.client.AmazonEC2Stub.GetConsoleOutputResponse getConsoleOutput( @@ -33882,10 +33882,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startgetConsoleOutput * @param getConsoleOutput284 - + */ public void startgetConsoleOutput( @@ -34011,10 +34011,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.ec2.client.AmazonEC2#describeRegions * @param describeRegions286 - + */ public com.amazon.ec2.client.AmazonEC2Stub.DescribeRegionsResponse describeRegions( @@ -34112,10 +34112,10 @@ public class AmazonEC2Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.ec2.client.AmazonEC2#startdescribeRegions * @param describeRegions286 - + */ public void startdescribeRegions( diff --git a/awsapi/src/com/amazon/s3/AmazonS3Skeleton.java b/awsapi/src/com/amazon/s3/AmazonS3Skeleton.java index 70e1340bc21..0da2ea7384d 100644 --- a/awsapi/src/com/amazon/s3/AmazonS3Skeleton.java +++ b/awsapi/src/com/amazon/s3/AmazonS3Skeleton.java @@ -30,7 +30,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getBucketLoggingStatus0 */ @@ -41,7 +41,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param copyObject2 */ @@ -52,7 +52,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getBucketAccessControlPolicy4 */ @@ -63,7 +63,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param listBucket6 */ @@ -74,7 +74,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param putObject8 */ @@ -85,7 +85,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param createBucket10 */ @@ -96,7 +96,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param listAllMyBuckets12 */ @@ -107,7 +107,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getObject14 */ @@ -118,7 +118,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteBucket16 */ @@ -129,7 +129,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param setBucketLoggingStatus18 */ @@ -140,7 +140,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getObjectAccessControlPolicy20 */ @@ -151,7 +151,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteObject22 */ @@ -162,7 +162,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param setBucketAccessControlPolicy24 */ @@ -173,7 +173,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param setObjectAccessControlPolicy26 */ @@ -184,7 +184,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param putObjectInline28 */ @@ -195,7 +195,7 @@ public class AmazonS3Skeleton implements AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getObjectExtended30 */ diff --git a/awsapi/src/com/amazon/s3/AmazonS3SkeletonInterface.java b/awsapi/src/com/amazon/s3/AmazonS3SkeletonInterface.java index b2be1f81105..91c7f655b7f 100644 --- a/awsapi/src/com/amazon/s3/AmazonS3SkeletonInterface.java +++ b/awsapi/src/com/amazon/s3/AmazonS3SkeletonInterface.java @@ -32,7 +32,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getBucketLoggingStatus */ @@ -40,16 +40,16 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param copyObject - * @throws AxisFault + * @throws AxisFault */ public com.amazon.s3.CopyObjectResponse copyObject(com.amazon.s3.CopyObject copyObject) throws AxisFault; /** * Auto generated method signature - * + * * @param getBucketAccessControlPolicy */ @@ -57,7 +57,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param listBucket */ @@ -65,7 +65,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param putObject */ @@ -73,7 +73,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param createBucket */ @@ -81,7 +81,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param listAllMyBuckets */ @@ -89,7 +89,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getObject */ @@ -97,7 +97,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteBucket */ @@ -105,7 +105,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param setBucketLoggingStatus */ @@ -113,7 +113,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getObjectAccessControlPolicy */ @@ -121,7 +121,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param deleteObject */ @@ -129,7 +129,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param setBucketAccessControlPolicy */ @@ -137,7 +137,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param setObjectAccessControlPolicy */ @@ -145,7 +145,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param putObjectInline */ @@ -153,7 +153,7 @@ public interface AmazonS3SkeletonInterface { /** * Auto generated method signature - * + * * @param getObjectExtended */ diff --git a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java index 257cb19d3c2..d3ee00e1d98 100644 --- a/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java +++ b/awsapi/src/com/amazon/s3/client/AmazonS3Stub.java @@ -227,10 +227,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#getBucketLoggingStatus * @param getBucketLoggingStatus0 - + */ public com.amazon.s3.client.AmazonS3Stub.GetBucketLoggingStatusResponse getBucketLoggingStatus( @@ -326,10 +326,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startgetBucketLoggingStatus * @param getBucketLoggingStatus0 - + */ public void startgetBucketLoggingStatus( @@ -455,10 +455,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#copyObject * @param copyObject2 - + */ public com.amazon.s3.client.AmazonS3Stub.CopyObjectResponse copyObject( @@ -553,10 +553,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startcopyObject * @param copyObject2 - + */ public void startcopyObject( @@ -682,10 +682,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#getBucketAccessControlPolicy * @param getBucketAccessControlPolicy4 - + */ public com.amazon.s3.client.AmazonS3Stub.GetBucketAccessControlPolicyResponse getBucketAccessControlPolicy( @@ -781,10 +781,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startgetBucketAccessControlPolicy * @param getBucketAccessControlPolicy4 - + */ public void startgetBucketAccessControlPolicy( @@ -910,10 +910,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#listBucket * @param listBucket6 - + */ public com.amazon.s3.client.AmazonS3Stub.ListBucketResponse listBucket( @@ -1008,10 +1008,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startlistBucket * @param listBucket6 - + */ public void startlistBucket( @@ -1137,10 +1137,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#putObject * @param putObject8 - + */ public com.amazon.s3.client.AmazonS3Stub.PutObjectResponse putObject( @@ -1235,10 +1235,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startputObject * @param putObject8 - + */ public void startputObject( @@ -1364,10 +1364,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#createBucket * @param createBucket10 - + */ public com.amazon.s3.client.AmazonS3Stub.CreateBucketResponse createBucket( @@ -1463,10 +1463,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startcreateBucket * @param createBucket10 - + */ public void startcreateBucket( @@ -1592,10 +1592,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#listAllMyBuckets * @param listAllMyBuckets12 - + */ public com.amazon.s3.client.AmazonS3Stub.ListAllMyBucketsResponse listAllMyBuckets( @@ -1691,10 +1691,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startlistAllMyBuckets * @param listAllMyBuckets12 - + */ public void startlistAllMyBuckets( @@ -1820,10 +1820,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#getObject * @param getObject14 - + */ public com.amazon.s3.client.AmazonS3Stub.GetObjectResponse getObject( @@ -1918,10 +1918,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startgetObject * @param getObject14 - + */ public void startgetObject( @@ -2047,10 +2047,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#deleteBucket * @param deleteBucket16 - + */ public com.amazon.s3.client.AmazonS3Stub.DeleteBucketResponse deleteBucket( @@ -2146,10 +2146,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startdeleteBucket * @param deleteBucket16 - + */ public void startdeleteBucket( @@ -2275,10 +2275,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#setBucketLoggingStatus * @param setBucketLoggingStatus18 - + */ public com.amazon.s3.client.AmazonS3Stub.SetBucketLoggingStatusResponse setBucketLoggingStatus( @@ -2374,10 +2374,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startsetBucketLoggingStatus * @param setBucketLoggingStatus18 - + */ public void startsetBucketLoggingStatus( @@ -2503,10 +2503,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#getObjectAccessControlPolicy * @param getObjectAccessControlPolicy20 - + */ public com.amazon.s3.client.AmazonS3Stub.GetObjectAccessControlPolicyResponse getObjectAccessControlPolicy( @@ -2602,10 +2602,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startgetObjectAccessControlPolicy * @param getObjectAccessControlPolicy20 - + */ public void startgetObjectAccessControlPolicy( @@ -2731,10 +2731,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#deleteObject * @param deleteObject22 - + */ public com.amazon.s3.client.AmazonS3Stub.DeleteObjectResponse deleteObject( @@ -2830,10 +2830,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startdeleteObject * @param deleteObject22 - + */ public void startdeleteObject( @@ -2959,10 +2959,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#setBucketAccessControlPolicy * @param setBucketAccessControlPolicy24 - + */ public com.amazon.s3.client.AmazonS3Stub.SetBucketAccessControlPolicyResponse setBucketAccessControlPolicy( @@ -3058,10 +3058,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startsetBucketAccessControlPolicy * @param setBucketAccessControlPolicy24 - + */ public void startsetBucketAccessControlPolicy( @@ -3187,10 +3187,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#setObjectAccessControlPolicy * @param setObjectAccessControlPolicy26 - + */ public com.amazon.s3.client.AmazonS3Stub.SetObjectAccessControlPolicyResponse setObjectAccessControlPolicy( @@ -3286,10 +3286,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startsetObjectAccessControlPolicy * @param setObjectAccessControlPolicy26 - + */ public void startsetObjectAccessControlPolicy( @@ -3415,10 +3415,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#putObjectInline * @param putObjectInline28 - + */ public com.amazon.s3.client.AmazonS3Stub.PutObjectInlineResponse putObjectInline( @@ -3514,10 +3514,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startputObjectInline * @param putObjectInline28 - + */ public void startputObjectInline( @@ -3643,10 +3643,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature - * + * * @see com.amazon.s3.client.AmazonS3#getObjectExtended * @param getObjectExtended30 - + */ public com.amazon.s3.client.AmazonS3Stub.GetObjectExtendedResponse getObjectExtended( @@ -3742,10 +3742,10 @@ public class AmazonS3Stub extends org.apache.axis2.client.Stub { /** * Auto generated method signature for Asynchronous Invocations - * + * * @see com.amazon.s3.client.AmazonS3#startgetObjectExtended * @param getObjectExtended30 - + */ public void startgetObjectExtended( diff --git a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java index a404ffa9b3f..20b65a3cffe 100644 --- a/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java +++ b/awsapi/src/com/cloud/bridge/auth/ec2/AuthenticationHandler.java @@ -80,7 +80,7 @@ public class AuthenticationHandler implements Handler { /** * For EC2 SOAP calls this function's goal is to extract the X509 certificate that is - * part of the WS-Security wrapped SOAP request. We need the cert in order to + * part of the WS-Security wrapped SOAP request. We need the cert in order to * map it to the user's Cloud API key and Cloud Secret Key. */ @Override @@ -105,11 +105,11 @@ public class AuthenticationHandler implements Handler { ByteArrayInputStream bs = new ByteArrayInputStream(certBytes); while (bs.available() > 0) userCert = cf.generateCertificate(bs); - //System.out.println( "cert: " + userCert.toString()); + //System.out.println( "cert: " + userCert.toString()); String uniqueId = AuthenticationUtils.X509CertUniqueId(userCert); logger.debug("X509 cert's uniqueId: " + uniqueId); - // -> find the Cloud API key and the secret key from the cert's uniqueId + // -> find the Cloud API key and the secret key from the cert's uniqueId UserCredentialsDao ucDao = new UserCredentialsDaoImpl(); UserCredentialsVO cloudKeys = ucDao.getByCertUniqueId(uniqueId); if (null == cloudKeys) { diff --git a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java index a5808936223..c07002d4551 100644 --- a/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java +++ b/awsapi/src/com/cloud/bridge/auth/s3/AuthenticationHandler.java @@ -73,13 +73,13 @@ public class AuthenticationHandler implements Handler { } /** - * Verify the request's authentication signature by extracting all the + * Verify the request's authentication signature by extracting all the * necessary parts of the request, obtaining the requestor's secret key, and * recalculating the signature. - * - * On Signature mismatch raise an AxisFault (i.e., a SoapFault) with what Amazon S3 + * + * On Signature mismatch raise an AxisFault (i.e., a SoapFault) with what Amazon S3 * defines as a "Client.SignatureMismatch" error. - * + * * Special case: need to deal with anonymous requests where no AWSAccessKeyId is * given. In this case just pass the request on. */ @@ -92,7 +92,7 @@ public class AuthenticationHandler implements Handler { String secretKey = null; String temp = null; - // [A] Obtain the HttpServletRequest object + // [A] Obtain the HttpServletRequest object HttpServletRequest httpObj = (HttpServletRequest)msgContext.getProperty("transport.http.servletRequest"); if (null != httpObj) System.out.println("S3 SOAP auth test header access - acceptable Encoding type: " + httpObj.getHeader("Accept-Encoding")); @@ -175,7 +175,7 @@ public class AuthenticationHandler implements Handler { /** * Given the user's access key, then obtain his secret key in the user database. - * + * * @param accessKey - a unique string allocated for each registered user * @return the secret key or null of no matching user found */ diff --git a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java index 045e6b958c1..89066f5b7fa 100644 --- a/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java +++ b/awsapi/src/com/cloud/bridge/io/DimeDelimitedInputStream.java @@ -54,15 +54,15 @@ import org.apache.log4j.Logger; +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * This implementation of input stream does not support marking operations. - * + * * Incoming data is DIME encoded when its MIME type is "application/dime". * Then use this class to pull out 2 streams: - * (1) The first stream is the SOAP request, + * (1) The first stream is the SOAP request, * (2) The second stream is a chunked attachment (e.g., a file to store) * * The DIME format is defined at this reference: * http://msdn.microsoft.com/en-us/library/aa480488.aspx - * + * * @author Rick Rineholt */ public class DimeDelimitedInputStream extends FilterInputStream { @@ -94,7 +94,7 @@ public class DimeDelimitedInputStream extends FilterInputStream { /** * There can be multiple streams in a DIME encoding. For example, the first - * stream can be a SOAP message, and the second stream a binary attachment (e.g., + * stream can be a SOAP message, and the second stream a binary attachment (e.g., * a file). During reading after an EOF is returned, this function should be * called to see if there is another stream following the last. * @@ -231,7 +231,7 @@ public class DimeDelimitedInputStream extends FilterInputStream { if (0 == len) return 0; //quick. - // odd case no data to read -- give back 0 next time -1; + // odd case no data to read -- give back 0 next time -1; if (recordLength == 0 && bytesRead == 0 && !moreChunks) { ++bytesRead; if (ME) @@ -302,7 +302,7 @@ public class DimeDelimitedInputStream extends FilterInputStream { /** * The DIME header is read into local class data fields and are not * passed as part of the stream data. - * + * * @param isChunk * @throws IOException */ @@ -430,7 +430,7 @@ public class DimeDelimitedInputStream extends FilterInputStream { /** * Read from the delimited stream. - * + * * @param b is the array to read into. Read as much as possible * into the size of this array. * @return the number of bytes read. -1 if endof stream @@ -487,7 +487,7 @@ public class DimeDelimitedInputStream extends FilterInputStream { /** * Skip n bytes of data in the DIME stream, while reading and processing * any headers in the current stream. - * + * * @param n - number of data bytes to skip * @return number of bytes actually skipped * @throws IOException diff --git a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java index bf145a0b7aa..77249aa84aa 100644 --- a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java +++ b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. /** - * + * */ package com.cloud.bridge.io; @@ -35,11 +35,11 @@ import org.apache.axis2.databinding.ADBBean; import org.apache.axis2.databinding.ADBException; /** - * Provide an MTOM aware serializable output stream writer to be consumed by implementors of the + * Provide an MTOM aware serializable output stream writer to be consumed by implementors of the * com.amazon.s3 Response ADB bean classes. * This writer enables participation is StaX based builders and AXIOM om xml stream processing * An instance of a MTOMAwareResultStreamWriter is a convenient argument to a com.amazon.s3 Response bean, as generated - * from the Amazon S3 WSDL using + * from the Amazon S3 WSDL using * wsdl2java.sh -ss -sd -ssi -g -p com.amazon.s3 -ns2p "http://s3.amazonaws.com/doc/2006-03-01/"=com.amazon.s3 -uri cloud-AmazonS3.wsdl * Such a bean implements a serialize method of the form * public void serialize(qualifiedName,omfactory, xmlWriter) @@ -55,8 +55,8 @@ import org.apache.axis2.databinding.ADBException; * Addtionally, as a side effect, ensure that the org.apache.axis2.databinding classes which serialize the * output of each fields have been initialized to be aware of any custom classes which override the default * output xsd converter methods of Axis2's databinding. Such a custom class is notified to the ADB framework - * (via its org.apache.axis2.databinding.utils.ConverterUtil class) by setting a System property, - * SYSTEM_PROPERTY_ADB_CONVERTERUTIL to name the custom class. + * (via its org.apache.axis2.databinding.utils.ConverterUtil class) by setting a System property, + * SYSTEM_PROPERTY_ADB_CONVERTERUTIL to name the custom class. */ public class MTOMAwareResultStreamWriter { @@ -88,7 +88,7 @@ public class MTOMAwareResultStreamWriter { System.setProperty(org.apache.axis2.databinding.utils.ConverterUtil.SYSTEM_PROPERTY_ADB_CONVERTERUTIL, "com.cloud.bridge.util.DatabindingConverterUtil"); } - /* + /* * @params * @param nameOfResult Used as the tag description of the result written out when the requester serializes * @param outputStream The stream capable of sinking bytes written at the time the requester is ready to serialize, @@ -107,7 +107,7 @@ public class MTOMAwareResultStreamWriter { qualifiedName = new QName(S3XMLNS, nameOfResult, DEFAULT_NS_PREFIX); } - /* + /* * @params * @param nameOfResult Used as the tag description of the result written out when the requester serializes * @param outputStream The stream capable of sinking bytes written at the time the requester is ready to serialize, diff --git a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java index 697bded5e1c..d4e00d7e122 100644 --- a/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java +++ b/awsapi/src/com/cloud/bridge/io/MultiPartDimeInputStream.java @@ -21,10 +21,10 @@ import org.apache.log4j.Logger; import java.io.InputStream; import java.io.IOException; -/** +/** * A DIME stream is actually composed of multiple encoded streams. - * This class is a wrapper around the DimeDelimitedInputStream inorder - * to provide a simple iterator like interface for all the streams in a + * This class is a wrapper around the DimeDelimitedInputStream inorder + * to provide a simple iterator like interface for all the streams in a * DIME encoded message. */ public class MultiPartDimeInputStream { @@ -42,7 +42,7 @@ public class MultiPartDimeInputStream { /** * The SOAP stream must be first, call nextInputStream to get * access to the first stream and all streams after that. - * + * * @param is the true input stream holding the incoming request. */ public MultiPartDimeInputStream(InputStream is) throws IOException { @@ -52,7 +52,7 @@ public class MultiPartDimeInputStream { /** * These three methods are DIME specific but provide potentially * useful information about the current stream's data. - * + * * @return URL or MIME type */ public String getStreamType() { @@ -87,7 +87,7 @@ public class MultiPartDimeInputStream { * Move on to the next stream encoded in the DIME stream. * If the current stream has not been all read, then we skip the remaining bytes of * that stream. - * + * * @return false if no next input stream, true if next input stream ready * @throws IOException */ diff --git a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java index 0eb13d7d1ad..74b2c8c3168 100644 --- a/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java +++ b/awsapi/src/com/cloud/bridge/io/S3CAStorBucketAdapter.java @@ -95,7 +95,7 @@ public class S3CAStorBucketAdapter implements S3BucketAdapter { // The "domain" to store streams can be specified. If not specified, streams will be written // without a "domain" query arg, so they will go into the castor default domain. // The port is optional and must be at the end of the config string, defaults to 80. - // Examples: "castor 172.16.78.130 172.16.78.131 80", "castor 172.16.78.130 domain=mycluster.example.com", + // Examples: "castor 172.16.78.130 172.16.78.131 80", "castor 172.16.78.130 domain=mycluster.example.com", // "castor zeroconf=mycluster.example.com domain=mycluster.example.com 80" String[] cfg = mountedRoot.split(" "); int numIPs = cfg.length - 1; diff --git a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java index 0e6cf9a2729..77d847c4944 100644 --- a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java +++ b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java @@ -124,7 +124,7 @@ public class S3FileSystemBucketAdapter implements S3BucketAdapter { * object that can be accessed by normal S3 calls. This function could take a long time since a multipart is * allowed to have upto 10,000 parts (each 5 gib long). Amazon defines that while this operation is in progress * whitespace is sent back to the client inorder to keep the HTTP connection alive. - * + * * @param mountedRoot - where both the source and dest buckets are located * @param destBucket - resulting location of the concatenated objects * @param fileName - resulting file name of the concatenated objects @@ -230,7 +230,7 @@ public class S3FileSystemBucketAdapter implements S3BucketAdapter { } private String getBucketFolderName(String bucket) { - // temporary + // temporary String name = bucket.replace(' ', '_'); name = bucket.replace('\\', '-'); name = bucket.replace('/', '-'); diff --git a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java index e311f479aa6..eb2831c2484 100644 --- a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java +++ b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java @@ -26,7 +26,7 @@ import com.cloud.utils.db.Transaction; /** * ServiceEngineLifecycle is used to participate Axis service life cycle management - * so that we can inject proper initialization and cleanup procedure into the + * so that we can inject proper initialization and cleanup procedure into the * process */ public class ServiceEngineLifecycle implements ServiceLifeCycle { diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.java b/awsapi/src/com/cloud/bridge/model/SAcl.java index f2300db33dd..79f993284b3 100644 --- a/awsapi/src/com/cloud/bridge/model/SAcl.java +++ b/awsapi/src/com/cloud/bridge/model/SAcl.java @@ -26,13 +26,13 @@ import com.cloud.bridge.util.Triple; /** * A model of stored ACLs to remember the ACL permissions per canonicalUserID per grantee * Hold the AWS S3 grantee and permission constants. - * + * * This class implements two forms of getCannedAccessControls mappings, as static methods, - * + * * (a) an OrderedPair which provides a maplet across * < permission, grantee > * when given an aclRequestString and a target (i.e. bucket or object), - * + * * (b) a Triplet * < permission1, permission2, symbol > * when given an aclRequestString, a target (i.e. bucket or object) and the ID of the owner. @@ -51,13 +51,13 @@ public interface SAcl { public static final int PERMISSION_WRITE_ACL = 8; public static final int PERMISSION_FULL = (PERMISSION_READ | PERMISSION_WRITE | PERMISSION_READ_ACL | PERMISSION_WRITE_ACL); - /** Return an OrderedPair + /** Return an OrderedPair * < permission, grantee > * comprising * a permission - which is one of SAcl.PERMISSION_PASS, SAcl.PERMISSION_NONE, SAcl.PERMISSION_READ, * SAcl.PERMISSION_WRITE, SAcl.PERMISSION_READ_ACL, SAcl.PERMISSION_WRITE_ACL, SAcl.PERMISSION_FULL * a grantee - which is one of GRANTEE_ALLUSERS, GRANTEE_AUTHENTICATED, GRANTEE_USER - * + * * Access controls that are specified via the "x-amz-acl:" headers in REST requests for buckets. * The ACL request string is treated as a request for a known cannedAccessPolicy * @param aclRequestString - The requested ACL from the set of AWS S3 canned ACLs @@ -66,27 +66,27 @@ public interface SAcl { //public static OrderedPair getCannedAccessControls ( String aclRequestString, String target ); /* { - if ( aclRequestString.equalsIgnoreCase( "public-read" )) + if ( aclRequestString.equalsIgnoreCase( "public-read" )) // All users granted READ access. return new OrderedPair (PERMISSION_READ,GRANTEE_ALLUSERS); - else if (aclRequestString.equalsIgnoreCase( "public-read-write" )) + else if (aclRequestString.equalsIgnoreCase( "public-read-write" )) // All users granted READ and WRITE access return new OrderedPair ((PERMISSION_READ | PERMISSION_WRITE),GRANTEE_ALLUSERS); - else if (aclRequestString.equalsIgnoreCase( "authenticated-read" )) + else if (aclRequestString.equalsIgnoreCase( "authenticated-read" )) // Authenticated users have READ access return new OrderedPair (PERMISSION_READ,GRANTEE_AUTHENTICATED); - else if (aclRequestString.equalsIgnoreCase( "private" )) + else if (aclRequestString.equalsIgnoreCase( "private" )) // Only Owner gets FULL_CONTROL return new OrderedPair (PERMISSION_FULL,GRANTEE_USER); else if (aclRequestString.equalsIgnoreCase( "bucket-owner-read" )) { // Object Owner gets FULL_CONTROL, Bucket Owner gets READ - if ( target.equalsIgnoreCase( "SBucket" )) + if ( target.equalsIgnoreCase( "SBucket" )) return new OrderedPair (PERMISSION_READ, GRANTEE_USER); else - return new OrderedPair (PERMISSION_FULL, GRANTEE_USER); + return new OrderedPair (PERMISSION_FULL, GRANTEE_USER); } - else if (aclRequestString.equalsIgnoreCase( "bucket-owner-full-control" )) + else if (aclRequestString.equalsIgnoreCase( "bucket-owner-full-control" )) { // Object Owner gets FULL_CONTROL, Bucket Owner gets FULL_CONTROL // This is equivalent to private when used with PUT Bucket @@ -95,7 +95,7 @@ public interface SAcl { else throw new UnsupportedException( "Unknown Canned Access Policy: " + aclRequestString + " is not supported" ); } */ - /** Return a Triple + /** Return a Triple * < permission1, permission2, symbol > * comprising * two permissions - which is one of SAcl.PERMISSION_PASS, SAcl.PERMISSION_NONE, SAcl.PERMISSION_READ, @@ -103,7 +103,7 @@ public interface SAcl { * permission1 applies to objects, permission2 applies to buckets. * a symbol to indicate whether the principal is anonymous (i.e. string "A") or authenticated user (i.e. * string "*") - otherwise null indicates a single ACL for all users. - * + * * Access controls that are specified via the "x-amz-acl:" headers in REST requests for buckets. * The ACL request string is treated as a request for a known cannedAccessPolicy * @param aclRequestString - The requested ACL from the set of AWS S3 canned ACLs @@ -113,34 +113,34 @@ public interface SAcl { //public static Triple getCannedAccessControls ( String aclRequestString, String target, String ownerID ); /* throws UnsupportedException { - if ( aclRequestString.equalsIgnoreCase( "public-read" )) + if ( aclRequestString.equalsIgnoreCase( "public-read" )) // Owner gets FULL_CONTROL and the anonymous principal (the 'A' symbol here) is granted READ access. return new Triple (PERMISSION_FULL, PERMISSION_READ,"A"); - else if (aclRequestString.equalsIgnoreCase( "public-read-write" )) + else if (aclRequestString.equalsIgnoreCase( "public-read-write" )) // Owner gets FULL_CONTROL and the anonymous principal (the 'A' symbol here) is granted READ and WRITE access return new Triple (PERMISSION_FULL, (PERMISSION_READ | PERMISSION_WRITE),"A"); - else if (aclRequestString.equalsIgnoreCase( "authenticated-read" )) + else if (aclRequestString.equalsIgnoreCase( "authenticated-read" )) // Owner gets FULL_CONTROL and ANY principal authenticated as a registered S3 user (the '*' symbol here) is granted READ access return new Triple (PERMISSION_FULL, PERMISSION_READ,"*"); - else if (aclRequestString.equalsIgnoreCase( "private" )) + else if (aclRequestString.equalsIgnoreCase( "private" )) // This is termed the "private" or default ACL, "Owner gets FULL_CONTROL" return new Triple (PERMISSION_FULL, PERMISSION_FULL,null); else if (aclRequestString.equalsIgnoreCase( "bucket-owner-read" )) { // Object Owner gets FULL_CONTROL, Bucket Owner gets READ // This is equivalent to private when used with PUT Bucket - if ( target.equalsIgnoreCase( "SBucket" )) - return new Triple (PERMISSION_FULL,PERMISSION_FULL ,null); - else + if ( target.equalsIgnoreCase( "SBucket" )) + return new Triple (PERMISSION_FULL,PERMISSION_FULL ,null); + else return new Triple (PERMISSION_FULL,PERMISSION_READ,ownerID); } - else if (aclRequestString.equalsIgnoreCase( "bucket-owner-full-control" )) + else if (aclRequestString.equalsIgnoreCase( "bucket-owner-full-control" )) { // Object Owner gets FULL_CONTROL, Bucket Owner gets FULL_CONTROL // This is equivalent to private when used with PUT Bucket - if ( target.equalsIgnoreCase( "SBucket" )) - return new Triple (PERMISSION_FULL, PERMISSION_FULL, null); - else + if ( target.equalsIgnoreCase( "SBucket" )) + return new Triple (PERMISSION_FULL, PERMISSION_FULL, null); + else return new Triple (PERMISSION_FULL,PERMISSION_FULL, ownerID); } else throw new UnsupportedException( "Unknown Canned Access Policy: " + aclRequestString + " is not supported" ); diff --git a/awsapi/src/com/cloud/bridge/model/SAclVO.java b/awsapi/src/com/cloud/bridge/model/SAclVO.java index 9721aa153f9..3f5dbc55780 100644 --- a/awsapi/src/com/cloud/bridge/model/SAclVO.java +++ b/awsapi/src/com/cloud/bridge/model/SAclVO.java @@ -34,13 +34,13 @@ import com.cloud.bridge.util.Triple; /** * A model of stored ACLs to remember the ACL permissions per canonicalUserID per grantee * Hold the AWS S3 grantee and permission constants. - * + * * This class implements two forms of getCannedAccessControls mappings, as static methods, - * + * * (a) an OrderedPair which provides a maplet across * < permission, grantee > * when given an aclRequestString and a target (i.e. bucket or object), - * + * * (b) a Triplet * < permission1, permission2, symbol > * when given an aclRequestString, a target (i.e. bucket or object) and the ID of the owner. @@ -155,13 +155,13 @@ public class SAclVO implements SAcl { this.lastModifiedTime = lastModifiedTime; } - /** Return an OrderedPair + /** Return an OrderedPair * < permission, grantee > * comprising * a permission - which is one of SAcl.PERMISSION_PASS, SAcl.PERMISSION_NONE, SAcl.PERMISSION_READ, * SAcl.PERMISSION_WRITE, SAcl.PERMISSION_READ_ACL, SAcl.PERMISSION_WRITE_ACL, SAcl.PERMISSION_FULL * a grantee - which is one of GRANTEE_ALLUSERS, GRANTEE_AUTHENTICATED, GRANTEE_USER - * + * * Access controls that are specified via the "x-amz-acl:" headers in REST requests for buckets. * The ACL request string is treated as a request for a known cannedAccessPolicy * @param aclRequestString - The requested ACL from the set of AWS S3 canned ACLs @@ -194,7 +194,7 @@ public class SAclVO implements SAcl { throw new UnsupportedException("Unknown Canned Access Policy: " + aclRequestString + " is not supported"); } - /** Return a Triple + /** Return a Triple * < permission1, permission2, symbol > * comprising * two permissions - which is one of SAcl.PERMISSION_PASS, SAcl.PERMISSION_NONE, SAcl.PERMISSION_READ, @@ -202,7 +202,7 @@ public class SAclVO implements SAcl { * permission1 applies to objects, permission2 applies to buckets. * a symbol to indicate whether the principal is anonymous (i.e. string "A") or authenticated user (i.e. * string "*") - otherwise null indicates a single ACL for all users. - * + * * Access controls that are specified via the "x-amz-acl:" headers in REST requests for buckets. * The ACL request string is treated as a request for a known cannedAccessPolicy * @param aclRequestString - The requested ACL from the set of AWS S3 canned ACLs diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.java b/awsapi/src/com/cloud/bridge/model/SBucket.java index 3ccd78e8d75..53b1a5eaa49 100644 --- a/awsapi/src/com/cloud/bridge/model/SBucket.java +++ b/awsapi/src/com/cloud/bridge/model/SBucket.java @@ -24,10 +24,10 @@ import java.util.Set; /** * Holds the relation * Id, - * Name, + * Name, * OwnerCanonicalId, - * SHost, - * CreateTime, + * SHost, + * CreateTime, * VersioningStatus * For ORM see "com/cloud/bridge/model/SHost.hbm.xml" */ @@ -38,21 +38,21 @@ public interface SBucket { public static final int VERSIONING_SUSPENDED = 2; /* private Long id; - + private String name; private String ownerCanonicalId; - + private SHost shost; private Date createTime; - + private int versioningStatus; - + private Set objectsInBucket = new HashSet(); - + public SBucket() { versioningStatus = VERSIONING_NULL; } - + public Long getId() { return id; } @@ -60,47 +60,47 @@ public interface SBucket { private void setId(Long id) { this.id = id; } - + public String getName() { return name; } - + public void setName(String name) { this.name = name; } - + public String getOwnerCanonicalId() { return ownerCanonicalId; } - + public void setOwnerCanonicalId(String ownerCanonicalId) { this.ownerCanonicalId = ownerCanonicalId; } - + public SHost getShost() { return shost; } - + public void setShost(SHost shost) { this.shost = shost; } - + public Date getCreateTime() { return createTime; } - + public void setCreateTime(Date createTime) { this.createTime = createTime; } - + public int getVersioningStatus() { return versioningStatus; } - + public void setVersioningStatus( int versioningStatus ) { this.versioningStatus = versioningStatus; } - + public Set getObjectsInBucket() { return objectsInBucket; } @@ -108,18 +108,18 @@ public interface SBucket { public void setObjectsInBucket(Set objectsInBucket) { this.objectsInBucket = objectsInBucket; } - + @Override public boolean equals(Object other) { if(this == other) return true; - + if(!(other instanceof SBucket)) return false; - + return getName().equals(((SBucket)other).getName()); } - + @Override public int hashCode() { return getName().hashCode(); diff --git a/awsapi/src/com/cloud/bridge/model/SBucketVO.java b/awsapi/src/com/cloud/bridge/model/SBucketVO.java index ca41e0e48a3..f71688aa247 100644 --- a/awsapi/src/com/cloud/bridge/model/SBucketVO.java +++ b/awsapi/src/com/cloud/bridge/model/SBucketVO.java @@ -34,10 +34,10 @@ import javax.persistence.Transient; /** * Holds the relation * Id, - * Name, + * Name, * OwnerCanonicalId, - * SHost, - * CreateTime, + * SHost, + * CreateTime, * VersioningStatus * For ORM see "com/cloud/bridge/model/SHost.hbm.xml" */ diff --git a/awsapi/src/com/cloud/bridge/model/SHost.java b/awsapi/src/com/cloud/bridge/model/SHost.java index 9d4da0f9695..d085425090b 100644 --- a/awsapi/src/com/cloud/bridge/model/SHost.java +++ b/awsapi/src/com/cloud/bridge/model/SHost.java @@ -32,20 +32,20 @@ public interface SHost { STORAGE_HOST_TYPE_CASTOR //2 } /* private Long id; - + private String host; private int hostType; private MHostVO mhost; private String exportRoot; private String userOnHost; private String userPassword; - - private Set buckets = new HashSet(); + + private Set buckets = new HashSet(); private Set mounts = new HashSet(); - + public SHost() { } - + public Long getId() { return id; } @@ -53,15 +53,15 @@ public interface SHost { private void setId(Long id) { this.id = id; } - + public String getHost() { return host; } - + public void setHost(String host) { this.host = host; } - + public int getHostType() { return hostType; } @@ -81,19 +81,19 @@ public interface SHost { public String getUserOnHost() { return userOnHost; } - + public void setUserOnHost(String userOnHost) { this.userOnHost = userOnHost; } - + public String getUserPassword() { return userPassword; } - + public void setUserPassword(String userPassword) { this.userPassword = userPassword; } - + public MHostVO getMhost() { return mhost; } @@ -109,7 +109,7 @@ public interface SHost { public void setBuckets(Set buckets) { this.buckets = buckets; } - + public Set getMounts() { return mounts; } diff --git a/awsapi/src/com/cloud/bridge/model/SObjectVO.java b/awsapi/src/com/cloud/bridge/model/SObjectVO.java index d477221da9f..988a067d0d7 100644 --- a/awsapi/src/com/cloud/bridge/model/SObjectVO.java +++ b/awsapi/src/com/cloud/bridge/model/SObjectVO.java @@ -189,7 +189,7 @@ public class SObjectVO { /** * S3 versioning allows the client to request the return of a specific version, * not just the last version. - * + * * @param wantVersion * @return */ diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java index 97508b49a73..13456d89c40 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartLoadDao.java @@ -52,7 +52,7 @@ public class MultipartLoadDao { /** * If a multipart upload exists with the uploadId value then return the non-null creators * accessKey. - * + * * @param uploadId * @return creator of the multipart upload, and NameKey of upload */ @@ -65,9 +65,9 @@ public class MultipartLoadDao { * The multipart upload was either successfully completed or was aborted. In either case, we need * to remove all of its state from the tables. Note that we have cascade deletes so all tables with * uploadId as a foreign key are automatically cleaned. - * + * * @param uploadId - * + * */ public void deleteUpload(int uploadId) { mpartUploadDao.deleteUpload(uploadId); @@ -75,7 +75,7 @@ public class MultipartLoadDao { /** * The caller needs to know who initiated the multipart upload. - * + * * @param uploadId * @return the access key value defining the initiator */ @@ -85,12 +85,12 @@ public class MultipartLoadDao { /** * Create a new "in-process" multipart upload entry to keep track of its state. - * + * * @param accessKey * @param bucketName * @param key * @param cannedAccess - * + * * @return if positive its the uploadId to be returned to the client * */ @@ -126,9 +126,9 @@ public class MultipartLoadDao { /** * Remember all the individual parts that make up the entire multipart upload so that once - * the upload is complete all the parts can be glued together into a single object. Note, + * the upload is complete all the parts can be glued together into a single object. Note, * the caller can over write an existing part. - * + * * @param uploadId * @param partNumber * @param md5 @@ -172,7 +172,7 @@ public class MultipartLoadDao { /** * When the multipart are being composed into one object we need any meta data to be saved with * the new re-constituted object. - * + * * @param uploadId * @return an array of S3MetaDataEntry (will be null if no meta values exist) * @throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException @@ -202,10 +202,10 @@ public class MultipartLoadDao { } } - /** - * The result has to be ordered by key and if there is more than one identical key then all the + /** + * The result has to be ordered by key and if there is more than one identical key then all the * identical keys are ordered by create time. - * + * * @param bucketName * @param maxParts * @param prefix - can be null @@ -251,7 +251,7 @@ public class MultipartLoadDao { * Return info on a range of upload parts that have already been stored in disk. * Note that parts can be uploaded in any order yet we must returned an ordered list * of parts thus we use the "ORDERED BY" clause to sort the list. - * + * * @param uploadId * @param maxParts * @param startAt @@ -290,7 +290,7 @@ public class MultipartLoadDao { /** * How many parts exist after the endMarker part number? - * + * * @param uploadId * @param endMarker - can be used to see if getUploadedParts was truncated * @return number of parts with partNumber greater than endMarker @@ -303,10 +303,10 @@ public class MultipartLoadDao { /** * A multipart upload request can have zero to many meta data entries to be applied to the * final object. We need to remember all of the objects meta data until the multipart is complete. - * + * * @param uploadId - defines an in-process multipart upload * @param meta - an array of meta data to be assocated with the uploadId value - * + * */ private void saveMultipartMeta(int uploadId, S3MetaDataEntry[] meta) { if (null == meta) @@ -332,7 +332,7 @@ public class MultipartLoadDao { /** * Reallocates an array with a new size, and copies the contents * of the old array to the new array. - * + * * @param oldArray the old array, to be reallocated. * @param newSize the new array size. * @return A new array with the same contents. diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java index f0a5818233e..b9e4bd6eb09 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java @@ -398,7 +398,7 @@ public class EC2RestServlet extends HttpServlet { /** * Provide an easy way to determine the version of the implementation running. - * + * * This is an unauthenticated REST call. */ private void cloudEC2Version(HttpServletRequest request, HttpServletResponse response) { @@ -409,20 +409,20 @@ public class EC2RestServlet extends HttpServlet { /** * This request registers the Cloud.com account holder to the EC2 service. The Cloud.com - * account holder saves his API access and secret keys with the EC2 service so that + * account holder saves his API access and secret keys with the EC2 service so that * the EC2 service can make Cloud.com API calls on his behalf. The given API access - * and secret key are saved into the "usercredentials" database table. - * + * and secret key are saved into the "usercredentials" database table. + * * This is an unauthenticated REST call. The only required parameters are 'accesskey' and - * 'secretkey'. - * + * 'secretkey'. + * * To verify that the given keys represent an existing account they are used to execute the * Cloud.com's listAccounts API function. If the keys do not represent a valid account the * listAccounts function will fail. - * + * * A user can call this REST function any number of times, on each call the Cloud.com secret * key is simply over writes any previously stored value. - * + * * As with all REST calls HTTPS should be used to ensure their security. */ private void setUserKeys(HttpServletRequest request, HttpServletResponse response) { @@ -468,18 +468,18 @@ public class EC2RestServlet extends HttpServlet { } /** - * The SOAP API for EC2 uses WS-Security to sign all client requests. This requires that + * The SOAP API for EC2 uses WS-Security to sign all client requests. This requires that * the client have a public/private key pair and the public key defined by a X509 certificate. * Thus in order for a Cloud.com account holder to use the EC2's SOAP API he must register * his X509 certificate with the EC2 service. This function allows the Cloud.com account * holder to "load" his X509 certificate into the service. Note, that the SetUserKeys REST * function must be called before this call. - * + * * This is an authenticated REST call and as such must contain all the required REST parameters * including: Signature, Timestamp, Expires, etc. The signature is calculated using the * Cloud.com account holder's API access and secret keys and the Amazon defined EC2 signature * algorithm. - * + * * A user can call this REST function any number of times, on each call the X509 certificate * simply over writes any previously stored value. */ @@ -544,11 +544,11 @@ public class EC2RestServlet extends HttpServlet { } /** - * The SOAP API for EC2 uses WS-Security to sign all client requests. This requires that + * The SOAP API for EC2 uses WS-Security to sign all client requests. This requires that * the client have a public/private key pair and the public key defined by a X509 certificate. * This REST call allows a Cloud.com account holder to remove a previouly "loaded" X509 * certificate out of the EC2 service. - * + * * This is an unauthenticated REST call and as such must contain all the required REST parameters * including: Signature, Timestamp, Expires, etc. The signature is calculated using the * Cloud.com account holder's API access and secret keys and the Amazon defined EC2 signature @@ -707,11 +707,11 @@ public class EC2RestServlet extends HttpServlet { } /** - * The approach taken here is to map these REST calls into the same objects used + * The approach taken here is to map these REST calls into the same objects used * to implement the matching SOAP requests (e.g., AttachVolume). This is done by parsing * out the URL parameters and loading them into the relevant EC2XXX object(s). Once * the parameters are loaded the appropriate EC2Engine function is called to perform - * the requested action. The result of the EC2Engine function is a standard + * the requested action. The result of the EC2Engine function is a standard * Amazon WSDL defined object (e.g., AttachVolumeResponse Java object). Finally the * serialize method is called on the returned response object to obtain the extected * response XML. @@ -885,7 +885,7 @@ public class EC2RestServlet extends HttpServlet { } while (true); - // -> list: IpPermissions.n.Groups.m.UserId and IpPermissions.n.Groups.m.GroupName + // -> list: IpPermissions.n.Groups.m.UserId and IpPermissions.n.Groups.m.GroupName mCount = 1; do { String[] user = request.getParameterValues("IpPermissions." + nCount + ".Groups." + mCount + ".UserId"); @@ -1780,7 +1780,7 @@ public class EC2RestServlet extends HttpServlet { * &Filter.1.Value.1=i-1a2b3c4d * &Filter.2.Name=attachment.delete-on-termination * &Filter.2.Value.1=true - * + * * @param request * @return List */ @@ -2076,7 +2076,7 @@ public class EC2RestServlet extends HttpServlet { restAuth.setHTTPRequestURI(requestUri); String queryString = request.getQueryString(); - // getQueryString returns null (does it ever NOT return null for these), + // getQueryString returns null (does it ever NOT return null for these), // we need to construct queryString to avoid changing the auth code... if (queryString == null) { // construct our idea of a queryString with parameters! @@ -2108,7 +2108,7 @@ public class EC2RestServlet extends HttpServlet { /** * We check this to reduce replay attacks. - * + * * @param timeStamp * @return true - if the request is not longer valid, false otherwise * @throws ParseException @@ -2191,7 +2191,7 @@ public class EC2RestServlet extends HttpServlet { } /** - * Serialize Axis beans to XML output. + * Serialize Axis beans to XML output. */ private void serializeResponse(HttpServletResponse response, ADBBean EC2Response) throws ADBException, XMLStreamException, IOException { OutputStream os = response.getOutputStream(); diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java index 589c48b78a4..f2fd4a647a6 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java +++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java @@ -706,9 +706,9 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { /** * Processes ec2-register - * + * * @param - * + * * @see RegisterImage */ public RegisterImageResponse registerImage(RegisterImage registerImage) { @@ -726,9 +726,9 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { /** * Processes ec2-reset-image-attribute - * + * * @param resetImageAttribute - * + * * @see ResetInstanceAttribute */ @@ -749,9 +749,9 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { /** * ec2-run-instances - * + * * @param runInstances - * + * * @see RunInstances */ public RunInstancesResponse runInstances(RunInstances runInstances) { @@ -885,7 +885,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { /** * @param modifyInstanceAttribute - * @return + * @return */ public static ModifyInstanceAttributeResponse toModifyInstanceAttributeResponse(Boolean status) { ModifyInstanceAttributeResponse miat = new ModifyInstanceAttributeResponse(); @@ -1196,7 +1196,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { return request; } - // TODO make these filter set functions use generics + // TODO make these filter set functions use generics private EC2GroupFilterSet toGroupFilterSet(FilterSetType fst) { EC2GroupFilterSet gfs = new EC2GroupFilterSet(); @@ -1580,9 +1580,9 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { /** * Map our cloud state values into what Amazon defines. * Where are the values that can be returned by our cloud api defined? - * + * * @param cloudState - * @return + * @return */ public static int toAmazonCode(String cloudState) { if (null == cloudState) @@ -1890,7 +1890,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { DetachVolumeResponse response = new DetachVolumeResponse(); DetachVolumeResponseType param1 = new DetachVolumeResponseType(); Calendar cal = Calendar.getInstance(); - cal.set(1970, 1, 1); // return one value, Unix Epoch, what else can we return? + cal.set(1970, 1, 1); // return one value, Unix Epoch, what else can we return? param1.setVolumeId(engineResponse.getId().toString()); param1.setInstanceId((null == engineResponse.getInstanceId() ? "" : engineResponse.getInstanceId().toString())); @@ -1918,7 +1918,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { if (null != engineResponse.getState()) param1.setStatus(engineResponse.getState()); else - param1.setStatus(""); // ToDo - throw an Soap Fault + param1.setStatus(""); // ToDo - throw an Soap Fault // -> CloudStack seems to have issues with timestamp formats so just in case Calendar cal = EC2RestAuth.parseDateString(engineResponse.getCreated()); diff --git a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java index d5898678be1..e001b255265 100644 --- a/awsapi/src/com/cloud/bridge/service/S3RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/S3RestServlet.java @@ -212,7 +212,7 @@ public class S3RestServlet extends HttpServlet { /** * Provide an easy way to determine the version of the implementation running. - * + * * This is an unauthenticated REST call. */ private void cloudS3Version(HttpServletRequest request, HttpServletResponse response) { @@ -223,20 +223,20 @@ public class S3RestServlet extends HttpServlet { /** * This request registers the user Cloud.com account holder to the S3 service. The Cloud.com - * account holder saves his API access and secret keys with the S3 service so that + * account holder saves his API access and secret keys with the S3 service so that * each rest call he makes can be verified was originated from him. The given API access - * and secret key are saved into the "usercredentials" database table. - * + * and secret key are saved into the "usercredentials" database table. + * * This is an unauthenticated REST call. The only required parameters are 'accesskey' and - * 'secretkey'. - * + * 'secretkey'. + * * To verify that the given keys represent an existing account they are used to execute the * Cloud.com's listAccounts API function. If the keys do not represent a valid account the * listAccounts function will fail. - * + * * A user can call this REST function any number of times, on each call the Cloud.com secret * key is simply over writes any previously stored value. - * + * * As with all REST calls HTTPS should be used to ensure their security. */ @DB @@ -274,7 +274,7 @@ public class S3RestServlet extends HttpServlet { user = ucDao.persist(user); txn.commit(); txn.close(); - //credentialDao.setUserKeys( accessKey[0], secretKey[0] ); + //credentialDao.setUserKeys( accessKey[0], secretKey[0] ); } catch (Exception e) { logger.error("SetUserKeys " + e.getMessage(), e); @@ -392,7 +392,7 @@ public class S3RestServlet extends HttpServlet { return new S3BucketAction(); // for ListAllMyBuckets } - // Because there is a leading / at position 0 of pathInfo, now subtract this to process the remainder + // Because there is a leading / at position 0 of pathInfo, now subtract this to process the remainder pathInfo = pathInfo.substring(1); if (ServiceProvider.getInstance().getUseSubDomain()) @@ -476,7 +476,7 @@ public class S3RestServlet extends HttpServlet { // The purpose of the plain POST operation is to add an object to a specified bucket using HTML forms. private S3ObjectAction routePlainPostRequest(HttpServletRequest request) { - // TODO - Remove the unnecessary fields below + // TODO - Remove the unnecessary fields below // Obtain the mandatory fields from the HTML form or otherwise fail with a logger message String keyString = request.getParameter("key"); String metatagString = request.getParameter("x-amz-meta-tag"); @@ -487,7 +487,7 @@ public class S3RestServlet extends HttpServlet { String accessKeyString = request.getParameter("AWSAccessKeyId"); String signatureString = request.getParameter("Signature"); - // Obtain the discretionary fields from the HTML form + // Obtain the discretionary fields from the HTML form String policyKeyString = request.getParameter("Policy"); String metauuidString = request.getParameter("x-amz-meta-uuid"); String redirectString = request.getParameter("redirect"); @@ -519,7 +519,7 @@ public class S3RestServlet extends HttpServlet { * A DIME request is really a SOAP request that we are dealing with, and so its * authentication is the SOAP authentication approach. Since Axis2 does not handle * DIME messages we deal with them here. - * + * * @param request * @param response */ @@ -606,10 +606,10 @@ public class S3RestServlet extends HttpServlet { * Convert the SOAP XML we extract from the DIME message into our local object. * Here Axis2 is not parsing the SOAP for us. I tried to use the Amazon PutObject * parser but it keep throwing exceptions. - * + * * @param putObjectInline - * @return - * @throws Exception + * @return + * @throws Exception */ public static S3PutObjectRequest toEnginePutObjectRequest(InputStream is) throws Exception { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -770,7 +770,7 @@ public class S3RestServlet extends HttpServlet { /** * Looking for the value of a specific child of the given parent node. - * + * * @param parent * @param childName * @return diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java index d0ff1100fa9..16c99bbfde8 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java @@ -296,10 +296,10 @@ public class S3BucketAction implements ServletAction { return nValue.getNodeValue(); } - /** + /** * In order to support a policy on the "s3:CreateBucket" action we must be able to set and get * policies before a bucket is actually created. - * + * * @param request * @param response * @throws IOException @@ -321,7 +321,7 @@ public class S3BucketAction implements ServletAction { } } - // [B] "The bucket owner by default has permissions to attach bucket policies to their buckets using PUT Bucket policy." + // [B] "The bucket owner by default has permissions to attach bucket policies to their buckets using PUT Bucket policy." // -> the bucket owner may want to restrict the IP address from where this can be executed String client = UserContext.current().getCanonicalUserId(); S3PolicyContext context = new S3PolicyContext(PolicyActions.PutBucketPolicy, bucketName); @@ -563,7 +563,7 @@ public class S3BucketAction implements ServletAction { OutputStream outputStream = response.getOutputStream(); response.setStatus(200); response.setContentType("application/xml"); - // The content-type literally should be "application/xml; charset=UTF-8" + // The content-type literally should be "application/xml; charset=UTF-8" // but any compliant JVM supplies utf-8 by default; MTOMAwareResultStreamWriter resultWriter = new MTOMAwareResultStreamWriter("GetBucketAccessControlPolicyResult", outputStream); @@ -907,11 +907,11 @@ public class S3BucketAction implements ServletAction { } /** - * Multipart upload is a complex operation with all the options defined by Amazon. Part of the functionality is - * provided by the query done against the database. The CommonPrefixes functionality is done the same way - * as done in the listBucketContents function (i.e., by iterating though the list to decide which output + * Multipart upload is a complex operation with all the options defined by Amazon. Part of the functionality is + * provided by the query done against the database. The CommonPrefixes functionality is done the same way + * as done in the listBucketContents function (i.e., by iterating though the list to decide which output * element each key is placed). - * + * * @param request * @param response * @throws IOException diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java index 8bd28ffa4c6..22310a58196 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java @@ -209,7 +209,7 @@ public class S3ObjectAction implements ServletAction { OutputStream outputStream = response.getOutputStream(); response.setStatus(200); response.setContentType("application/xml"); - // The content-type literally should be "application/xml; charset=UTF-8" + // The content-type literally should be "application/xml; charset=UTF-8" // but any compliant JVM supplies utf-8 by default; MTOMAwareResultStreamWriter resultWriter = new MTOMAwareResultStreamWriter("CopyObjectResult", outputStream); @@ -248,7 +248,7 @@ public class S3ObjectAction implements ServletAction { OutputStream outputStream = response.getOutputStream(); response.setStatus(200); response.setContentType("application/xml"); - // The content-type literally should be "application/xml; charset=UTF-8" + // The content-type literally should be "application/xml; charset=UTF-8" // but any compliant JVM supplies utf-8 by default; MTOMAwareResultStreamWriter resultWriter = new MTOMAwareResultStreamWriter("GetObjectAccessControlPolicyResult", outputStream); @@ -377,7 +377,7 @@ public class S3ObjectAction implements ServletAction { } /** - * Once versioining is turned on then to delete an object requires specifying a version + * Once versioining is turned on then to delete an object requires specifying a version * parameter. A deletion marker is set once versioning is turned on in a bucket. */ private void executeDeleteObject(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -468,7 +468,7 @@ public class S3ObjectAction implements ServletAction { S3GetObjectResponse engineResponse = ServiceProvider.getInstance().getS3Engine().handleRequest(engineRequest); response.setStatus(engineResponse.getResultCode()); - //bucket lookup for non-existance key + //bucket lookup for non-existance key if (engineResponse.getResultCode() == 404) return; @@ -501,7 +501,7 @@ public class S3ObjectAction implements ServletAction { // There is a problem with POST since the 'Signature' and 'AccessKey' parameters are not // determined until we hit this function (i.e., they are encoded in the body of the message - // they are not HTTP request headers). All the values we used to get in the request headers + // they are not HTTP request headers). All the values we used to get in the request headers // are not encoded in the request body. // // add ETag header computed as Base64 MD5 whenever object is uploaded or updated @@ -573,7 +573,7 @@ public class S3ObjectAction implements ServletAction { } state = 1; } else if (1 == state && 0 == oneLine.length()) { - // -> data of a body part starts here + // -> data of a body part starts here state = 2; } else if (1 == state) { // -> the name of the 'name-value' pair is encoded in the Content-Disposition header @@ -622,7 +622,7 @@ public class S3ObjectAction implements ServletAction { /** * Save all the information about the multipart upload request in the database so once it is finished * (in the future) we can create the real S3 object. - * + * * @throws IOException */ private void executeInitiateMultipartUpload(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -724,7 +724,7 @@ public class S3ObjectAction implements ServletAction { /** * This function is required to both parsing XML on the request and return XML as part of its result. - * + * * @param request * @param response * @throws IOException @@ -1011,7 +1011,7 @@ public class S3ObjectAction implements ServletAction { * as defined in rfc2616. Any characters that could cause an invalid HTTP header will * prevent that meta data from being returned via the REST call (as is defined in the Amazon * spec). These characters can be defined if using the SOAP API as well as the REST API. - * + * * @param engineResponse * @param response */ @@ -1034,7 +1034,7 @@ public class S3ObjectAction implements ServletAction { } } - // -> cannot have HTTP separators in an HTTP header + // -> cannot have HTTP separators in an HTTP header if (-1 != name.indexOf('(') || -1 != name.indexOf(')') || -1 != name.indexOf('@') || -1 != name.indexOf('<') || -1 != name.indexOf('>') || -1 != name.indexOf('\"') || -1 != name.indexOf('[') || -1 != name.indexOf(']') || -1 != name.indexOf('=') || -1 != name.indexOf(',') || -1 != name.indexOf(';') || -1 != name.indexOf(':') || -1 != name.indexOf('\\') || -1 != name.indexOf('/') || -1 != name.indexOf(' ') || -1 != name.indexOf('{') || -1 != name.indexOf('}') || -1 != name.indexOf('?') || @@ -1054,7 +1054,7 @@ public class S3ObjectAction implements ServletAction { /** * Extract the name and value of all meta data so it can be written with the * object that is being 'PUT'. - * + * * @param request * @return */ @@ -1085,13 +1085,13 @@ public class S3ObjectAction implements ServletAction { } /** - * Parameters on the query string may or may not be name-value pairs. + * Parameters on the query string may or may not be name-value pairs. * For example: "?acl&versionId=2", notice that "acl" has no value other * than it is present. - * + * * @param queryString - from a URL to locate the 'find' parameter * @param find - name string to return first found - * @return the value matching the found name + * @return the value matching the found name */ private String returnParameter(String queryString, String find) { int offset = queryString.indexOf(find); @@ -1128,11 +1128,11 @@ public class S3ObjectAction implements ServletAction { * The Complete Multipart Upload function pass in the request body a list of * all uploaded body parts. It is required that we verify that list matches * what was uploaded. - * + * * @param is * @param parts * @return error code, and error string - * @throws ParserConfigurationException, IOException, SAXException + * @throws ParserConfigurationException, IOException, SAXException */ private OrderedPair verifyParts(InputStream is, S3MultipartPart[] parts) { try { diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java index dfc06894df0..66f6c6d160d 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java @@ -107,9 +107,9 @@ import com.cloud.bridge.service.core.s3.S3SetBucketAccessControlPolicyRequest; import com.cloud.bridge.service.core.s3.S3SetObjectAccessControlPolicyRequest; import com.cloud.bridge.service.exception.InternalErrorException; -/* +/* * Implementation of S3 service requests as operations defined by the interface, com.amazon.s3.AmazonS3SkeletonInterface. - * The operations dispatched from this class are of the form of SOAP operations which define business logic to be executed by the request. + * The operations dispatched from this class are of the form of SOAP operations which define business logic to be executed by the request. * The methods required for S3 services in accordance with the skeleton are either implementations of the following * getBucketLoggingStatus * copyObject @@ -130,7 +130,7 @@ import com.cloud.bridge.service.exception.InternalErrorException; * or throw and Axis2 fault otherwise. * These skeleton methods can be used as the implementation of services to satisfy SOAP calls, but also to provide the output * to be serialized by the AXIOM XML processor. - * + * * */ public class S3SerializableServiceImplementation implements AmazonS3SkeletonInterface { diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java index d103d6cab69..c315db06c57 100644 --- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java +++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java @@ -117,14 +117,14 @@ public class ServiceProvider extends ManagerBase { } public long getManagementHostId() { - // we want to limit mhost within its own session, id of the value will be returned + // we want to limit mhost within its own session, id of the value will be returned long mhostId = 0; if (mhost != null) mhostId = mhost.getId() != null ? mhost.getId().longValue() : 0L; return mhostId; } - /** + /** * We return a 2-tuple to distinguish between two cases: * (1) there is no entry in the map for bucketName, and (2) there is a null entry * in the map for bucketName. In case 2, the database was inspected for the @@ -145,7 +145,7 @@ public class ServiceProvider extends ManagerBase { /** * The policy parameter can be set to null, which means that there is no policy * for the bucket so a database lookup is not necessary. - * + * * @param bucketName * @param policy */ diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateKeyPair.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateKeyPair.java index 0f005261396..bd72d4b8458 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateKeyPair.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateKeyPair.java @@ -21,7 +21,7 @@ public class EC2CreateKeyPair { private String keyName; /** - * + * */ public EC2CreateKeyPair() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateVolume.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateVolume.java index 0e6717922b6..a33bcbbdb11 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateVolume.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2CreateVolume.java @@ -35,7 +35,7 @@ public class EC2CreateVolume { /** * Define the size of the volume to create - * + * * @param size - valid values are [1 .. 1024] and represent gigBytes */ public void setSize(String size) { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DeleteKeyPair.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DeleteKeyPair.java index e75dca737e5..9518fb5a0d2 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DeleteKeyPair.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DeleteKeyPair.java @@ -22,7 +22,7 @@ public class EC2DeleteKeyPair { private String keyName; /** - * + * */ public EC2DeleteKeyPair() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java index 0b387501051..215ad7627c3 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java @@ -25,7 +25,7 @@ public class EC2DescribeKeyPairsResponse { protected List keyPairSet = new ArrayList(); /** - * + * */ public EC2DescribeKeyPairsResponse() { } diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DisassociateAddress.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DisassociateAddress.java index 0beb627aec5..c91e3be5fbe 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DisassociateAddress.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DisassociateAddress.java @@ -21,7 +21,7 @@ public class EC2DisassociateAddress { private String publicIp; /** - * + * */ public EC2DisassociateAddress() { setPublicIp(null); diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java index 843fdb274cc..cb3beec559a 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java @@ -114,7 +114,7 @@ public class EC2Engine extends ManagerBase { * Which management server to we talk to? * Load a mapping form Amazon values for 'instanceType' to cloud defined * diskOfferingId and serviceOfferingId. - * + * * @throws IOException */ private void loadConfigValues() throws IOException { @@ -179,7 +179,7 @@ public class EC2Engine extends ManagerBase { /** * Helper function to manage the api connection - * + * * @return */ private CloudStackApi getApi() { @@ -195,7 +195,7 @@ public class EC2Engine extends ManagerBase { /** * Verifies account can access CloudStack - * + * * @param accessKey * @param secretKey * @return @@ -240,7 +240,7 @@ public class EC2Engine extends ManagerBase { /** * Creates a security group - * + * * @param groupName * @param groupDesc * @return @@ -261,7 +261,7 @@ public class EC2Engine extends ManagerBase { /** * Deletes a security group - * + * * @param groupName * @return */ @@ -281,7 +281,7 @@ public class EC2Engine extends ManagerBase { /** * returns a list of security groups - * + * * @param request * @return */ @@ -303,7 +303,7 @@ public class EC2Engine extends ManagerBase { /** * CloudStack supports revoke only by using the ruleid of the ingress rule. * We list all security groups and find the matching group and use the first ruleId we find. - * + * * @param request * @return */ @@ -345,7 +345,7 @@ public class EC2Engine extends ManagerBase { /** * authorizeSecurityGroup - * + * * @param request - ip permission parameters */ public boolean authorizeSecurityGroup(EC2AuthorizeRevokeSecurityGroup request) { @@ -388,7 +388,7 @@ public class EC2Engine extends ManagerBase { /** * Does the permission from the request (left) match the permission from the cloudStack query (right). * If the cloudStack rule matches then we return its ruleId. - * + * * @param permLeft * @param permRight * @return ruleId of the cloudstack rule @@ -453,7 +453,7 @@ public class EC2Engine extends ManagerBase { /** * Returns a list of all snapshots - * + * * @param request * @return */ @@ -500,7 +500,7 @@ public class EC2Engine extends ManagerBase { /** * Creates a snapshot - * + * * @param volumeId * @return */ @@ -535,7 +535,7 @@ public class EC2Engine extends ManagerBase { /** * Deletes a snapshot - * + * * @param snapshotId * @return */ @@ -557,7 +557,7 @@ public class EC2Engine extends ManagerBase { /** * Modify an existing template - * + * * @param request * @return */ @@ -642,7 +642,7 @@ public class EC2Engine extends ManagerBase { // handlers /** * return password data from the instance - * + * * @param instanceId * @return */ @@ -663,7 +663,7 @@ public class EC2Engine extends ManagerBase { /** * Lists SSH KeyPairs on the system - * + * * @param request * @return */ @@ -683,7 +683,7 @@ public class EC2Engine extends ManagerBase { /** * Delete SSHKeyPair - * + * * @param request * @return */ @@ -704,7 +704,7 @@ public class EC2Engine extends ManagerBase { /** * Create SSHKeyPair - * + * * @param request * @return */ @@ -728,7 +728,7 @@ public class EC2Engine extends ManagerBase { /** * Import an existing SSH KeyPair - * + * * @param request * @return */ @@ -751,7 +751,7 @@ public class EC2Engine extends ManagerBase { /** * list ip addresses that have been allocated - * + * * @param request * @return */ @@ -771,7 +771,7 @@ public class EC2Engine extends ManagerBase { /** * release an IP Address - * + * * @param request * @return */ @@ -794,7 +794,7 @@ public class EC2Engine extends ManagerBase { /** * Associate an address with an instance - * + * * @param request * @return */ @@ -825,7 +825,7 @@ public class EC2Engine extends ManagerBase { /** * Disassociate an address from an instance - * + * * @param request * @return */ @@ -849,7 +849,7 @@ public class EC2Engine extends ManagerBase { /** * Allocate an address - * + * * @param request * @return */ @@ -887,7 +887,7 @@ public class EC2Engine extends ManagerBase { /** * List of templates available. We only support the imageSet version of this call or when no search parameters are passed * which results in asking for all templates. - * + * * @param request * @return */ @@ -921,10 +921,10 @@ public class EC2Engine extends ManagerBase { * 1) listVolumes&virtualMachineId= -- gets the volumeId * 2) listVirtualMachinees&id= -- gets the templateId * 3) listTemplates&id= -- gets the osTypeId - * + * * If we have to start and stop the VM in question then this function is * going to take a long time to complete. - * + * * @param request * @return */ @@ -985,7 +985,7 @@ public class EC2Engine extends ManagerBase { /** * Register a template - * + * * @param request * @return */ @@ -1015,7 +1015,7 @@ public class EC2Engine extends ManagerBase { * Deregister a template(image) * Our implementation is different from Amazon in that we do delete the template * when we deregister it. The cloud API has not deregister call. - * + * * @param image * @return */ @@ -1032,7 +1032,7 @@ public class EC2Engine extends ManagerBase { /** * list instances - * + * * @param request * @return */ @@ -1050,7 +1050,7 @@ public class EC2Engine extends ManagerBase { /** * list Zones - * + * * @param request * @return */ @@ -1070,7 +1070,7 @@ public class EC2Engine extends ManagerBase { /** * list volumes - * + * * @param request * @return */ @@ -1097,7 +1097,7 @@ public class EC2Engine extends ManagerBase { /** * Attach a volume to an instance - * + * * @param request * @return */ @@ -1131,7 +1131,7 @@ public class EC2Engine extends ManagerBase { /** * Detach a volume from an instance - * + * * @param request * @return */ @@ -1181,7 +1181,7 @@ public class EC2Engine extends ManagerBase { /** * Create a volume - * + * * @param request * @return */ @@ -1240,7 +1240,7 @@ public class EC2Engine extends ManagerBase { /** * Delete a volume - * + * * @param request * @return */ @@ -1332,7 +1332,7 @@ public class EC2Engine extends ManagerBase { /** * Reboot an instance or instances - * + * * @param request * @return */ @@ -1369,7 +1369,7 @@ public class EC2Engine extends ManagerBase { /** * Using a template (AMI), launch n instances - * + * * @param request * @return */ @@ -1488,7 +1488,7 @@ public class EC2Engine extends ManagerBase { /** * Start an instance or instances - * + * * @param request * @return */ @@ -1528,7 +1528,7 @@ public class EC2Engine extends ManagerBase { /** * Stop an instance or instances - * + * * @param request * @return */ @@ -1617,7 +1617,7 @@ public class EC2Engine extends ManagerBase { * RunInstances includes a min and max count of requested instances to create. * We have to be able to create the min number for the user or none at all. So * here we determine what the user has left to create. - * + * * @return -1 means no limit exists, other positive numbers give max number left that * the user can create. */ @@ -1655,7 +1655,7 @@ public class EC2Engine extends ManagerBase { /** * Performs the cloud API listVirtualMachines one or more times. - * + * * @param virtualMachineIds - an array of instances we are interested in getting information on * @param ifs - filter out unwanted instances */ @@ -1678,7 +1678,7 @@ public class EC2Engine extends ManagerBase { /** * Get one or more templates depending on the volumeId parameter. - * + * * @param volumeId - if interested in one specific volume, null if want to list all volumes * @param instanceId - if interested in volumes for a specific instance, null if instance is not important */ @@ -1736,9 +1736,9 @@ public class EC2Engine extends ManagerBase { * Translate the given zone name into the required zoneId. Query for * a list of all zones and match the zone name given. Amazon uses zone * names while the Cloud API often requires the zoneId. - * + * * @param zoneName - (e.g., 'AH'), if null return the first zone in the available list - * + * * @return the zoneId that matches the given zone name */ private String toZoneId(String zoneName, String domainId) throws Exception { @@ -1766,7 +1766,7 @@ public class EC2Engine extends ManagerBase { /** * Convert from the Amazon instanceType strings to Cloud serviceOfferingId - * + * */ private CloudStackServiceOfferingVO getCSServiceOfferingId(String instanceType) throws Exception { @@ -1783,7 +1783,7 @@ public class EC2Engine extends ManagerBase { /** * Convert from the Cloud serviceOfferingId to the Amazon instanceType strings based * on the loaded map. - * + * * @param serviceOfferingId * @return A valid value for the Amazon defined instanceType * @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException @@ -1806,7 +1806,7 @@ public class EC2Engine extends ManagerBase { /** * Match the value in the 'description' field of the listOsTypes response to get * the osTypeId. - * + * * @param osTypeName * @return the Cloud.com API osTypeId */ @@ -1828,9 +1828,9 @@ public class EC2Engine extends ManagerBase { /** * More than one place we need to access the defined list of zones. If given a specific * list of zones of interest, then only values from those zones are returned. - * + * * @param interestedZones - can be null, should be a subset of all zones - * + * * @return EC2DescribeAvailabilityZonesResponse */ private EC2DescribeAvailabilityZonesResponse listZones(String[] interestedZones, String domainId) throws Exception { @@ -1865,11 +1865,11 @@ public class EC2Engine extends ManagerBase { /** * Get information on one or more virtual machines depending on the instanceId parameter. - * + * * @param instanceId - if null then return information on all existing instances, otherwise * just return information on the matching instance. * @param instances - a container object to fill with one or more EC2Instance objects - * + * * @return the same object passed in as the "instances" parameter modified with one or more * EC2Instance objects loaded. */ @@ -1938,11 +1938,11 @@ public class EC2Engine extends ManagerBase { /** * Get one or more templates depending on the templateId parameter. - * + * * @param templateId - if null then return information on all existing templates, otherwise * just return information on the matching template. * @param images - a container object to fill with one or more EC2Image objects - * + * * @return the same object passed in as the "images" parameter modified with one or more * EC2Image objects loaded. */ @@ -2022,7 +2022,7 @@ public class EC2Engine extends ManagerBase { /** * List security groups - * + * * @param interestedGroups * @return * @throws EC2ServiceException @@ -2199,7 +2199,7 @@ public class EC2Engine extends ManagerBase { /** * Convert ingress rule to EC2IpPermission records - * + * * @param response * @param group * @return @@ -2234,7 +2234,7 @@ public class EC2Engine extends ManagerBase { /** * Find the current account based on the SecretKey - * + * * @return * @throws Exception */ @@ -2265,7 +2265,7 @@ public class EC2Engine extends ManagerBase { /** * List networkOfferings by zone with securityGroup enabled - * + * * @param zoneId * @return * @throws Exception @@ -2283,7 +2283,7 @@ public class EC2Engine extends ManagerBase { /** * Create a network - * + * * @param zoneId * @param offering * @param owner @@ -2297,7 +2297,7 @@ public class EC2Engine extends ManagerBase { /** * List of networks without securityGroup enabled by zone - * + * * @param zoneId * @return * @throws Exception @@ -2349,7 +2349,7 @@ public class EC2Engine extends ManagerBase { /** * Find a suitable network to use for deployVM - * + * * @param zone * @return * @throws Exception @@ -2403,7 +2403,7 @@ public class EC2Engine extends ManagerBase { /** * Windows has its own device strings. - * + * * @param hypervisor * @param deviceId * @return @@ -2462,7 +2462,7 @@ public class EC2Engine extends ManagerBase { /** * Translate the device name string into a Cloud Stack deviceId. * deviceId 3 is reserved for CDROM and 0 for the ROOT disk - * + * * @param device string * @return deviceId value */ @@ -2524,7 +2524,7 @@ public class EC2Engine extends ManagerBase { /** * Map CloudStack instance state to Amazon state strings - * + * * @param state * @return */ @@ -2606,7 +2606,7 @@ public class EC2Engine extends ManagerBase { /** * Stop an instance * Wait until one specific VM has stopped - * + * * @param instanceId * @return * @throws Exception @@ -2625,7 +2625,7 @@ public class EC2Engine extends ManagerBase { /** * Start an existing stopped instance(VM) - * + * * @param instanceId * @return * @throws Exception @@ -2644,7 +2644,7 @@ public class EC2Engine extends ManagerBase { /** * Cloud Stack API takes a comma separated list as a parameter. - * + * * @throws UnsupportedEncodingException */ private String constructList(String[] elements) throws UnsupportedEncodingException { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Filter.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Filter.java index dbfd8146d5b..41fbc363860 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Filter.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Filter.java @@ -40,9 +40,9 @@ public class EC2Filter { } /** - * From Amazon: - * "You can use wildcards with the filter values: * matches zero or more characters, and ? matches - * exactly one character. You can escape special characters using a backslash before the character. For + * From Amazon: + * "You can use wildcards with the filter values: * matches zero or more characters, and ? matches + * exactly one character. You can escape special characters using a backslash before the character. For * example, a value of \*amazon\?\\ searches for the literal string *amazon?\. " */ public void addValueEncoded(String param) { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java index 80252f98787..92072d384dc 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java @@ -66,10 +66,10 @@ public class EC2GroupFilterSet { /** * For a filter to match a snapshot just one of its values has to match the volume. * For a snapshot to be included in the instance response it must pass all the defined filters. - * + * * @param sampleList - list of snapshots to test against the defined filters * @return EC2DescribeSnapshotsResponse - * @throws ParseException + * @throws ParseException */ public EC2DescribeSecurityGroupsResponse evaluate(EC2DescribeSecurityGroupsResponse sampleList) throws ParseException { EC2DescribeSecurityGroupsResponse resultList = new EC2DescribeSecurityGroupsResponse(); diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2ImportKeyPair.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2ImportKeyPair.java index 65d94a57a32..09bb3b5f738 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2ImportKeyPair.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2ImportKeyPair.java @@ -23,7 +23,7 @@ public class EC2ImportKeyPair { private String publicKeyMaterial; /** - * + * */ public EC2ImportKeyPair() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java index 1e8bdf2e81f..5753cb78d4b 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2InstanceFilterSet.java @@ -70,10 +70,10 @@ public class EC2InstanceFilterSet { /** * For a filter to match an instance just one of its values has to match the volume. * For an instance to be included in the instance response it must pass all the defined filters. - * + * * @param sampleList - list of instances to test against the defined filters * @return EC2DescribeInstancesResponse - * @throws ParseException + * @throws ParseException */ public EC2DescribeInstancesResponse evaluate(EC2DescribeInstancesResponse sampleList) throws ParseException { EC2DescribeInstancesResponse resultList = new EC2DescribeInstancesResponse(); diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2IpPermission.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2IpPermission.java index ca615a7e956..58cb37414dd 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2IpPermission.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2IpPermission.java @@ -28,7 +28,7 @@ public class EC2IpPermission { private String icmpType; private Integer fromPort; private Integer toPort; - private List userSet = new ArrayList(); // a list of groups identifying users + private List userSet = new ArrayList(); // a list of groups identifying users private List rangeSet = new ArrayList(); // a list of strings identifying CIDR public EC2IpPermission() { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java index 1a634405d57..74154eaa624 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2RegisterImage.java @@ -65,7 +65,7 @@ public class EC2RegisterImage { /** * We redefine the expected format of this field to be: * "format:zonename:ostypename:hypervisor" - * + * * @param param */ public void setArchitecture(String param) { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java index 598480ad4e0..03383f166ff 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2SnapshotFilterSet.java @@ -69,10 +69,10 @@ public class EC2SnapshotFilterSet { /** * For a filter to match a snapshot just one of its values has to match the volume. * For a snapshot to be included in the instance response it must pass all the defined filters. - * + * * @param sampleList - list of snapshots to test against the defined filters * @return EC2DescribeSnapshotsResponse - * @throws ParseException + * @throws ParseException */ public EC2DescribeSnapshotsResponse evaluate(EC2DescribeSnapshotsResponse sampleList) throws ParseException { EC2DescribeSnapshotsResponse resultList = new EC2DescribeSnapshotsResponse(); diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java index 26b2003ac92..91aff0ad020 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2VolumeFilterSet.java @@ -71,10 +71,10 @@ public class EC2VolumeFilterSet { /** * For a filter to match a volume just one of its values has to match the volume. * For a volume to be included in the volume response it must pass all the defined filters. - * + * * @param sampleList - list of volumes to test against the defined filters * @return EC2DescribeVolumeResponse - * @throws ParseException + * @throws ParseException */ public EC2DescribeVolumesResponse evaluate(EC2DescribeVolumesResponse sampleList) throws ParseException { EC2DescribeVolumesResponse resultList = new EC2DescribeVolumesResponse(); diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3BucketPolicy.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3BucketPolicy.java index a89e87ffcf5..4d338861f44 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3BucketPolicy.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3BucketPolicy.java @@ -27,7 +27,7 @@ public class S3BucketPolicy { /** * 'NORESULT' is returned when no applicable statement can be found to evaluate * for the S3 access request. If no evaluated statement results to true then the - * default deny result is returned (allow ACL definitions to override it). + * default deny result is returned (allow ACL definitions to override it). */ public enum PolicyAccess { ALLOW, DEFAULT_DENY, DENY @@ -68,13 +68,13 @@ public class S3BucketPolicy { /** * This function evaluates all applicable policy statements. Following the "evaluation logic" * as defined by Amazon the type of access derived from the policy is returned. - * - * @param context - parameters from either the REST or SOAP request + * + * @param context - parameters from either the REST or SOAP request * @param objectToAccess - key to the S3 object in the bucket associated by this policy, should be * null if access is just to the bucket. * @param userAccount - the user performing the access request * @return PolicyAccess type - * @throws Exception + * @throws Exception */ public PolicyAccess eval(S3PolicyContext context, String userAccount) throws Exception { PolicyAccess result = PolicyAccess.DEFAULT_DENY; @@ -83,7 +83,7 @@ public class S3BucketPolicy { while (itr.hasNext()) { S3PolicyStatement oneStatement = itr.next(); if (statementIsRelevant(oneStatement, context.getKeyName(), userAccount, context.getRequestedAction())) { - // -> a missing condition block means the statement is true + // -> a missing condition block means the statement is true S3PolicyConditionBlock block = oneStatement.getConditionBlock(); if (null == block || block.isTrue(context, oneStatement.getSid())) { result = oneStatement.getEffect(); @@ -118,7 +118,7 @@ public class S3BucketPolicy { /** * Does the Policy Statement have anything to do with the requested access by the user? - * + * * @return true - statement is relevant, false it is not */ private boolean statementIsRelevant(S3PolicyStatement oneStatement, String objectToAccess, String userAccount, PolicyActions operationRequested) { diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ConditionalHeaders.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ConditionalHeaders.java index c345b04713e..1793df2de27 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ConditionalHeaders.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ConditionalHeaders.java @@ -75,7 +75,7 @@ public class S3ConditionalHeaders { /** * Takes the header value from HTTP "If-Match", for example is: * If-Match: "xyzzy", "r2d2xxxx", "c3piozzzz" - * + * * @param ifMatch */ public void setMatch(String ifMatch) { @@ -119,7 +119,7 @@ public class S3ConditionalHeaders { /** * Has the object been modified since the client has last checked? - * + * * @param lastModified * @return a negative value means that the object has not been modified since * a postive value means that this test should be ignored. @@ -136,7 +136,7 @@ public class S3ConditionalHeaders { /** * Has the object been modified since the unmodified date? - * + * * @param lastModified * @return a negative value means that the object has been modified since * a postive value means that this test should be ignored. @@ -154,7 +154,7 @@ public class S3ConditionalHeaders { /** * Does the object's contents (its MD5 signature) match what the client thinks * it is? - * + * * @param ETag - an MD5 signature of the content of the data being stored in S3 * @return a negative value means that the test has failed, * a positive value means that the test succeeded or could not be done (so ignore it) @@ -173,7 +173,7 @@ public class S3ConditionalHeaders { /** * None of the given ETags in the "If-None-Match" can match the ETag parameter for this * function to pass. - * + * * @param ETag - an MD5 signature of the content of the data being stored in S3 * @return a negative value means that the test has failed, * a positive value means that the test succeeded or could not be done (so ignore it) diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3CopyObjectResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3CopyObjectResponse.java index 3a26432b451..895cdb6af41 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3CopyObjectResponse.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3CopyObjectResponse.java @@ -19,7 +19,7 @@ package com.cloud.bridge.service.core.s3; import java.util.Calendar; public class S3CopyObjectResponse extends S3Response { - // -> 2 versions are important here: + // -> 2 versions are important here: // (1) copyVersion: the version of the object's copy // (2) putVersion: the version assigned to the copy after it is put protected String copyVersion; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java index 54b0c11ac6c..1af86ae9805 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java @@ -137,7 +137,7 @@ public class S3Engine { /** * Return a S3CopyObjectResponse which represents an object being copied from source - * to destination bucket. + * to destination bucket. * Called from S3ObjectAction when copying an object. * This can be treated as first a GET followed by a PUT of the object the user wants to copy. */ @@ -188,7 +188,7 @@ public class S3Engine { else putRequest.setMetaEntries(request.getMetaEntries()); putRequest.setAcl(request.getAcl()); // -> if via a SOAP call - putRequest.setCannedAccess(request.getCannedAccess()); // -> if via a REST call + putRequest.setCannedAccess(request.getCannedAccess()); // -> if via a REST call putRequest.setContentLength(originalObject.getContentLength()); putRequest.setData(originalObject.getData()); @@ -250,7 +250,7 @@ public class S3Engine { } /** - * Return a S3Response which represents the effect of an object being deleted from its bucket. + * Return a S3Response which represents the effect of an object being deleted from its bucket. * Called from S3BucketAction when deleting an object. */ @@ -291,9 +291,9 @@ public class S3Engine { bucketAdapter.deleteContainer(host_storagelocation_pair.getSecond(), request.getBucketName()); // Cascade-deleting can delete related SObject/SObjectItem objects, but not SAcl, SMeta and policy objects. - // To delete SMeta & SAcl objects: - // (1)Get all the objects in the bucket, - // (2)then all the items in each object, + // To delete SMeta & SAcl objects: + // (1)Get all the objects in the bucket, + // (2)then all the items in each object, // (3) then all meta & acl data for each item Set objectsInBucket = sbucket.getObjectsInBucket(); Iterator it = objectsInBucket.iterator(); @@ -331,7 +331,7 @@ public class S3Engine { } /** - * Return a S3ListBucketResponse which represents a list of up to 1000 objects contained ins the bucket. + * Return a S3ListBucketResponse which represents a list of up to 1000 objects contained ins the bucket. * Called from S3BucketAction for GETting objects and for GETting object versions. */ @@ -362,7 +362,7 @@ public class S3Engine { context.setEvalParam(ConditionKeys.Delimiter, delimiter); verifyAccess(context, "SBucket", sbucket.getId(), SAcl.PERMISSION_READ); - // Wen execting the query, request one more item so that we know how to set isTruncated flag + // Wen execting the query, request one more item so that we know how to set isTruncated flag List l = null; if (includeVersions) @@ -388,7 +388,7 @@ public class S3Engine { } /** - * Return a S3ListAllMyBucketResponse which represents a list of all buckets owned by the requester. + * Return a S3ListAllMyBucketResponse which represents a list of all buckets owned by the requester. * Called from S3BucketAction for GETting all buckets. * To check on bucket policies defined we have to (look for and) evaluate the policy on each * bucket the user owns. @@ -535,7 +535,7 @@ public class S3Engine { /** * The initiator must have permission to write to the bucket in question in order to initiate - * a multipart upload. Also check to make sure the special folder used to store parts of + * a multipart upload. Also check to make sure the special folder used to store parts of * a multipart exists for this bucket. * Called from S3ObjectAction during many stages of multipart upload. */ @@ -573,7 +573,7 @@ public class S3Engine { } /** - * Save the object fragment in a special (i.e., hidden) directory inside the same mount point as + * Save the object fragment in a special (i.e., hidden) directory inside the same mount point as * the bucket location that the final object will be stored in. * Called from S3ObjectAction during many stages of multipart upload. * @param request @@ -632,13 +632,13 @@ public class S3Engine { } /** - * Create the real object represented by all the parts of the multipart upload. + * Create the real object represented by all the parts of the multipart upload. * Called from S3ObjectAction at completion of multipart upload. - * @param httpResp - Servlet response handle to return the headers of the response (including version header) + * @param httpResp - Servlet response handle to return the headers of the response (including version header) * @param request - Normal parameters needed to create a new object (including metadata) * @param parts - List of files that make up the multipart * @param outputStream - Response output stream - * N.B. - This method can be long-lasting + * N.B. - This method can be long-lasting * We are required to keep the connection alive by returning whitespace characters back periodically. */ @@ -698,7 +698,7 @@ public class S3Engine { } /** - * Return a S3PutObjectInlineResponse which represents an object being created into a bucket + * Return a S3PutObjectInlineResponse which represents an object being created into a bucket * Called from S3ObjectAction when PUTting or POTing an object. */ @DB @@ -759,7 +759,7 @@ public class S3Engine { } /** - * Return a S3PutObjectResponse which represents an object being created into a bucket + * Return a S3PutObjectResponse which represents an object being created into a bucket * Called from S3RestServlet when processing a DIME request. */ @@ -775,7 +775,7 @@ public class S3Engine { if (bucket == null) throw new NoSuchObjectException("Bucket " + bucketName + " does not exist"); - // Is the caller allowed to write the object? + // Is the caller allowed to write the object? // The allocObjectItem checks for the bucket policy PutObject permissions OrderedPair object_objectitem_pair = allocObjectItem(bucket, key, meta, acl, null); OrderedPair host_storagelocation_pair = getBucketStorageHost(bucket); @@ -818,8 +818,8 @@ public class S3Engine { } /** - * The ACL of an object is set at the object version level. By default, PUT sets the ACL of the latest - * version of an object. To set the ACL of a different version, using the versionId subresource. + * The ACL of an object is set at the object version level. By default, PUT sets the ACL of the latest + * version of an object. To set the ACL of a different version, using the versionId subresource. * Called from S3ObjectAction to PUT an object's ACL. */ @@ -884,7 +884,7 @@ public class S3Engine { } /** - * By default, GET returns ACL information about the latest version of an object. To return ACL + * By default, GET returns ACL information about the latest version of an object. To return ACL * information about a different version, use the versionId subresource * Called from S3ObjectAction to get an object's ACL. */ @@ -1028,8 +1028,8 @@ public class S3Engine { return response; } - // [D] Return the contents of the object inline - // -> extract the meta data that corresponds the specific versioned item + // [D] Return the contents of the object inline + // -> extract the meta data that corresponds the specific versioned item List itemMetaData = metaDao.getByTarget("SObjectItem", item.getId()); if (null != itemMetaData) { @@ -1149,7 +1149,7 @@ public class S3Engine { } else { // If there is no item with a null version then we are done if (null == item.getVersion()) { - // Otherwiswe remove the entire object + // Otherwiswe remove the entire object // Cascade-deleting can delete related SObject/SObjectItem objects, but not SAcl and SMeta objects. storedPath = item.getStoredPath(); deleteMetaData(item.getId()); @@ -1230,11 +1230,11 @@ public class S3Engine { } /** - * The 'versionIdMarker' parameter only makes sense if enableVersion is true. + * The 'versionIdMarker' parameter only makes sense if enableVersion is true. * versionIdMarker is the starting point to return information back. So for example if an * object has versions 1,2,3,4,5 and the versionIdMarker is '3', then 3,4,5 will be returned * by this function. If the versionIdMarker is null then all versions are returned. - * + * * TODO - how does the versionIdMarker work when there is a deletion marker in the object? */ private S3ListBucketObjectEntry[] @@ -1357,7 +1357,7 @@ public class S3Engine { /** * Locate the folder to hold upload parts at the same mount point as the upload's final bucket * location. Create the upload folder dynamically. - * + * * @param bucketName */ private void createUploadFolder(String bucketName) { @@ -1372,7 +1372,7 @@ public class S3Engine { * The overrideName is used to create a hidden storage bucket (folder) in the same location * as the given bucketName. This can be used to create a folder for parts of a multipart * upload for the associated bucket. - * + * * @param bucketName * @param overrideName * @return @@ -1417,12 +1417,12 @@ public class S3Engine { } /** - * If acl is set then the cannedAccessPolicy parameter should be null and is ignored. + * If acl is set then the cannedAccessPolicy parameter should be null and is ignored. * The cannedAccessPolicy parameter is for REST Put requests only where a simple set of ACLs can be - * created with a single header value. Note that we do not currently support "anonymous" un-authenticated + * created with a single header value. Note that we do not currently support "anonymous" un-authenticated * access in our implementation. - * - * @throws IOException + * + * @throws IOException */ @SuppressWarnings("deprecation") public OrderedPair allocObjectItem(SBucketVO bucket, String nameKey, S3MetaDataEntry[] meta, S3AccessControlList acl, String cannedAccessPolicy) { @@ -1540,7 +1540,7 @@ public class S3Engine { * Note that canned policies can be set when the object's contents are set */ public void setCannedAccessControls(String cannedAccessPolicy, String target, long objectId, SBucketVO bucket) { - // Find the permission and symbol for the principal corresponding to the requested cannedAccessPolicy + // Find the permission and symbol for the principal corresponding to the requested cannedAccessPolicy Triple permission_permission_symbol_triple = SAclVO.getCannedAccessControls(cannedAccessPolicy, target, bucket.getOwnerCanonicalId()); if (null == permission_permission_symbol_triple.getThird()) setSingleAcl(target, objectId, permission_permission_symbol_triple.getFirst()); @@ -1568,8 +1568,8 @@ public class S3Engine { } /** - * The Cloud Stack API Access key is used for for the Canonical User Id everywhere (buckets and objects). - * + * The Cloud Stack API Access key is used for for the Canonical User Id everywhere (buckets and objects). + * * @param owner - this can be the Cloud Access Key for a bucket owner or one of the * following special symbols: * (a) '*' - any principal authenticated user (i.e., any user with a registered Cloud Access Key) @@ -1585,7 +1585,7 @@ public class S3Engine { defaultGrant.setPermission(permission1); defaultAcl.addGrant(defaultGrant); - // -> bucket owner + // -> bucket owner defaultGrant = new S3Grant(); defaultGrant.setGrantee(SAcl.GRANTEE_USER); defaultGrant.setCanonicalUserID(owner); @@ -1622,13 +1622,13 @@ public class S3Engine { /** * To determine access to a bucket or an object in a bucket evaluate first a define * bucket policy and then any defined ACLs. - * + * * @param context - all data needed for bucket policies * @param target - used for ACL evaluation, object identifier * @param targetId - used for ACL evaluation * @param requestedPermission - ACL type access requested - * - * @throws ParseException, SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException + * + * @throws ParseException, SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException */ public static void verifyAccess(S3PolicyContext context, String target, long targetId, int requestedPermission) { switch (verifyPolicy(context)) { @@ -1648,12 +1648,12 @@ public class S3Engine { /** * This method verifies that the accessing client has the requested * permission on the object/bucket/Acl represented by the tuple: - * + * * For cases where an ACL is meant for any authenticated user we place a "*" for the - * Canonical User Id. N.B. - "*" is not a legal Cloud (Bridge) Access key. - * - * For cases where an ACL is meant for any anonymous user (or 'AllUsers') we place a "A" for the - * Canonical User Id. N.B. - "A" is not a legal Cloud (Bridge) Access key. + * Canonical User Id. N.B. - "*" is not a legal Cloud (Bridge) Access key. + * + * For cases where an ACL is meant for any anonymous user (or 'AllUsers') we place a "A" for the + * Canonical User Id. N.B. - "A" is not a legal Cloud (Bridge) Access key. */ public static void accessAllowed(String target, long targetId, int requestedPermission) { if (SAcl.PERMISSION_PASS == requestedPermission) @@ -1679,10 +1679,10 @@ public class S3Engine { /** * This method assumes that the bucket has been tested to make sure it exists before * it is called. - * - * @param context + * + * @param context * @return S3BucketPolicy - * @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException, ParseException + * @throws SQLException, ClassNotFoundException, IllegalAccessException, InstantiationException, ParseException */ public static S3BucketPolicy loadPolicy(S3PolicyContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException, ParseException { OrderedPair result = ServiceProvider.getInstance().getBucketPolicy(context.getBucketName()); @@ -1795,11 +1795,11 @@ public class S3Engine { /** * ifRange is true and ifUnmodifiedSince or IfMatch fails then we return the entire object (indicated by * returning a -1 as the function result. - * + * * @param ifCond - conditional get defined by these tests * @param lastModified - value used on ifModifiedSince or ifUnmodifiedSince * @param ETag - value used on ifMatch and ifNoneMatch - * @param ifRange - using an if-Range HTTP functionality + * @param ifRange - using an if-Range HTTP functionality * @return -1 means return the entire object with an HTTP 200 (not a subrange) */ private int conditionPassed(S3ConditionalHeaders ifCond, Date lastModified, String ETag, boolean ifRange) { diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java index 0d29b426ce2..16adbdef00d 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Grant.java @@ -25,7 +25,7 @@ import com.cloud.bridge.service.exception.UnsupportedException; /** * Each relation holds - * a grantee - which is one of SAcl.GRANTEE_USER, SAcl.GRANTEE_ALLUSERS, SAcl.GRANTEE_AUTHENTICATED + * a grantee - which is one of SAcl.GRANTEE_USER, SAcl.GRANTEE_ALLUSERS, SAcl.GRANTEE_AUTHENTICATED * a permission - which is one of SAcl.PERMISSION_PASS, SAcl.PERMISSION_NONE, SAcl.PERMISSION_READ, * SAcl.PERMISSION_WRITE, SAcl.PERMISSION_READ_ACL, SAcl.PERMISSION_WRITE_ACL, SAcl.PERMISSION_FULL * canonicalUserID diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java index 145923a58bd..45c8b936e9d 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3HostCallingFormat.java @@ -26,7 +26,7 @@ import java.util.Map; * AWS S3 in constructing the URL for requesting RESTful services. The three possibilities are * (*) hostname followed by bucket as path information (sometimes termed the path style) * (*) bucketname before hostname, so that bucketname appears addressible as a subdomain (termed the subdomain style) - * (*) bucketname as a DNS resolvable entry so that path information conveys extra parameters (termed the + * (*) bucketname as a DNS resolvable entry so that path information conveys extra parameters (termed the * virtual hosting style). * The path information is held as a Map of key-value pairs termed pathArgs. * Specification as provided at http://docs.amazonwebservices.com/AmazonS3/latest/dev/VirtualHosting.html. diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java index 4ad05074d45..85c412eb6c3 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3ListAllMyBucketsEntry.java @@ -41,7 +41,7 @@ public class S3ListAllMyBucketsEntry { // java.util.Date d = creationDate.getTime(); // com.cloud.bridge.util.ISO8601SimpleDateTimeFormat sdf = new com.cloud.bridge.util.ISO8601SimpleDateTimeFormat(); - // sdf.format(d); + // sdf.format(d); // java.lang.StringBuffer b = com.cloud.bridge.util.ISO8601SimpleDateTimeFormat.format(d); return b; return creationDate; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java index f0773ea1017..01d14be8f03 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyArnCondition.java @@ -54,9 +54,9 @@ public class S3PolicyArnCondition extends S3PolicyCondition { return keys.get(key); } - /** + /** * Convert the key's values into the type depending on the what the condition expects. - * @throws ParseException + * @throws ParseException */ public void setKey(ConditionKeys key, String[] values) throws ParseException { if (PolicyConditions.ArnLike == condition || PolicyConditions.ArnNotLike == condition) { diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java index bdf2dc51c5e..7b54dd0e8ec 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyBoolCondition.java @@ -53,11 +53,11 @@ public class S3PolicyBoolCondition extends S3PolicyCondition { return keys.get(key); } - /** + /** * Documentation on Bool conditions is nearly non-existent. Only found that - * the 'SecureTransport' key is relvant and have not found any examples. - * - * @throws ParseException + * the 'SecureTransport' key is relvant and have not found any examples. + * + * @throws ParseException */ public void setKey(ConditionKeys key, String[] values) throws ParseException { keys.put(key, values); diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java index 98ab7c7cd36..f96a3eb4bbf 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyConditionBlock.java @@ -44,7 +44,7 @@ public class S3PolicyConditionBlock { * the entire block evaluate to false. If no conditions are present and the * condition is relevant to the request, then the default condition is considered * to be true. - * @throws Exception + * @throws Exception */ public boolean isTrue(S3PolicyContext context, String SID) throws Exception { Iterator itr = conditionList.iterator(); diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java index 9dcde934678..70ed1178fb0 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyDateCondition.java @@ -57,9 +57,9 @@ public class S3PolicyDateCondition extends S3PolicyCondition { return keys.get(key); } - /** + /** * Convert the key's values into the type depending on the what the condition expects. - * @throws ParseException + * @throws ParseException */ public void setKey(ConditionKeys key, String[] values) throws ParseException { Calendar[] dates = new Calendar[values.length]; @@ -82,7 +82,7 @@ public class S3PolicyDateCondition extends S3PolicyCondition { * Evaluation logic is as follows: * 1) An 'AND' operation is used over all defined keys * 2) An 'OR' operation is used over all key values - * + * * Each condition has one or more keys, and each keys have one or more values to test. */ public boolean isTrue(S3PolicyContext context, String SID) { diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java index f50ff3bf02d..a0d667f4fd9 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyIPAddressCondition.java @@ -54,10 +54,10 @@ public class S3PolicyIPAddressCondition extends S3PolicyCondition { return keys.get(key); } - /** + /** * Convert the key's values into the type depending on the what the condition expects. - * @throws ParseException - * @throws IOException + * @throws ParseException + * @throws IOException */ public void setKey(ConditionKeys key, String[] values) throws ParseException, Exception { IpAddressRange[] addresses = new IpAddressRange[values.length]; @@ -77,8 +77,8 @@ public class S3PolicyIPAddressCondition extends S3PolicyCondition { if (!itr.hasNext()) return false; - // -> returns the Internet Protocol (IP) address of the client or last proxy that sent the request. - // For HTTP servlets, same as the value of the CGI variable REMOTE_ADDR. + // -> returns the Internet Protocol (IP) address of the client or last proxy that sent the request. + // For HTTP servlets, same as the value of the CGI variable REMOTE_ADDR. IpAddressRange toCompareWith = IpAddressRange.parseRange(context.getRemoveAddr()); if (null == toCompareWith) return false; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java index 30ff9da13d7..a1f741ccf93 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyNumericCondition.java @@ -52,10 +52,10 @@ public class S3PolicyNumericCondition extends S3PolicyCondition { return keys.get(key); } - /** + /** * Convert the key's values into the type depending on the what * the condition expects. - * @throws ParseException + * @throws ParseException */ public void setKey(ConditionKeys key, String[] values) throws ParseException { Float[] numbers = new Float[values.length]; diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java index 20dcea46716..78eb082ad7d 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PolicyStringCondition.java @@ -54,11 +54,11 @@ public class S3PolicyStringCondition extends S3PolicyCondition { return keys.get(key); } - /** + /** * Convert the key's values into the type depending on the what the condition expects. * To implement "like" tests we use regexes. - * - * @throws ParseException + * + * @throws ParseException */ public void setKey(ConditionKeys key, String[] values) throws ParseException { diff --git a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java index 1ce4756a4c6..44867694b31 100644 --- a/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java +++ b/awsapi/src/com/cloud/bridge/util/AuthenticationUtils.java @@ -31,10 +31,10 @@ public class AuthenticationUtils { /** * The combination of the Issuer and the serial number of a X509 certificate - * must be globally unique. The Issuer can be described by its Distinguished Name (DN). - * The uniqueId is constructed by appending a ", serial=" onto the end of the Issuer's + * must be globally unique. The Issuer can be described by its Distinguished Name (DN). + * The uniqueId is constructed by appending a ", serial=" onto the end of the Issuer's * DN (thus keeping the DN format). - * + * * @param cert */ public static String X509CertUniqueId(Certificate cert) { diff --git a/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java b/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java index eed9edd28ea..db3db752def 100644 --- a/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java +++ b/awsapi/src/com/cloud/bridge/util/DatabindingConverterUtil.java @@ -53,7 +53,7 @@ public class DatabindingConverterUtil extends ConverterUtil { } // Otherwise String convertToString(Object any) is handled by invoker (which happens to be superclass). - // No need to reference super explicitly because it is the invoker of static methods + // No need to reference super explicitly because it is the invoker of static methods // @see org.apache.axis2.databinding.utils.ConverterUtil } diff --git a/awsapi/src/com/cloud/bridge/util/DateHelper.java b/awsapi/src/com/cloud/bridge/util/DateHelper.java index 421f3984f43..8ff9bc1b184 100644 --- a/awsapi/src/com/cloud/bridge/util/DateHelper.java +++ b/awsapi/src/com/cloud/bridge/util/DateHelper.java @@ -46,7 +46,7 @@ public class DateHelper { // convert the string with this value SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz"); - //this is zero time so we need to add that TZ indicator for + //this is zero time so we need to add that TZ indicator for if (dateString.endsWith("Z")) { dateString = dateString.substring(0, dateString.length() - 1) + "GMT-00:00"; } else { // -> -0700 is valid but we need to change it to -07:00 for SimpleDateFormat diff --git a/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java b/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java index 19e91602218..d2f4b1e1b08 100644 --- a/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java +++ b/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java @@ -68,7 +68,7 @@ public class EC2RestAuth { } catch (Exception e) { } - // -> the time zone is GMT if not defined + // -> the time zone is GMT if not defined try { formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); cal.setTime(formatter.parse(created)); @@ -108,8 +108,8 @@ public class EC2RestAuth { /** * Assuming that a port number is to be included. - * - * @param header - contents of the "Host:" header, skipping the 'Host:' preamble. + * + * @param header - contents of the "Host:" header, skipping the 'Host:' preamble. */ public void setHostHeader(String hostHeader) { if (null == hostHeader) @@ -128,7 +128,7 @@ public class EC2RestAuth { /** * The given query string needs to be pulled apart, sorted by paramter name, and reconstructed. * We sort the query string values via a TreeMap. - * + * * @param query - this string still has all URL encoding in place. */ public void setQueryString(String query) { @@ -177,19 +177,19 @@ public class EC2RestAuth { } /** - * The request is authenticated if we can regenerate the same signature given + * The request is authenticated if we can regenerate the same signature given * on the request. Before calling this function make sure to set the header values * defined by the public values above. - * + * * @param httpVerb - the type of HTTP request (e.g., GET, PUT) * @param secretKey - value obtained from the AWSAccessKeyId * @param signature - the signature we are trying to recreate, note can be URL-encoded * @param method - { "HmacSHA1", "HmacSHA256" } - * - * @throws SignatureException - * + * + * @throws SignatureException + * * @return true if request has been authenticated, false otherwise - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException */ public boolean verifySignature(String httpVerb, String secretKey, String signature, String method) throws SignatureException, UnsupportedEncodingException { @@ -218,12 +218,12 @@ public class EC2RestAuth { /** * This function generates the single string that will be used to sign with a users * secret key. - * + * * StringToSign = HTTP-Verb + "\n" + * ValueOfHostHeaderInLowercase + "\n" + - * HTTPRequestURI + "\n" + + * HTTPRequestURI + "\n" + * CanonicalizedQueryString - * + * * @return The single StringToSign or null. */ private String genStringToSign(String httpVerb) { @@ -251,7 +251,7 @@ public class EC2RestAuth { /** * Create a signature by the following method: * new String( Base64( SHA1 or SHA256 ( key, byte array ))) - * + * * @param signIt - the data to generate a keyed HMAC over * @param secretKey - the user's unique key for the HMAC operation * @param useSHA1 - if false use SHA256 diff --git a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java index f515b7091c2..932870a801d 100644 --- a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java +++ b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java @@ -27,20 +27,20 @@ import java.util.Calendar; import java.util.TimeZone; /** - * Format and parse a date string which is expected to be in ISO 8601 DateTimeFormat especially for + * Format and parse a date string which is expected to be in ISO 8601 DateTimeFormat especially for * use in XML documents. - * An example is for use with GMTDateTimeUserType to provide parsing of DateTime format strings into + * An example is for use with GMTDateTimeUserType to provide parsing of DateTime format strings into * accurate Java Date representations based on UTC. * The purpose of this class is to allow the creation of accurate date time representations following * the ISO 8601 format YYYY-MM-DDThh:MM:ss * using the letter "T" as the date/time separator - * This representation may be immediately followed by a "Z" (Zulu i.e. at zero offset from GMT) to indicate UTC - * or, otherwise, to a specific time zone. If a time zone (tz) is encoded then this is held as the difference - * between the local time in the tz and UCT, expressed as a positive(+) or negative(-) offset (hhMM) appended + * This representation may be immediately followed by a "Z" (Zulu i.e. at zero offset from GMT) to indicate UTC + * or, otherwise, to a specific time zone. If a time zone (tz) is encoded then this is held as the difference + * between the local time in the tz and UCT, expressed as a positive(+) or negative(-) offset (hhMM) appended * to the format. * The default case holds no tz information and assumes that a date time representation referenced to Zulu * (i.e. zero offset from GMT) is required. When formatting an existing Date transform it into the Zulu timezone - * so that it is explicitly at GMT with zero offset. This provides the default representation for the encoding + * so that it is explicitly at GMT with zero offset. This provides the default representation for the encoding * of AWS datetime values. * For testing, it may be useful to note that, as at 2012, a city whose time is always in the Zulu timezone is * Reykjavik, Iceland. diff --git a/awsapi/src/com/cloud/bridge/util/IpAddressRange.java b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java index c00b88f2258..9757eb0fa59 100644 --- a/awsapi/src/com/cloud/bridge/util/IpAddressRange.java +++ b/awsapi/src/com/cloud/bridge/util/IpAddressRange.java @@ -20,7 +20,7 @@ import java.io.IOException; /** * Represents a network IP address or a range of addresses. - * A range is useful when representing IP addresses defined in + * A range is useful when representing IP addresses defined in * CIDR format. The range is a 32 bit IP inclusive. */ public class IpAddressRange { @@ -100,10 +100,10 @@ public class IpAddressRange { return range; } - /** - * In order to do unsigned math here we must use long types so that high order bits + /** + * In order to do unsigned math here we must use long types so that high order bits * are not used as the sign of the number. - * + * * @param ipAddress * @return */ diff --git a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java index 281dc803eeb..7fbb2fe35bd 100644 --- a/awsapi/src/com/cloud/bridge/util/JsonAccessor.java +++ b/awsapi/src/com/cloud/bridge/util/JsonAccessor.java @@ -29,12 +29,12 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; /** - * JsonAccessor provides the functionality to allow navigating JSON object graph using simple expressions, + * JsonAccessor provides the functionality to allow navigating JSON object graph using simple expressions, * for example, following property access expressions are all valid ones - * + * * rootobj.level1obj[1].property * this[0].level1obj[1].property - * + * */ public class JsonAccessor { private JsonElement _json; diff --git a/awsapi/src/com/cloud/bridge/util/OrderedPair.java b/awsapi/src/com/cloud/bridge/util/OrderedPair.java index f608153928c..33867f53720 100644 --- a/awsapi/src/com/cloud/bridge/util/OrderedPair.java +++ b/awsapi/src/com/cloud/bridge/util/OrderedPair.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.bridge.util; -/** +/** * Reusable class whose instances encode any ordered pair (or 2-tuple) of values of types T1 and T2 * Provide getters: getFirst(), getSecond() * Provide setters: setFirst(val), setSecond(val) diff --git a/awsapi/src/com/cloud/bridge/util/PolicyParser.java b/awsapi/src/com/cloud/bridge/util/PolicyParser.java index b1166ebd4db..9bcbdbcf9ac 100644 --- a/awsapi/src/com/cloud/bridge/util/PolicyParser.java +++ b/awsapi/src/com/cloud/bridge/util/PolicyParser.java @@ -39,7 +39,7 @@ import com.cloud.bridge.service.exception.PermissionDeniedException; /** * This class uses the JSON simple parser to convert the JSON of a Bucket Policy * into internal objects. - * + * * Another way to implement this by use of a stack to keep track of where the current * parsing is being done. However, since we are only handling a limited JSON sequence * here simple counts and flags will do the same as a stack. @@ -329,10 +329,10 @@ public class PolicyParser { } /** - * From Amazon on S3 Policies: - * "Each policy must cover only a single bucket and resources within that bucket (when writing a + * From Amazon on S3 Policies: + * "Each policy must cover only a single bucket and resources within that bucket (when writing a * policy, don't include statements that refer to other buckets or resources in other buckets)" - * + * * @param resourcePath */ private void verifySameBucket(String resourcePath) throws PermissionDeniedException { diff --git a/awsapi/src/com/cloud/bridge/util/RestAuth.java b/awsapi/src/com/cloud/bridge/util/RestAuth.java index 925bcee6fc5..613ee41cfad 100644 --- a/awsapi/src/com/cloud/bridge/util/RestAuth.java +++ b/awsapi/src/com/cloud/bridge/util/RestAuth.java @@ -97,7 +97,7 @@ public class RestAuth { /** * This header is used iff the "x-amz-date:" header is not defined. * Value is used in constructing the StringToSign for signature verification. - * + * * @param date - the contents of the "Date:" header, skipping the 'Date:' preamble. * OR pass in the value of the "Expires=" query string parameter passed in * for "Query String Authentication". @@ -132,13 +132,13 @@ public class RestAuth { } /** - * The bucket name can be in the "Host:" header but it does not have to be. It can + * The bucket name can be in the "Host:" header but it does not have to be. It can * instead be in the uriPath as the first step in the path. - * + * * Used as part of the CanonalizedResource element of the StringToSign. * If we get "Host: static.johnsmith.net:8080", then the bucket name is "static.johnsmith.net" - * - * @param header - contents of the "Host:" header, skipping the 'Host:' preamble. + * + * @param header - contents of the "Host:" header, skipping the 'Host:' preamble. */ public void setHostHeader(String header) { if (null == header) { @@ -158,7 +158,7 @@ public class RestAuth { * Used as part of the CanonalizedResource element of the StringToSign. * CanonicalizedResource = [ "/" + Bucket ] + * + [sub-resource] - * The list of sub-resources that must be included when constructing the CanonicalizedResource Element are: acl, lifecycle, location, + * The list of sub-resources that must be included when constructing the CanonicalizedResource Element are: acl, lifecycle, location, * logging, notification, partNumber, policy, requestPayment, torrent, uploadId, uploads, versionId, versioning, versions and website. * (http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAuthentication.html) * @param query - results from calling "HttpServletRequest req.getQueryString()" @@ -184,7 +184,7 @@ public class RestAuth { for (String subResource : subResources) { builtQuery.append(subResource + "&"); } - // If anything inside the string buffer, add a "?" at the beginning, + // If anything inside the string buffer, add a "?" at the beginning, // and then remove the last '&' if (builtQuery.length() > 0) { builtQuery.insert(0, "?"); @@ -196,7 +196,7 @@ public class RestAuth { /** * Used as part of the CanonalizedResource element of the StringToSign. * Append the path part of the un-decoded HTTP Request-URI, up-to but not including the query string. - * + * * @param path - - results from calling "HttpServletRequest req.getPathInfo()" */ public void addUriPath(String path) { @@ -210,7 +210,7 @@ public class RestAuth { * Each Amazon header added will become part of the signature calculation. * We are using a TreeMap here because of the S3 definition: * "Sort the collection of headers lexicographically by header name." - * + * * @param headerAndValue - needs to be the complete amazon header (i.e., starts with "x-amz"). */ public void addAmazonHeader(String headerAndValue) { @@ -232,7 +232,7 @@ public class RestAuth { // [B] Does this header already exist? if (AmazonHeaders.containsKey(header)) { - // -> combine header fields with the same name into one "header-name:comma-separated-value-list" pair as prescribed by RFC 2616, section 4.2, without any white-space between values. + // -> combine header fields with the same name into one "header-name:comma-separated-value-list" pair as prescribed by RFC 2616, section 4.2, without any white-space between values. canonicalized = AmazonHeaders.get(header); canonicalized = new String(canonicalized + "," + value + "\n"); canonicalized = canonicalized.replaceAll("\n,", ","); // remove the '\n' from the first stored value @@ -250,18 +250,18 @@ public class RestAuth { } /** - * The request is authenticated if we can regenerate the same signature given + * The request is authenticated if we can regenerate the same signature given * on the request. Before calling this function make sure to set the header values * defined by the public values above. - * + * * @param httpVerb - the type of HTTP request (e.g., GET, PUT) * @param secretKey - value obtained from the AWSAccessKeyId * @param signature - the signature we are trying to recreate, note can be URL-encoded - * - * @throws SignatureException - * + * + * @throws SignatureException + * * @return true if request has been authenticated, false otherwise - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException */ public boolean verifySignature(String httpVerb, String secretKey, String signature) throws SignatureException, UnsupportedEncodingException { @@ -291,14 +291,14 @@ public class RestAuth { /** * This function generates the single string that will be used to sign with a users * secret key. - * + * * StringToSign = HTTP-Verb + "\n" + * Content-MD5 + "\n" + * Content-Type + "\n" + * Date + "\n" + * CanonicalizedAmzHeaders + * CanonicalizedResource; - * + * * @return The single StringToSign or null. */ private String genStringToSign(String httpVerb) { @@ -356,9 +356,9 @@ public class RestAuth { } /** - * Construct the Canonicalized Amazon headers element of the StringToSign by + * Construct the Canonicalized Amazon headers element of the StringToSign by * concatenating all headers in the TreeMap into a single string. - * + * * @return A single string with all the Amazon headers glued together, or null * if no Amazon headers appeared in the request. */ @@ -379,7 +379,7 @@ public class RestAuth { /** * Create a signature by the following method: * new String( Base64( SHA1( key, byte array ))) - * + * * @param signIt - the data to generate a keyed HMAC over * @param secretKey - the user's unique key for the HMAC operation * @return String - the recalculated string diff --git a/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java b/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java index c028276866f..9e9263d85d3 100644 --- a/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java +++ b/awsapi/src/com/cloud/bridge/util/S3SoapAuth.java @@ -47,7 +47,7 @@ public class S3SoapAuth { /** * Create a signature by the following method: * new String( Base64( SHA1( key, byte array ))) - * + * * @param signIt - the data to generate a keyed HMAC over * @param secretKey - the user's unique key for the HMAC operation * @return String - the recalculated string diff --git a/awsapi/src/com/cloud/bridge/util/StringHelper.java b/awsapi/src/com/cloud/bridge/util/StringHelper.java index 5c8ed310c53..902a086ce61 100644 --- a/awsapi/src/com/cloud/bridge/util/StringHelper.java +++ b/awsapi/src/com/cloud/bridge/util/StringHelper.java @@ -77,7 +77,7 @@ public class StringHelper { /** * Convert the string into a regex to allow easy matching. In both S3 and EC2 regex strings - * are used for matching. We must remember to quote all special regex characters that appear + * are used for matching. We must remember to quote all special regex characters that appear * in the string. */ public static String toRegex(String param) { diff --git a/awsapi/src/com/cloud/bridge/util/Triple.java b/awsapi/src/com/cloud/bridge/util/Triple.java index 39b047e96e8..52e49881704 100644 --- a/awsapi/src/com/cloud/bridge/util/Triple.java +++ b/awsapi/src/com/cloud/bridge/util/Triple.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.bridge.util; -/** +/** * Reusable class whose instances encode any triple (or 3-tuple) of values of types T1, T2 and T3 * Provide getters: getFirst(), getSecond(), getThird() * Provide setters: setFirst(val), setSecond(val), setThird(val) diff --git a/awsapi/src/com/cloud/stack/CloudStackApi.java b/awsapi/src/com/cloud/stack/CloudStackApi.java index 6aee47d791b..ab6cb9165e1 100644 --- a/awsapi/src/com/cloud/stack/CloudStackApi.java +++ b/awsapi/src/com/cloud/stack/CloudStackApi.java @@ -57,7 +57,7 @@ import com.google.gson.reflect.TypeToken; /** * The goal here is to wrap the actual CloudStack API calls... - * + * * */ public class CloudStackApi { @@ -69,7 +69,7 @@ public class CloudStackApi { private String secretKey; /** - * + * */ public CloudStackApi(String cloudStackServiceHost, String port, Boolean bSslEnabled) { if (port != null) { @@ -117,7 +117,7 @@ public class CloudStackApi { /** * deploy a virtual machine - * + * * @param serviceOfferingId * @param templateId * @param zoneId @@ -183,7 +183,7 @@ public class CloudStackApi { /** * destroy's a virtual machine - * + * * @param id * @return * @throws Exception @@ -198,7 +198,7 @@ public class CloudStackApi { /** * reboot a virtual machine - * + * * @param id * @return * @throws Exception @@ -213,7 +213,7 @@ public class CloudStackApi { /** * start a virtual machine - * + * * @param id * @return * @throws Exception @@ -228,7 +228,7 @@ public class CloudStackApi { /** * stop a virtual machine - * + * * @param id * @param forced * @return @@ -246,7 +246,7 @@ public class CloudStackApi { /** * reset password for virtual machine - * + * * @param id * @return * @throws Exception @@ -261,7 +261,7 @@ public class CloudStackApi { /** * change service for virtual machine - * + * * @param id * @param serviceOfferingId * @return @@ -278,7 +278,7 @@ public class CloudStackApi { /** * update a virtual machine - * + * * @param id * @param displayName * @param group @@ -309,7 +309,7 @@ public class CloudStackApi { /** * list virtual machines - * + * * @param account * @param accountId * @param forVirtualNetwork @@ -374,7 +374,7 @@ public class CloudStackApi { /** * get password from virtual machine - * + * * @param id * @return * @throws Exception @@ -383,7 +383,7 @@ public class CloudStackApi { CloudStackCommand cmd = new CloudStackCommand(ApiConstants.GET_VM_PASSWORD); if (cmd != null) cmd.setParam(ApiConstants.ID, id); - // TODO: This probably isn't right. Need to test with an instance that has a VM Password + // TODO: This probably isn't right. Need to test with an instance that has a VM Password return _client.call(cmd, apiKey, secretKey, true, ApiConstants.GET_VM_PASSWORD_RESPONSE, ApiConstants.PASSWORD, CloudStackPasswordData.class); } @@ -391,7 +391,7 @@ public class CloudStackApi { //createTemplate (A) /** * create a Template - * + * * @param displayText * @param name * @param osTypeId @@ -432,7 +432,7 @@ public class CloudStackApi { /** * register a template - * + * * @param displayText * @param format * @param hypervisor @@ -488,7 +488,7 @@ public class CloudStackApi { /** * update's a template - * + * * @param id * @param bootable * @param displayText @@ -522,7 +522,7 @@ public class CloudStackApi { /** * copy a template - * + * * @param id (required) * @param destZoneId (required) * @param sourceZoneId (required) @@ -541,7 +541,7 @@ public class CloudStackApi { /** * Deletes a template from the system. All virtual machines using the deleted template will not be affected. - * + * * @param id (required) * @param zoneId * @return @@ -559,7 +559,7 @@ public class CloudStackApi { /** * List all public, private, and privileged templates - * + * * @param templateFilter (required) * @param account * @param domainId @@ -596,10 +596,10 @@ public class CloudStackApi { } /** - * Updates a template visibility permissions. A public template is visible to all accounts within the same domain. - * A private template is visible only to the owner of the template. A priviledged template is a private template with account + * Updates a template visibility permissions. A public template is visible to all accounts within the same domain. + * A private template is visible only to the owner of the template. A priviledged template is a private template with account * permissions added. Only accounts specified under the template permissions are visible to them. - * + * * @param id * @param accounts * @param isExtractable @@ -629,7 +629,7 @@ public class CloudStackApi { /** * List template visibility and all accounts that have permissions to view this template. - * + * * @param id * @param account * @param domainId @@ -650,7 +650,7 @@ public class CloudStackApi { /** * Extracts a template - * + * * @param id * @param mode * @param zoneId @@ -670,10 +670,10 @@ public class CloudStackApi { return _client.call(cmd, apiKey, secretKey, true, ApiConstants.EXTRACT_TEMPLATE_RESPONSE, null, CloudStackExtractTemplate.class); } - // ISO's + // ISO's /** * Attaches an ISO to a virtual machine - * + * * @param id * @param virtualMachineId * @return @@ -690,7 +690,7 @@ public class CloudStackApi { /** * Detaches any ISO file (if any) currently attached to a virtual machine. - * + * * @param virtualMachineId * @return * @throws Exception @@ -705,7 +705,7 @@ public class CloudStackApi { /** * Lists all available ISO files. - * + * * @param account * @param bootable * @param domainId @@ -753,7 +753,7 @@ public class CloudStackApi { /** * Registers an existing ISO into the Cloud.com Cloud. - * + * * @param displayText * @param name * @param url @@ -796,7 +796,7 @@ public class CloudStackApi { /** * Updates an ISO - * + * * @param id * @param bootable * @param displayText @@ -829,7 +829,7 @@ public class CloudStackApi { /** * Deletes an ISO - * + * * @param id * @param zoneId * @return @@ -846,7 +846,7 @@ public class CloudStackApi { /** * Copies a template from one zone to another - * + * * @param id * @param destZoneId * @param sourceZoneId @@ -865,7 +865,7 @@ public class CloudStackApi { /** * Updates ISO permissions - * + * * @param id * @param accounts * @param isExtractable @@ -915,8 +915,8 @@ public class CloudStackApi { } /** - * Extracts an iso - * + * Extracts an iso + * * @param id * @param mode * @param zoneId @@ -939,7 +939,7 @@ public class CloudStackApi { // Volumes /** * Attaches a disk volume to a virtual machine - * + * * @param id * @param virtualMachineId * @param deviceId @@ -959,7 +959,7 @@ public class CloudStackApi { /** * Detaches a disk volume from a virtual machine - * + * * @param deviceId * @param id * @param virtualMachineId @@ -981,7 +981,7 @@ public class CloudStackApi { /** * Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it - * + * * @param name * @param account * @param diskOfferingId @@ -1014,7 +1014,7 @@ public class CloudStackApi { /** * Deletes a detached disk volume - * + * * @param id * @return * @throws Exception @@ -1028,7 +1028,7 @@ public class CloudStackApi { /** * Lists all volumes - * + * * @param account * @param domainId * @param hostId @@ -1078,7 +1078,7 @@ public class CloudStackApi { /** * Extracts volume - * + * * @param id * @param mode * @param zoneId @@ -1175,7 +1175,7 @@ public class CloudStackApi { // Security Groups /** * Creates a security group - * + * * @param name * @param account * @param description @@ -1200,10 +1200,10 @@ public class CloudStackApi { /** * Deletes a security group - * + * * @param account * @param domainId - * @param id + * @param id * @param name * @return * @throws Exception @@ -1225,7 +1225,7 @@ public class CloudStackApi { /** * Authorizes a particular ingress rule for this security group - * + * * @param account * @param cidrList * @param domainId @@ -1278,7 +1278,7 @@ public class CloudStackApi { /** * Deletes a particular ingress rule from this security group. - * + * * @param id * @return * @throws Exception @@ -1292,7 +1292,7 @@ public class CloudStackApi { /** * Lists security groups - * + * * @param account * @param domainId * @param id @@ -1325,10 +1325,10 @@ public class CloudStackApi { }.getType()); } - // Accounts + // Accounts /** * Lists accounts and provides detailed account information for listed accounts - * + * * @param accountType * @param domainId * @param id @@ -1368,7 +1368,7 @@ public class CloudStackApi { // Snapshots /** * Creates an instant snapshot of a volume - * + * * @param volumeId * @param account * @param domainId @@ -1392,7 +1392,7 @@ public class CloudStackApi { /** * list Snapshots - * + * * @param volumeId * @param account * @param domainId @@ -1431,7 +1431,7 @@ public class CloudStackApi { /** * Deletes a snapshot of a disk volume - * + * * @param id * @return * @throws Exception @@ -1445,7 +1445,7 @@ public class CloudStackApi { /** * Creates a snapshot policy for the account - * + * * @param intervalType * @param maxSnaps * @param schedule @@ -1468,7 +1468,7 @@ public class CloudStackApi { /** * Delete's snapshot policies for the account - * + * * @param id * @param ids * @return @@ -1487,7 +1487,7 @@ public class CloudStackApi { /** * List snapshot policies for the account - * + * * @param volumeId * @param account * @param domainId @@ -1513,7 +1513,7 @@ public class CloudStackApi { // Events /** * List events - * + * * @param account * @param domainId * @param duration @@ -1558,7 +1558,7 @@ public class CloudStackApi { /** * List event types - * + * * @return * @throws Exception */ @@ -1571,7 +1571,7 @@ public class CloudStackApi { // Guest OS /** * list OS Types - * + * * @param id * @param keyWord * @param osCategoryId @@ -1594,7 +1594,7 @@ public class CloudStackApi { /** * list OS Categories - * + * * @param id * @param keyWord * @return @@ -1615,7 +1615,7 @@ public class CloudStackApi { // Service Offering /** * list available Service offerings - * + * * @param domainId * @param id * @param isSystem @@ -1653,7 +1653,7 @@ public class CloudStackApi { // Disk Offerings /** * list available disk offerings - * + * * @param domainId * @param id * @param keyWord @@ -1680,7 +1680,7 @@ public class CloudStackApi { // SSH keys /** * register an SSH Key Pair - * + * * @param name * @param publicKey * @return @@ -1697,7 +1697,7 @@ public class CloudStackApi { /** * Create an SSH Key Pair - * + * * @param name * @param account * @param domainId @@ -1718,7 +1718,7 @@ public class CloudStackApi { /** * delete an SSH Key Pair - * + * * @param name * @param account * @param domainId @@ -1739,7 +1739,7 @@ public class CloudStackApi { /** * return list of SSH Key Pairs - * + * * @param fingerprint * @param keyWord * @param name @@ -1762,8 +1762,8 @@ public class CloudStackApi { // IpAddresses /** - * associate an ip address - * + * associate an ip address + * * @param zoneId * @param account * @param domainId @@ -1789,7 +1789,7 @@ public class CloudStackApi { /** * disassociate an ipaddress from an instance - * + * * @param id * @return * @throws Exception @@ -1803,7 +1803,7 @@ public class CloudStackApi { /** * lists of allocate public ip addresses - * + * * @param account * @param allocatedOnly * @param domainId @@ -1841,7 +1841,7 @@ public class CloudStackApi { // Firewall /** * list port forwarding rules - * + * * @param account * @param domainId * @param id @@ -1871,7 +1871,7 @@ public class CloudStackApi { /** * Create a Port Forwarding Rule - * + * * @param ipAddressId * @param privatePort * @param protocol @@ -1904,7 +1904,7 @@ public class CloudStackApi { /** * Delete a Port Forwarding Rule - * + * * @param id * @return * @throws Exception @@ -1919,7 +1919,7 @@ public class CloudStackApi { // NAT /** * enable Static Nat - * + * * @param ipAddressId * @param virtualMachineId * @return @@ -1936,7 +1936,7 @@ public class CloudStackApi { /** * Creates an ip forwarding rule - * + * * @param ipAddressId * @param protocol * @param startPort @@ -1958,7 +1958,7 @@ public class CloudStackApi { /** * Deletes an ip forwarding rule - * + * * @param id * @return * @throws Exception @@ -1973,7 +1973,7 @@ public class CloudStackApi { /** * List the ip forwarding rules - * + * * @param account * @param domainId * @param id @@ -2007,7 +2007,7 @@ public class CloudStackApi { /** * Disables static rule for given ip address - * + * * @param ipAddressId * @return * @throws Exception @@ -2022,7 +2022,7 @@ public class CloudStackApi { // Load Balancer /** * Creates a load balancer rule - * + * * @param algorithm * @param name * @param privatePort @@ -2049,7 +2049,7 @@ public class CloudStackApi { /** * Deletes a load balancer rule - * + * * @param id * @return * @throws Exception @@ -2064,7 +2064,7 @@ public class CloudStackApi { /** * Removes a virtual machine or a list of virtual machines from a load balancer rule - * + * * @param id * @param virtualMachineIds * @return @@ -2081,7 +2081,7 @@ public class CloudStackApi { /** * Assigns virtual machine or a list of virtual machines to a load balancer rule. - * + * * @param id * @param virtualMachineIds * @return @@ -2098,7 +2098,7 @@ public class CloudStackApi { /** * Lists load balancer rules - * + * * @param account * @param domainId * @param id @@ -2138,7 +2138,7 @@ public class CloudStackApi { /** * List all virtual machine instances that are assigned a load balancer rule - * + * * @param id * @param applied * @param keyWord @@ -2161,7 +2161,7 @@ public class CloudStackApi { /** * Updates load balancer - * + * * @param id * @param algorithm * @param description @@ -2187,7 +2187,7 @@ public class CloudStackApi { /** * create an instance group - * + * * @param name * @param account * @param domainId @@ -2209,7 +2209,7 @@ public class CloudStackApi { /** * delete an instance group - * + * * @param id * @return * @throws Exception @@ -2224,7 +2224,7 @@ public class CloudStackApi { /** * Update an instance group - * + * * @param id * @param name * @return @@ -2242,7 +2242,7 @@ public class CloudStackApi { /** * List instance groups - * + * * @param account * @param domainId * @param id @@ -2273,7 +2273,7 @@ public class CloudStackApi { // Networks /** * Creates a network - * + * * @param displayText * @param name * @param networkOfferingId @@ -2330,7 +2330,7 @@ public class CloudStackApi { /** * delete a network - * + * * @param id * @return * @throws Exception @@ -2345,7 +2345,7 @@ public class CloudStackApi { /** * list Networks - * + * * @param account * @param domainId * @param id @@ -2391,7 +2391,7 @@ public class CloudStackApi { /** * Reapplies all ip addresses for the particular network - * + * * @param id * @return * @throws Exception @@ -2405,7 +2405,7 @@ public class CloudStackApi { /** * update a network - * + * * @param id * @param displayText * @param name @@ -2433,7 +2433,7 @@ public class CloudStackApi { // Hypervisor /** * list Hypervisors - * + * * @param zoneId * @return * @throws Exception @@ -2449,7 +2449,7 @@ public class CloudStackApi { // Zones /** * list Zones - * + * * @param available * @param domainId * @param id @@ -2477,7 +2477,7 @@ public class CloudStackApi { // Network Offerings /** * List available network offerings - * + * * @param availability * @param displayText * @param guestIpType @@ -2527,7 +2527,7 @@ public class CloudStackApi { // Configuration /** * list Capaibilities - * + * * @return * @throws Exception */ @@ -2539,7 +2539,7 @@ public class CloudStackApi { // Limits /** * list resource limits - * + * * @param account * @param domainId * @param id @@ -2570,7 +2570,7 @@ public class CloudStackApi { // Cloud Identifier /** * Returns a cloud identifier - * + * * @param userId * @return * @throws Exception diff --git a/awsapi/src/com/cloud/stack/CloudStackClient.java b/awsapi/src/com/cloud/stack/CloudStackClient.java index 8ffc9e9edcc..c8d63cdf264 100644 --- a/awsapi/src/com/cloud/stack/CloudStackClient.java +++ b/awsapi/src/com/cloud/stack/CloudStackClient.java @@ -33,9 +33,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParser; /** - * CloudStackClient implements a simple CloudStack client object, it can be used to execute CloudStack commands + * CloudStackClient implements a simple CloudStack client object, it can be used to execute CloudStack commands * with JSON response - * + * */ public class CloudStackClient { protected final static Logger logger = Logger.getLogger(CloudStackClient.class); diff --git a/awsapi/src/com/cloud/stack/CloudStackCommand.java b/awsapi/src/com/cloud/stack/CloudStackCommand.java index fe7fb2a67a0..8d6aa68837d 100644 --- a/awsapi/src/com/cloud/stack/CloudStackCommand.java +++ b/awsapi/src/com/cloud/stack/CloudStackCommand.java @@ -32,7 +32,7 @@ import org.apache.commons.codec.binary.Base64; /** * CloudStackCommand wraps command properties that are being sent to CloudStack - * + * */ public class CloudStackCommand { Map _params = new HashMap(); diff --git a/awsapi/src/com/cloud/stack/models/CloudStackAccount.java b/awsapi/src/com/cloud/stack/models/CloudStackAccount.java index 8d908c47bc1..1886f682ad5 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackAccount.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackAccount.java @@ -76,7 +76,7 @@ public class CloudStackAccount { private String defaultZoneId; /** - * + * */ public CloudStackAccount() { // TODO Auto-generated constructor stub @@ -272,7 +272,7 @@ public class CloudStackAccount { return user; } - /** + /** * @return the defaultZoneId */ public String getDefaultZoneId() { diff --git a/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java b/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java index e8dcc4ea7c1..93f06888847 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackCapabilities.java @@ -28,7 +28,7 @@ public class CloudStackCapabilities { private Boolean userPublicTemplateEnabled; /** - * + * */ public CloudStackCapabilities() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java b/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java index ba310009ac4..907808e4ff5 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java @@ -36,7 +36,7 @@ public class CloudStackDiskOffering { private String tags; /** - * + * */ public CloudStackDiskOffering() { } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackEvent.java b/awsapi/src/com/cloud/stack/models/CloudStackEvent.java index 9188f1b9d01..cdcb1f51838 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackEvent.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackEvent.java @@ -44,7 +44,7 @@ public class CloudStackEvent { private String userName; /** - * + * */ public CloudStackEvent() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackEventType.java b/awsapi/src/com/cloud/stack/models/CloudStackEventType.java index d96218d5bb0..fb8ff6b05b5 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackEventType.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackEventType.java @@ -24,7 +24,7 @@ public class CloudStackEventType { private String name; /** - * + * */ public CloudStackEventType() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java b/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java index f581f42bc14..e2af94bf88e 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackExtractTemplate.java @@ -48,7 +48,7 @@ public class CloudStackExtractTemplate { String zoneName; /** - * + * */ public CloudStackExtractTemplate() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java b/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java index d94957c4a84..466872aaa1a 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackInstanceGroup.java @@ -34,7 +34,7 @@ public class CloudStackInstanceGroup { private String name; /** - * + * */ public CloudStackInstanceGroup() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java b/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java index c14417871c6..6915a986ca2 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackLoadBalancerRule.java @@ -48,7 +48,7 @@ public class CloudStackLoadBalancerRule { private String zoneId; /** - * + * */ public CloudStackLoadBalancerRule() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java b/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java index 3218f6b42ad..de8dea3aa01 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackNetwork.java @@ -86,7 +86,7 @@ public class CloudStackNetwork { private List services; /** - * + * */ public CloudStackNetwork() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java b/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java index 3798a470fb8..0efc928c987 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackNetworkOffering.java @@ -46,7 +46,7 @@ public class CloudStackNetworkOffering { private String traffictype; /** - * + * */ public CloudStackNetworkOffering() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java b/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java index 89d4addd93e..bb83fe89014 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackNetworkService.java @@ -26,7 +26,7 @@ public class CloudStackNetworkService { @SerializedName(ApiConstants.NAME) private String name; - // this is annoying, why is this stored as a list of objects with a name/value + // this is annoying, why is this stored as a list of objects with a name/value // the json looks like this // "capability" : [ { "name" : "val"},{ "name" : "val" }, ], // would be better if it were presented as: @@ -35,7 +35,7 @@ public class CloudStackNetworkService { private List capabilities; /** - * + * */ public CloudStackNetworkService() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java b/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java index a058e168558..84311f251f8 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackNetworkServiceCapability.java @@ -26,7 +26,7 @@ public class CloudStackNetworkServiceCapability { private String value; /** - * + * */ public CloudStackNetworkServiceCapability() { } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java b/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java index c90cd7c6d37..dbfbb08daca 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackOsCategory.java @@ -26,7 +26,7 @@ public class CloudStackOsCategory { private String name; /** - * + * */ public CloudStackOsCategory() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackOsType.java b/awsapi/src/com/cloud/stack/models/CloudStackOsType.java index 6bb3507c6fc..7926c81820f 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackOsType.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackOsType.java @@ -28,7 +28,7 @@ public class CloudStackOsType { private String description; /** - * + * */ public CloudStackOsType() { } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java b/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java index c194719e4fa..d099f70fa7e 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackPasswordData.java @@ -25,7 +25,7 @@ public class CloudStackPasswordData { private String encryptedPassword; /** - * + * */ public CloudStackPasswordData() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java b/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java index 10f870ad82d..4d455b7409b 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java @@ -48,7 +48,7 @@ public class CloudStackPortForwardingRule { private String virtualMachineName; /** - * + * */ public CloudStackPortForwardingRule() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java index a0feb5d09a0..e1434462840 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroupIngress.java @@ -40,7 +40,7 @@ public class CloudStackSecurityGroupIngress { private Integer startPort; /** - * + * */ public CloudStackSecurityGroupIngress() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.java b/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.java index 2b32b3bb3e7..fd96ee00ac0 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackServiceOffering.java @@ -56,7 +56,7 @@ public class CloudStackServiceOffering { private String tags; /** - * + * */ public CloudStackServiceOffering() { // TODO Auto-generated constructor stub diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java b/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java index ab77c5385b7..8c012c76957 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java @@ -35,7 +35,7 @@ public class CloudStackSnapshotPolicy { private String volumeId; /** - * + * */ public CloudStackSnapshotPolicy() { } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackTemplate.java b/awsapi/src/com/cloud/stack/models/CloudStackTemplate.java index 4f7746ce694..dd945991d49 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackTemplate.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackTemplate.java @@ -88,7 +88,7 @@ public class CloudStackTemplate { private List tags; /** - * + * */ public CloudStackTemplate() { } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackTemplatePermission.java b/awsapi/src/com/cloud/stack/models/CloudStackTemplatePermission.java index 75818c73ca0..67274fa42b6 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackTemplatePermission.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackTemplatePermission.java @@ -32,7 +32,7 @@ public class CloudStackTemplatePermission { private List accounts; /** - * + * */ public CloudStackTemplatePermission() { } diff --git a/awsapi/src/com/cloud/stack/models/CloudStackUser.java b/awsapi/src/com/cloud/stack/models/CloudStackUser.java index 60fdae1e1ba..3d8bbec0e68 100644 --- a/awsapi/src/com/cloud/stack/models/CloudStackUser.java +++ b/awsapi/src/com/cloud/stack/models/CloudStackUser.java @@ -51,7 +51,7 @@ public class CloudStackUser { private String username; /** - * + * */ public CloudStackUser() { } diff --git a/core/src/com/cloud/agent/StartupCommandProcessor.java b/core/src/com/cloud/agent/StartupCommandProcessor.java index b532a9aecd6..8efe1437a4c 100644 --- a/core/src/com/cloud/agent/StartupCommandProcessor.java +++ b/core/src/com/cloud/agent/StartupCommandProcessor.java @@ -31,7 +31,7 @@ public interface StartupCommandProcessor extends Adapter { * @param agentId id of the agent * @param cmd command sent by the agent to the server on startup. * @return true if handled by the creator - * @throws ConnectionException if host has problems + * @throws ConnectionException if host has problems */ boolean processInitialConnect(StartupCommand[] cmd) throws ConnectionException; diff --git a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java index 439b164c568..0dda6dd57a1 100644 --- a/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java +++ b/core/src/com/cloud/agent/api/StartupVMMAgentCommand.java @@ -21,7 +21,7 @@ import com.cloud.host.Host; /** * Implementation of bootstrap command sent from management server to agent running on - * System Center Virtual Machine Manager host + * System Center Virtual Machine Manager host **/ public class StartupVMMAgentCommand extends Command { diff --git a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java index 7eb596f85a0..6b880d5a632 100644 --- a/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java +++ b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. diff --git a/core/src/com/cloud/agent/api/VMSnapshotTO.java b/core/src/com/cloud/agent/api/VMSnapshotTO.java index f67f50f0242..8f42e0c8e5a 100644 --- a/core/src/com/cloud/agent/api/VMSnapshotTO.java +++ b/core/src/com/cloud/agent/api/VMSnapshotTO.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.agent.api; diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index ab8bcc2c3cd..d23fcce952f 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -5,7 +5,7 @@ // 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, diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java index b2335c737a7..f4ed5c4b6e6 100755 --- a/core/src/com/cloud/agent/transport/Request.java +++ b/core/src/com/cloud/agent/transport/Request.java @@ -57,7 +57,7 @@ import com.cloud.utils.exception.CloudRuntimeException; * in the over the wire protocol. For example, if we decide to not use Gson. * It does not version the changes in the actual commands. That's expected * to be done by adding new classes to the command and answer list. - * + * * A request looks as follows: * 1. Version - 1 byte; * 2. Flags - 3 bytes; @@ -66,7 +66,7 @@ import com.cloud.utils.exception.CloudRuntimeException; * 5. ManagementServerId - 8 bytes; * 6. AgentId - 8 bytes; * 7. Data Package. - * + * */ public class Request { private static final Logger s_logger = Logger.getLogger(Request.class); @@ -446,7 +446,7 @@ public class Request { * correctly formed so it's possible that it throws underflow exceptions * but you shouldn't be concerned about that since that all bytes sent in * should already be formatted correctly. - * + * * @param bytes bytes to be converted. * @return Request or Response depending on the data. * @throws ClassNotFoundException if the Command or Answer can not be formed. diff --git a/core/src/com/cloud/exception/UsageServerException.java b/core/src/com/cloud/exception/UsageServerException.java index 9bce0e3d477..1c5d43674e2 100644 --- a/core/src/com/cloud/exception/UsageServerException.java +++ b/core/src/com/cloud/exception/UsageServerException.java @@ -19,7 +19,7 @@ package com.cloud.exception; public class UsageServerException extends CloudException { /** - * + * */ private static final long serialVersionUID = -8398313106067116466L; diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java index e79395b9104..b6e18e67a44 100644 --- a/core/src/com/cloud/network/HAProxyConfigurator.java +++ b/core/src/com/cloud/network/HAProxyConfigurator.java @@ -236,8 +236,8 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { cookie JSESSIONID prefix cookie SRV insert indirect nocache cookie SRV insert postonly indirect - - + + appsession len timeout [request-learn] [prefix] [mode ] Define session stickiness on an existing application cookie. @@ -314,16 +314,16 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { /* * cookie [ rewrite | insert | prefix ] [ indirect ] [ nocache ] [ postonly ] [ domain ]* - + */ if (StickinessMethodType.LBCookieBased.getName().equalsIgnoreCase(stickinessPolicy.getMethodName())) { /* Default Values */ - String cookieName = null; // optional + String cookieName = null; // optional String mode = "insert "; // optional Boolean indirect = false; // optional Boolean nocache = false; // optional - Boolean postonly = false; // optional - StringBuilder domainSb = null; // optional + Boolean postonly = false; // optional + StringBuilder domainSb = null; // optional for (Pair paramKV : paramsList) { String key = paramKV.first(); @@ -346,7 +346,7 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { if ("postonly".equalsIgnoreCase(key)) postonly = true; } - if (cookieName == null) {// re-check all haproxy mandatory params + if (cookieName == null) {// re-check all haproxy mandatory params StringBuilder tempSb = new StringBuilder(); String srcip = lbTO.getSrcIp(); if (srcip == null) @@ -365,8 +365,8 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { sb.append(domainSb).append(" "); } else if (StickinessMethodType.SourceBased.getName().equalsIgnoreCase(stickinessPolicy.getMethodName())) { /* Default Values */ - String tablesize = "200k"; // optional - String expire = "30m"; // optional + String tablesize = "200k"; // optional + String expire = "30m"; // optional /* overwrite default values with the stick parameters */ for (Pair paramKV : paramsList) { @@ -386,12 +386,12 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { * ] */ /* example: appsession JSESSIONID len 52 timeout 3h */ - String cookieName = null; // optional - String length = "52"; // optional - String holdtime = "3h"; // optional - String mode = null; // optional - Boolean requestlearn = false; // optional - Boolean prefix = false; // optional + String cookieName = null; // optional + String length = "52"; // optional + String holdtime = "3h"; // optional + String mode = null; // optional + Boolean requestlearn = false; // optional + Boolean prefix = false; // optional for (Pair paramKV : paramsList) { String key = paramKV.first(); @@ -409,7 +409,7 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { if ("prefix".equalsIgnoreCase(key)) prefix = true; } - if (cookieName == null) {// re-check all haproxy mandatory params + if (cookieName == null) {// re-check all haproxy mandatory params StringBuilder tempSb = new StringBuilder(); String srcip = lbTO.getSrcIp(); if (srcip == null) @@ -425,7 +425,7 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { if (mode != null) sb.append("mode ").append(mode).append(" "); } else { - /* + /* * Error is silently swallowed. * Not supposed to reach here, validation of methods are * done at the higher layer @@ -540,7 +540,7 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { public String[] generateConfiguration(LoadBalancerConfigCommand lbCmd) { List result = new ArrayList(); List gSection = Arrays.asList(globalSection); -// note that this is overwritten on the String in the static ArrayList +// note that this is overwritten on the String in the static ArrayList gSection.set(2, "\tmaxconn " + lbCmd.maxconn); // TODO DH: write test for this function String pipesLine = "\tmaxpipes " + Long.toString(Long.parseLong(lbCmd.maxconn) / 4); diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java index 9ecdb68c74a..437891b7798 100644 --- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java +++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java @@ -193,7 +193,7 @@ public class TrafficSentinelResource implements ServerResource { try { //Direct Network Usage URL trafficSentinel; - //Use Global include/exclude zones if there are no per TS zones + //Use Global include/exclude zones if there are no per TS zones if (_inclZones == null) { _inclZones = cmd.getIncludeZones(); } diff --git a/core/src/com/cloud/resource/hypervisor/HypervisorResource.java b/core/src/com/cloud/resource/hypervisor/HypervisorResource.java index 7bb0f9d15e6..dedd9e09b9b 100644 --- a/core/src/com/cloud/resource/hypervisor/HypervisorResource.java +++ b/core/src/com/cloud/resource/hypervisor/HypervisorResource.java @@ -40,7 +40,7 @@ public interface HypervisorResource extends ServerResource { /** * Stops a VM. Must return true as long as the VM does not exist. * @param cmd information necessary to identify the VM to stop. - * @return StopAnswer + * @return StopAnswer */ StopAnswer execute(StopCommand cmd); diff --git a/core/src/com/cloud/storage/StorageLayer.java b/core/src/com/cloud/storage/StorageLayer.java index cd4d3325133..e2a19953ba9 100644 --- a/core/src/com/cloud/storage/StorageLayer.java +++ b/core/src/com/cloud/storage/StorageLayer.java @@ -23,9 +23,9 @@ import com.cloud.utils.component.Manager; /** * StorageLayer is an independence layer for - * + * * 1. Proper synchronization between threads. - * + * * */ public interface StorageLayer extends Manager { diff --git a/core/src/com/cloud/storage/template/Processor.java b/core/src/com/cloud/storage/template/Processor.java index 0d3c82739cd..3d137dcbd18 100644 --- a/core/src/com/cloud/storage/template/Processor.java +++ b/core/src/com/cloud/storage/template/Processor.java @@ -32,7 +32,7 @@ public interface Processor extends Adapter { /** * Returns image format if it was able to process the original file and - * + * * @param templatePath path to the templates to process. * @param format Format of the original file. If null, it means unknown. If not null, * there is already a file with thte template name and image format extension diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java b/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java index 7a9f6d76123..6a2565d66ed 100644 --- a/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java +++ b/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java @@ -8,7 +8,7 @@ // 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. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.xensource.xenapi; diff --git a/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java b/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java index a9fbec1eda6..b9821ee6b7c 100644 --- a/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java +++ b/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java @@ -8,7 +8,7 @@ // 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. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.xensource.xenapi; diff --git a/engine/api/src/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/com/cloud/vm/VirtualMachineManager.java index 96dd5cd420b..18aaafe939f 100644 --- a/engine/api/src/com/cloud/vm/VirtualMachineManager.java +++ b/engine/api/src/com/cloud/vm/VirtualMachineManager.java @@ -60,7 +60,7 @@ public interface VirtualMachineManager extends Manager { * Allocates a new virtual machine instance in the CloudStack DB. This * orchestrates the creation of all virtual resources needed in CloudStack * DB to bring up a VM. - * + * * @param vmInstanceName Instance name of the VM. This name uniquely * a VM in CloudStack's deploy environment. The caller gets to * define this VM but it must be unqiue for all of CloudStack. @@ -118,7 +118,7 @@ public interface VirtualMachineManager extends Manager { /** * Check to see if a virtual machine can be upgraded to the given service offering - * + * * @param vm * @param offering * @return true if the host can handle the upgrade, false otherwise diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java index 48a06401e68..e416503fc38 100755 --- a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java @@ -39,8 +39,8 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.vm.VirtualMachineProfile; /** - * VirtualMachineEntity represents a Virtual Machine in Cloud Orchestration - * Platform. + * VirtualMachineEntity represents a Virtual Machine in Cloud Orchestration + * Platform. * */ @Path("vm/{id}") @@ -85,7 +85,7 @@ public interface VirtualMachineEntity extends CloudStackEntity { /** * Start the virtual machine with a given deployment plan - * @param plannerToUse the Deployment Planner that should be used + * @param plannerToUse the Deployment Planner that should be used * @param plan plan to which to deploy the machine * @param exclude list of areas to exclude * @return a reservation id @@ -94,7 +94,7 @@ public interface VirtualMachineEntity extends CloudStackEntity { /** * Migrate this VM to a certain destination. - * + * * @param reservationId reservation id from reserve call. */ void migrateTo(String reservationId, String caller); @@ -102,13 +102,13 @@ public interface VirtualMachineEntity extends CloudStackEntity { /** * Deploy this virtual machine according to the reservation from before. * @param reservationId reservation id from reserve call. - * + * */ void deploy(String reservationId, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException; /** * Stop the virtual machine - * + * */ boolean stop(String caller) throws ResourceUnavailableException, CloudException; diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java index 0854a801001..9887fa55d1d 100755 --- a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java @@ -32,15 +32,15 @@ public interface VolumeEntity extends CloudStackEntity { /** * Make a reservation to do storage migration - * - * @param expirationTime time in seconds the reservation is cancelled + * + * @param expirationTime time in seconds the reservation is cancelled * @return reservation token */ String reserveForMigration(long expirationTime); /** * Migrate using a reservation. - * @param reservationToken reservation token + * @param reservationToken reservation token */ void migrate(String reservationToken); diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java index 3a801491880..efdb6753392 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java @@ -29,14 +29,14 @@ import com.cloud.utils.fsm.StateMachine2; import com.cloud.utils.fsm.StateObject; /** - * This interface specifies the states and operations all physical - * and virtual resources in the data center must implement. + * This interface specifies the states and operations all physical + * and virtual resources in the data center must implement. */ @Produces({"application/json", "application/xml"}) public interface DataCenterResourceEntity extends CloudStackEntity, StateObject { /** - * This is the state machine for how CloudStack should interact with + * This is the state machine for how CloudStack should interact with * */ public enum State { diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java index d6818384707..6750bf11508 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntity.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.engine.service.api.ProvisioningService; import org.apache.cloudstack.framework.ws.jackson.Url; /** - * Describes a zone and operations that can be done in a zone. + * Describes a zone and operations that can be done in a zone. */ @Path("/zone/{zoneid}") @Produces({"application/json"}) diff --git a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java index 09130d1d995..d36cd7987db 100755 --- a/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/entity/api/CloudStackEntity.java @@ -28,11 +28,11 @@ import javax.ws.rs.QueryParam; /** * All entities returned by the Cloud Orchestration Platform must implement - * this interface. CloudValueEntity is an immutable representation of + * this interface. CloudValueEntity is an immutable representation of * an entity exposed by Cloud Orchestration Platform. For each object, it - * defines two ids: uuid, generated by CloudStack Orchestration Platform, and - * an external id that is set by the caller when the entity is created. All - * ids must be unique for that entity. CloudValueEntity also can be converted + * defines two ids: uuid, generated by CloudStack Orchestration Platform, and + * an external id that is set by the caller when the entity is created. All + * ids must be unique for that entity. CloudValueEntity also can be converted * to a CloudActionableEntity which contains actions the object can perform. */ public interface CloudStackEntity { diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java index 173feef51d7..ee28f3c86e7 100755 --- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java @@ -56,7 +56,7 @@ import com.cloud.vm.VirtualMachineProfile; /** * NetworkManager manages the network for the different end users. - * + * */ public interface NetworkOrchestrationService { static final String NetworkLockTimeoutCK = "network.lock.timeout"; @@ -94,7 +94,7 @@ public interface NetworkOrchestrationService { /** * prepares vm nic change for migration - * + * * This method will be called in migration transaction before the vm migration. * @param vm * @param dest @@ -103,7 +103,7 @@ public interface NetworkOrchestrationService { /** * commit vm nic change for migration - * + * * This method will be called in migration transaction after the successful * vm migration. * @param src @@ -113,7 +113,7 @@ public interface NetworkOrchestrationService { /** * rollback vm nic change for migration - * + * * This method will be called in migaration transaction after vm migration * failure. * @param src diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java index fd191d255db..4e5521728ee 100755 --- a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java @@ -43,12 +43,12 @@ import com.cloud.vm.NicProfile; public interface OrchestrationService { /** * creates a new virtual machine - * + * * @param id externally unique name to reference the virtual machine * @param owner owner reference * @param template reference to the template * @param hostName name of the host - * @param displayName name to look at + * @param displayName name to look at * @param cpu # of cpu cores * @param speed speed of the cpu core in MHZ * @param memory memory to allocate in bytes diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java index da63bb04504..49fe3e24d9b 100755 --- a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java +++ b/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java @@ -32,8 +32,8 @@ import com.cloud.host.Status; import com.cloud.storage.StoragePool; /** - * ProvisioningService registers and deregisters physical and virtual - * resources that the management server can use. + * ProvisioningService registers and deregisters physical and virtual + * resources that the management server can use. */ public interface ProvisioningService { diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java index 80dbbf83590..ca505aa08f9 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotResult.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package org.apache.cloudstack.engine.subsystem.api.storage; diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java index 92724c91889..6d1ac2d62ef 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageCacheManager.java @@ -25,7 +25,7 @@ public interface StorageCacheManager { /** * only create cache object in db - * + * * @param data * @param scope * @return diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java index 108c8121c1b..dfdbd8ab92c 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StoragePoolAllocator.java @@ -31,11 +31,11 @@ public interface StoragePoolAllocator extends Adapter { /** * Determines which storage pools are suitable for the guest virtual machine * and returns a list of pools suitable. - * + * * Allocators must set any other pools not considered for allocation in the * ExcludeList avoid. Thus the avoid set and the list of pools suitable, * together must cover the entire pool set in the cluster. - * + * * @param DiskProfile * dskCh * @param VirtualMachineProfile diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java index 54aebc69bba..bcc4e7f9c54 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java @@ -46,16 +46,16 @@ public interface VolumeService { /** * Creates the volume based on the given criteria - * + * * @param cmd - * + * * @return the volume object */ AsyncCallFuture createVolumeAsync(VolumeInfo volume, DataStore store); /** * Delete volume - * + * * @param volumeId * @return * @throws ConcurrentOperationException diff --git a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java index ece907d75ed..3c538632d4f 100755 --- a/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java +++ b/engine/components-api/src/com/cloud/configuration/ConfigurationManager.java @@ -47,7 +47,7 @@ import com.cloud.vm.VirtualMachine; /** * ConfigurationManager handles adding pods/zones, changing IP ranges, enabling external firewalls, and editing * configuration values - * + * */ public interface ConfigurationManager { /** @@ -62,7 +62,7 @@ public interface ConfigurationManager { /** * Updates a configuration entry with a new value - * + * * @param userId * @param name * @param value @@ -71,7 +71,7 @@ public interface ConfigurationManager { // /** // * Creates a new service offering -// * +// * // * @param name // * @param cpu // * @param ramSize @@ -100,7 +100,7 @@ public interface ConfigurationManager { // /** // * Creates a new disk offering -// * +// * // * @param domainId // * @param name // * @param description @@ -124,7 +124,7 @@ public interface ConfigurationManager { /** * Creates a new pod - * + * * @param userId * @param podName * @param zoneId @@ -142,7 +142,7 @@ public interface ConfigurationManager { /** * Creates a new zone - * + * * @param userId * @param zoneName * @param dns1 @@ -168,7 +168,7 @@ public interface ConfigurationManager { /** * Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated * IP addresses. - * + * * @param userId * @param vlanDbId * @param caller TODO @@ -224,7 +224,7 @@ public interface ConfigurationManager { /** * Edits a pod in the database. Will not allow you to edit pods that are being used anywhere in the system. - * + * * @param id * @param name * @param startIp diff --git a/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java b/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java index 2be913f9dfb..e1b308a1632 100644 --- a/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java +++ b/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java @@ -43,7 +43,7 @@ public interface HighAvailabilityManager extends Manager { /** * Investigate why a host has disconnected and migrate the VMs on it * if necessary. - * + * * @param host - the host that has disconnected. */ Status investigate(long hostId); @@ -53,10 +53,10 @@ public interface HighAvailabilityManager extends Manager { * VM is restarted depends on various reasons. * 1. Is the VM really dead. This method will try to find out. * 2. Is the VM HA enabled? If not, the VM is simply stopped. - * + * * All VMs that enter HA mode is not allowed to be operated on until it * has been determined that the VM is dead. - * + * * @param vm the vm that has gone away. * @param investigate must be investigated before we do anything with this vm. */ @@ -75,7 +75,7 @@ public interface HighAvailabilityManager extends Manager { /** * Schedule the vm for migration. - * + * * @param vm * @return true if schedule worked. */ @@ -86,14 +86,14 @@ public interface HighAvailabilityManager extends Manager { /** * Schedules a work item to stop a VM. This method schedules a work * item to do one of three things. - * + * * 1. Perform a regular stop of a VM: WorkType.Stop * 2. Perform a force stop of a VM: WorkType.ForceStop * 3. Check if a VM has been stopped: WorkType.CheckStop - * + * * @param vm virtual machine to stop. * @param host host the virtual machine is on. - * @param type which type of stop is requested. + * @param type which type of stop is requested. */ void scheduleStop(VMInstanceVO vm, long hostId, WorkType type); diff --git a/engine/components-api/src/com/cloud/network/IpAddressManager.java b/engine/components-api/src/com/cloud/network/IpAddressManager.java index 1580d8eede5..24ece3467fd 100644 --- a/engine/components-api/src/com/cloud/network/IpAddressManager.java +++ b/engine/components-api/src/com/cloud/network/IpAddressManager.java @@ -45,7 +45,7 @@ public interface IpAddressManager { /** * Assigns a new public ip address. - * + * * @param dcId * @param podId * TODO @@ -64,7 +64,7 @@ public interface IpAddressManager { /** * Do all of the work of releasing public ip addresses. Note that if this method fails, there can be side effects. - * + * * @param userId * @param caller * TODO diff --git a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java index d3db24753c2..0f6d0ce8b31 100644 --- a/engine/components-api/src/com/cloud/network/rules/FirewallManager.java +++ b/engine/components-api/src/com/cloud/network/rules/FirewallManager.java @@ -33,11 +33,11 @@ public interface FirewallManager extends FirewallService { * 1. one to one nat ip forwarding * 2. port forwarding * 3. load balancing - * + * * and conflicts are detected between those two rules. In this case, it * is possible for both rules to be rolled back when, technically, we should * and the user can simply re-add one of the rules themselves. - * + * * @param newRule * the new rule created. * @throws NetworkRuleConflictException @@ -57,7 +57,7 @@ public interface FirewallManager extends FirewallService { // /** // * Revokes a firewall rule -// * +// * // * @param ruleId // * the id of the rule to revoke. // * @param caller diff --git a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java index f436d2e7530..5f07f2c2376 100644 --- a/engine/components-api/src/com/cloud/network/vpc/VpcManager.java +++ b/engine/components-api/src/com/cloud/network/vpc/VpcManager.java @@ -40,7 +40,7 @@ import com.cloud.user.Account; public interface VpcManager { /** * Returns all the Guest networks that are part of VPC - * + * * @param vpcId * @return */ @@ -55,7 +55,7 @@ public interface VpcManager { /** * Destroys the VPC - * + * * @param vpc * @param caller TODO * @param callerUserId TODO @@ -67,7 +67,7 @@ public interface VpcManager { /** * Returns true if the IP is allocated to the VPC; false otherwise - * + * * @param ip * @return */ @@ -75,7 +75,7 @@ public interface VpcManager { /** * Disassociates the public IP address from VPC - * + * * @param ipId * @param networkId */ @@ -83,7 +83,7 @@ public interface VpcManager { /** * Creates guest network in the VPC - * + * * * @param ntwkOffId * @param name @@ -113,7 +113,7 @@ public interface VpcManager { /** * Assigns source nat public IP address to VPC - * + * * @param owner * @param vpc * @return public IP address object @@ -124,7 +124,7 @@ public interface VpcManager { /** * Validates network offering to find if it can be used for network creation in VPC - * + * * @param guestNtwkOff * @param supportedSvcs TODO */ diff --git a/engine/components-api/src/com/cloud/resource/Discoverer.java b/engine/components-api/src/com/cloud/resource/Discoverer.java index c6754283031..a2bb5945a9d 100755 --- a/engine/components-api/src/com/cloud/resource/Discoverer.java +++ b/engine/components-api/src/com/cloud/resource/Discoverer.java @@ -32,7 +32,7 @@ import com.cloud.utils.component.Adapter; public interface Discoverer extends Adapter { /** * Given an accessible ip address, find out what it is. - * + * * @param url * @param username * @param password diff --git a/engine/components-api/src/com/cloud/resource/ResourceManager.java b/engine/components-api/src/com/cloud/resource/ResourceManager.java index 77337dc8cf8..e623b9c6da9 100755 --- a/engine/components-api/src/com/cloud/resource/ResourceManager.java +++ b/engine/components-api/src/com/cloud/resource/ResourceManager.java @@ -42,7 +42,7 @@ public interface ResourceManager extends ResourceService { /** * Register a listener for different types of resource life cycle events. * There can only be one type of listener per type of host. - * + * * @param Event type see ResourceListener.java, allow combination of multiple events. * @param listener the listener to notify. */ @@ -51,7 +51,7 @@ public interface ResourceManager extends ResourceService { public void unregisterResourceEvent(ResourceListener listener); /** - * + * * @param name of adapter * @param adapter * @param hates, a list of names which will be eliminated by this adapter. Especially for the case where diff --git a/engine/components-api/src/com/cloud/vm/snapshot/VMSnapshotManager.java b/engine/components-api/src/com/cloud/vm/snapshot/VMSnapshotManager.java index 753d7b40d76..7d233ca7d30 100644 --- a/engine/components-api/src/com/cloud/vm/snapshot/VMSnapshotManager.java +++ b/engine/components-api/src/com/cloud/vm/snapshot/VMSnapshotManager.java @@ -26,7 +26,7 @@ public interface VMSnapshotManager extends VMSnapshotService, Manager { /** * Delete all VM snapshots belonging to one VM * @param id, VM id - * @param type, + * @param type, * @return true for success, false for failure */ boolean deleteAllVMSnapshots(long id, VMSnapshot.Type type); @@ -34,7 +34,7 @@ public interface VMSnapshotManager extends VMSnapshotService, Manager { /** * Sync VM snapshot state when VM snapshot in reverting or snapshoting or expunging state * Used for fullsync after agent connects - * + * * @param vm, the VM in question * @param hostId * @return true if succeeds, false if fails diff --git a/engine/network/src/org/apache/cloudstack/network/NetworkOrchestrator.java b/engine/network/src/org/apache/cloudstack/network/NetworkOrchestrator.java index 82756ac8391..8b6b6e431d3 100755 --- a/engine/network/src/org/apache/cloudstack/network/NetworkOrchestrator.java +++ b/engine/network/src/org/apache/cloudstack/network/NetworkOrchestrator.java @@ -28,7 +28,7 @@ public interface NetworkOrchestrator { void prepare(String vm, String reservationId); /** - * Release all reservation + * Release all reservation */ void release(String vm, String reservationId); diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java index ea1d12aee0d..ef7935a050e 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java @@ -483,7 +483,7 @@ public abstract class AgentAttache { /** * sends the request asynchronously. - * + * * @param req * @throws AgentUnavailableException */ diff --git a/engine/orchestration/src/com/cloud/agent/manager/Routable.java b/engine/orchestration/src/com/cloud/agent/manager/Routable.java index c8eb185cc04..7d741f3341b 100644 --- a/engine/orchestration/src/com/cloud/agent/manager/Routable.java +++ b/engine/orchestration/src/com/cloud/agent/manager/Routable.java @@ -21,7 +21,7 @@ import com.cloud.exception.AgentUnavailableException; public interface Routable { /** * Directly rout this data to the agent. - * + * * @param data * @throws AgentUnavailableException */ diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSync.java b/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSync.java index 232bd5562e2..64995281ef3 100644 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSync.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSync.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java index 78f19df6cbe..b6e90153201 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java @@ -40,7 +40,7 @@ public interface EngineHostDao extends GenericDao, StateDao< /** * Mark all hosts associated with a certain management server * as disconnected. - * + * * @param msId management server id. */ void markHostsAsDisconnected(long msId, long lastPing); diff --git a/engine/schema/src/com/cloud/host/dao/HostDao.java b/engine/schema/src/com/cloud/host/dao/HostDao.java index 53b8667290e..4d57bde0ea9 100755 --- a/engine/schema/src/com/cloud/host/dao/HostDao.java +++ b/engine/schema/src/com/cloud/host/dao/HostDao.java @@ -38,7 +38,7 @@ public interface HostDao extends GenericDao, StateDao> Format. * - API response use Map format - * - In database plain String with DB_PARM_DELIMITER - * - rest of the code uses List> + * - In database plain String with DB_PARM_DELIMITER + * - rest of the code uses List> */ public LBStickinessPolicyVO(long loadBalancerId, String name, String methodName, Map paramList, String description) { this.loadBalancerId = loadBalancerId; diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java index 6f5ae62533b..88d83d49e39 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVO.java @@ -30,7 +30,7 @@ import com.cloud.utils.net.NetUtils; /** * This VO represent Public Load Balancer - * It references source ip address by its Id. + * It references source ip address by its Id. * To get the VO for Internal Load Balancer rule, please refer to LoadBalancerRuleVO * */ diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDao.java b/engine/schema/src/com/cloud/network/dao/NetworkDao.java index f5c49f6c3a8..e9405e90046 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDao.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDao.java @@ -5,7 +5,7 @@ // 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, @@ -49,7 +49,7 @@ public interface NetworkDao extends GenericDao, StateDao listByFirewallDeviceId(long lbDeviceId); } diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java index 8e3917ef9ff..a3a7c46db79 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDao.java @@ -32,7 +32,7 @@ public interface NetworkExternalLoadBalancerDao extends GenericDao listByLoadBalancerDeviceId(long lbDeviceId); } diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java index 59967045dbe..1e8cc60889f 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodVO.java @@ -26,7 +26,7 @@ import javax.persistence.Id; import javax.persistence.Table; /** - * + * */ @Entity @Table(name = "physical_network_isolation_methods") diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java index 787c049d3c0..f39c6900560 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTagVO.java @@ -26,7 +26,7 @@ import javax.persistence.Id; import javax.persistence.Table; /** - * + * */ @Entity @Table(name = "physical_network_tags") diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java index 1aa966641eb..43a9bd45082 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileDao.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileDao.java @@ -39,12 +39,12 @@ public interface PortProfileDao extends GenericDao { /** * Other candidate functions that could be helpful. - * + * * List all portprofiles configured with a particular id. * List listByVlanId(int vlanId); - * + * * List all uplink portprofiles (these represent physical ports). * List listAllUplinkPortProfiles(); // we may have to provide some filter, like clusterId or zoneId or something. - * + * */ } \ No newline at end of file diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java b/engine/schema/src/com/cloud/network/dao/PortProfileVO.java index 117563abdf1..969c7f47b61 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileVO.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileVO.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.api.InternalIdentity; /** * PortProfileVO contains information on portprofiles that are created on a Cisco Nexus 1000v VSM associated - * with a VMWare cluster. + * with a VMWare cluster. */ @Entity diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java index caceb0ff1b5..afcd4b608dd 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java index 17d19b495c9..cd8d9e213fa 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java index 824fc74e49e..09a845a46f5 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java index 60f613a363d..469ef9a5cc9 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java index 57deb86fd8b..e32533f6a5c 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java index 9e838e7e958..33b2cf2deb0 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java index 9b393e60c1c..d3fef252f50 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java index fc5a5dbdb85..658ca0ab407 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java index cff899aafec..980a7ebb6a3 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java index 0081f7819d7..039575d9404 100644 --- a/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java +++ b/engine/schema/src/com/cloud/network/rules/FirewallRuleVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/rules/PortForwardingRuleVO.java b/engine/schema/src/com/cloud/network/rules/PortForwardingRuleVO.java index 430575b0832..2e71de1fbc9 100644 --- a/engine/schema/src/com/cloud/network/rules/PortForwardingRuleVO.java +++ b/engine/schema/src/com/cloud/network/rules/PortForwardingRuleVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java index 35dca78a954..4694cb9eb37 100644 --- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java +++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java @@ -26,8 +26,8 @@ public interface PortForwardingRulesDao extends GenericDao listByIpAndNotRevoked(long ipId); diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java index fc5a7da8ddc..f78f5be819f 100644 --- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java index e4b187184ff..72e49004feb 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java index 1ecf37d13fd..872eef7b444 100644 --- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java +++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java index 675f8d09685..8835e4d971a 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDao.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDao.java index 573fde3c7d5..7f0a4ac0a95 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDao.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDao.java @@ -22,7 +22,7 @@ import com.cloud.utils.db.GenericDao; public interface VpcOfferingDao extends GenericDao { /** * Returns the VPC offering that matches the unique name. - * + * * @param uniqueName * name * @return VpcOfferingVO diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDao.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDao.java index 5bb79ced69f..b7aa94bbaa8 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDao.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDao.java @@ -30,12 +30,12 @@ import com.cloud.utils.db.GenericDao; /** * NetworkOfferingDao deals with searches and operations done on the * network_offering table. - * + * */ public interface NetworkOfferingDao extends GenericDao { /** * Returns the network offering that matches the name. - * + * * @param uniqueName * name * @return NetworkOfferingVO @@ -44,7 +44,7 @@ public interface NetworkOfferingDao extends GenericDao /** * If not, then it persists it into the database. - * + * * @param offering * network offering to persist if not in the database. * @return NetworkOfferingVO backed by a row in the database diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java index e3efbe2d5b2..861644986c3 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java index 354eb745e77..e8f5520e357 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/projects/ProjectVO.java b/engine/schema/src/com/cloud/projects/ProjectVO.java index 691d1aa7c8c..c96a9e38194 100644 --- a/engine/schema/src/com/cloud/projects/ProjectVO.java +++ b/engine/schema/src/com/cloud/projects/ProjectVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java b/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java index 3b70984e63c..53c08322e0c 100644 --- a/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java +++ b/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java @@ -31,7 +31,7 @@ import com.cloud.utils.db.GenericDaoBase; /** * Join table for storage pools and hosts - * + * */ @Entity @Table(name = "storage_pool_host_ref") diff --git a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java index c91681e013e..ebbf840bfca 100755 --- a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java @@ -37,7 +37,7 @@ import com.cloud.utils.db.GenericDaoBase; /** * Join table for storage hosts and templates - * + * */ @Entity @Table(name = "template_host_ref") diff --git a/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java b/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java index af2d432692d..316bc15c43d 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java @@ -37,7 +37,7 @@ import com.cloud.utils.db.GenericDaoBase; /** * Join table for storage pools and templates - * + * */ @Entity @Table(name = "template_spool_ref") diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java index 5fd7b246d86..513dbfaccab 100755 --- a/engine/schema/src/com/cloud/storage/VolumeHostVO.java +++ b/engine/schema/src/com/cloud/storage/VolumeHostVO.java @@ -40,7 +40,7 @@ import com.cloud.utils.db.GenericDaoBase; /** * Join table for storage hosts and volumes - * + * */ @Entity @Table(name = "volume_host_ref") diff --git a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDao.java b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDao.java index 146e180fd07..80dc9656706 100644 --- a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDao.java +++ b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDao.java @@ -26,7 +26,7 @@ public interface LaunchPermissionDao extends GenericDao, StateDao implements * ParentIdSearch.and("prevSnapshotId", * ParentIdSearch.entity().getPrevSnapshotId(), SearchCriteria.Op.EQ); * ParentIdSearch.done(); - * + * * backupUuidSearch = createSearchBuilder(); * backupUuidSearch.and("backupUuid", * backupUuidSearch.entity().getBackupSnapshotId(), diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java index affa36c428d..178605d377d 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java @@ -159,7 +159,7 @@ public class StoragePoolHostDaoImpl extends GenericDaoBase, StateDao, StateDao { /** * find a work item based on the instanceId and the state. - * + * * @param instanceId vm instance id * @param state state * @return ItWorkVO if found; null if not. @@ -33,7 +33,7 @@ public interface ItWorkDao extends GenericDao { ItWorkVO findByOutstandingWork(long instanceId, State state); /** - * cleanup rows that are either Done or Cancelled and been that way + * cleanup rows that are either Done or Cancelled and been that way * for at least wait time. */ void cleanup(long wait); diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java index 7cce74ea317..f3f7f919b60 100644 --- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java +++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java b/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java index c9eb1308950..02cf68d7b75 100755 --- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java +++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index 58b5432d92e..55cb9525d71 100755 --- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/vm/dao/NicDao.java b/engine/schema/src/com/cloud/vm/dao/NicDao.java index e946d444bb9..3c80729778b 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDao.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java index beea016b8a1..2ac6a8090ef 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmData.java b/engine/schema/src/com/cloud/vm/dao/UserVmData.java index 64e5d6d23e7..1963d70f5c8 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmData.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmData.java @@ -676,7 +676,7 @@ public class UserVmData { this.domainName = domainName; } - /* FIXME : the below functions are not used, so commenting out later need to include egress list + /* FIXME : the below functions are not used, so commenting out later need to include egress list public List getIngressRules() { return securityGroupRules; } diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java index 40e1b78dd23..f541b2a93bf 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java b/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java index a9e3689ca61..9e0cbc6f647 100644 --- a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java +++ b/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDao.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java index fc9ba24d89f..f0f04c4cd6b 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java index cf2c0de829c..d1402434d54 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java index ff2ea60f647..71650abb9fe 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java index e953abb03e9..77d5256bb9a 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java @@ -39,7 +39,7 @@ import com.cloud.utils.fsm.StateObject; /** * Join table for image_data_store and snapshots - * + * */ @Entity @Table(name = "snapshot_store_ref") diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java index e671c6cbd03..897fee0e4de 100755 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java @@ -40,7 +40,7 @@ import com.cloud.utils.fsm.StateObject; /** * Join table for image_data_store and templates - * + * */ @Entity @Table(name = "template_store_ref") diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java index 39566268d06..d7b974249ee 100755 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java @@ -39,7 +39,7 @@ import com.cloud.utils.fsm.StateObject; /** * Join table for image_data_store and volumes - * + * */ @Entity @Table(name = "volume_store_ref") diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java b/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java index ed5ab461053..fc432ac020d 100644 --- a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java +++ b/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheReplacementAlgorithmLRU.java @@ -59,7 +59,7 @@ public class StorageCacheReplacementAlgorithmLRU implements StorageCacheReplacem @PostConstruct public void initialize() { - /* Avoid using configDao at this time, we can't be sure that the database is already upgraded + /* Avoid using configDao at this time, we can't be sure that the database is already upgraded * and there might be fatal errors when using a dao. */ //unusedTimeInterval = NumbersUtil.parseInt(configDao.getValue(Config.StorageCacheReplacementLRUTimeInterval.key()), 30); 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 a6073d5fd0e..503d3722528 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 @@ -133,12 +133,12 @@ public class TemplateObject implements TemplateInfo { } /* - * + * * // If the template that was passed into this allocator is not * installed in the storage pool, // add 3 * (template size on secondary * storage) to the running total VMTemplateHostVO templateHostVO = * _storageMgr.findVmTemplateHost(templateForVmCreation.getId(), null); - * + * * if (templateHostVO == null) { VMTemplateSwiftVO templateSwiftVO = * _swiftMgr.findByTmpltId(templateForVmCreation.getId()); if * (templateSwiftVO != null) { long templateSize = diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java index c3218ed0eb6..0a390e5b266 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/MockLocalNfsSecondaryStorageResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package org.apache.cloudstack.storage; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java index 93ba57369f3..f3b1a9c507f 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package org.apache.cloudstack.storage.test; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java index 70754a13b34..c6d47279acb 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java @@ -244,7 +244,7 @@ public class SnapshotTest extends CloudStackTestNGBase { /* * TemplateDataStoreVO templateStore = new TemplateDataStoreVO(); - * + * * templateStore.setDataStoreId(imageStore.getId()); * templateStore.setDownloadPercent(100); * templateStore.setDownloadState(Status.DOWNLOADED); @@ -304,7 +304,7 @@ public class SnapshotTest extends CloudStackTestNGBase { * this.podId); params.put("roles", * DataStoreRole.Primary.toString()); params.put("uuid", uuid); * params.put("providerName", String.valueOf(provider.getName())); - * + * * DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle(); * DataStore store = lifeCycle.initialize(params); ClusterScope * scope = new ClusterScope(clusterId, podId, dcId); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java index 53a6464304a..6b5d7c2c0a2 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java @@ -22,9 +22,9 @@ import org.springframework.beans.factory.FactoryBean; /** * A {@link FactoryBean} for creating mocked beans based on Mockito so that they * can be {@link @Autowired} into Spring test configurations. - * + * * @author Mattias Severson, Jayway - * + * * @see FactoryBean * @see org.mockito.Mockito */ @@ -34,7 +34,7 @@ public class StorageFactoryBean implements FactoryBean { /** * Creates a Mockito mock instance of the provided class. - * + * * @param classToBeMocked * The class to be mocked. */ diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java index 40f3720dc92..89a8fa46121 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package org.apache.cloudstack.storage.test; diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java index b4049324355..07dc9dab1c9 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java @@ -223,7 +223,7 @@ public class VolumeTest extends CloudStackTestNGBase { /* * TemplateDataStoreVO templateStore = new TemplateDataStoreVO(); - * + * * templateStore.setDataStoreId(imageStore.getId()); * templateStore.setDownloadPercent(100); * templateStore.setDownloadState(Status.DOWNLOADED); @@ -282,7 +282,7 @@ public class VolumeTest extends CloudStackTestNGBase { * this.podId); params.put("roles", * DataStoreRole.Primary.toString()); params.put("uuid", uuid); * params.put("providerName", String.valueOf(provider.getName())); - * + * * DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle(); * DataStore store = lifeCycle.initialize(params); ClusterScope * scope = new ClusterScope(clusterId, podId, dcId); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java index 60fed40dbb0..f7302edf7d9 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java @@ -227,7 +227,7 @@ public class VolumeTestVmware extends CloudStackTestNGBase { /* * TemplateDataStoreVO templateStore = new TemplateDataStoreVO(); - * + * * templateStore.setDataStoreId(imageStore.getId()); * templateStore.setDownloadPercent(100); * templateStore.setDownloadState(Status.DOWNLOADED); @@ -283,7 +283,7 @@ public class VolumeTestVmware extends CloudStackTestNGBase { * this.podId); params.put("roles", * DataStoreRole.Primary.toString()); params.put("uuid", uuid); * params.put("providerName", String.valueOf(provider.getName())); - * + * * DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle(); * DataStore store = lifeCycle.initialize(params); ClusterScope * scope = new ClusterScope(clusterId, podId, dcId); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java index a9449733032..66740bc6e89 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java @@ -334,14 +334,14 @@ public class volumeServiceTest extends CloudStackTestNGBase { * ("sample primary data store provider"); * primaryDataStoreProviderMgr.configure("primary data store mgr", * new HashMap()); - * + * * List ds = * primaryStoreDao.findPoolByName(this.primaryName); if (ds.size() * >= 1) { PrimaryDataStoreVO store = ds.get(0); if * (store.getRemoved() == null) { return * provider.getDataStore(store.getId()); } } - * - * + * + * * Map params = new HashMap(); * params.put("url", this.getPrimaryStorageUrl()); * params.put("dcId", dcId.toString()); params.put("clusterId", @@ -452,13 +452,13 @@ public class volumeServiceTest extends CloudStackTestNGBase { * AssertJUnit.assertFalse(new VMDK().equals(new VHD())); VMDK vmdk = * new VMDK(); AssertJUnit.assertTrue(vmdk.equals(vmdk)); VMDK newvmdk = * new VMDK(); AssertJUnit.assertTrue(vmdk.equals(newvmdk)); - * + * * ImageFormat ova = new OVA(); ImageFormat iso = new ISO(); * AssertJUnit.assertTrue(ova.equals(new OVA())); * AssertJUnit.assertFalse(ova.equals(iso)); * AssertJUnit.assertTrue(ImageFormatHelper.getFormat("test").equals(new * Unknown())); - * + * * VolumeDiskType qcow2 = new QCOW2(); ImageFormat qcow2format = new * org.apache.cloudstack.storage.image.format.QCOW2(); * AssertJUnit.assertFalse(qcow2.equals(qcow2format)); diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java index b26da581233..36fb1c3b0b6 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java @@ -337,7 +337,7 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C /** * called by DatabaseUpgradeChecker to see if there are other peers running. - * + * * @param notVersion * If version is passed in, the peers CANNOT be running at this version. If version is null, return true if any * peer is running regardless of version. diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java index 879d772f99a..b400e6f9bd2 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java @@ -26,7 +26,7 @@ import com.cloud.utils.exception.CloudRuntimeException; /** * ConfigKey supplants the original Config.java. It is just a class * declaration where others can declare their config variables. - * + * */ public class ConfigKey { diff --git a/framework/config/src/org/apache/cloudstack/framework/config/Configurable.java b/framework/config/src/org/apache/cloudstack/framework/config/Configurable.java index 4db1c9470fd..773778c6c25 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/Configurable.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/Configurable.java @@ -19,7 +19,7 @@ package org.apache.cloudstack.framework.config; /** * Configurable can be implemented by components to insert their own * configuration keys. - * + * * CloudStack will gather all of these configurations at startup and insert * them into the configuration table. * diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java b/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java index 5a269d4385f..f990278b45c 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java @@ -19,7 +19,7 @@ package org.apache.cloudstack.framework.config; import org.apache.cloudstack.framework.config.ConfigKey.Scope; /** - * + * * This method is used by individual storage for configuration * */ diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java index 92b36d057ea..d5c862638d2 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java @@ -26,11 +26,11 @@ import com.cloud.utils.db.GenericDao; public interface ConfigurationDao extends GenericDao { /** - * + * * 1. params passed in. * 2. configuration for the instance. * 3. configuration for the DEFAULT instance. - * + * * @param params parameters from the components.xml which will override the database values. * @return a consolidated look at the configuration parameters. */ diff --git a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java index aff6b902ba8..6a9c7a29e66 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java @@ -47,7 +47,7 @@ import com.cloud.utils.exception.CloudRuntimeException; * - Gather all of the Configurable interfaces and insert their config * variables into the config table. * - Hide the data source where configs are stored and retrieved. - * + * * When dealing with this class, we must be very careful on cluster situations. * * TODO: diff --git a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java b/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java index 63d4421e947..2a59fbdb3f2 100644 --- a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java +++ b/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java @@ -40,7 +40,7 @@ import com.cloud.utils.mgmt.JmxUtil; /** * ConnectionConcierge keeps stand alone database connections alive. This is * needs someone to keep that database connection from being garbage collected - * + * */ public class ConnectionConcierge { diff --git a/framework/db/src/com/cloud/utils/db/DB.java b/framework/db/src/com/cloud/utils/db/DB.java index b67f93e814a..85891f677a5 100644 --- a/framework/db/src/com/cloud/utils/db/DB.java +++ b/framework/db/src/com/cloud/utils/db/DB.java @@ -25,13 +25,13 @@ import java.lang.annotation.Target; /** * Running with assertions on, will find all classes that are - * + * * 1. Annotate method that starts and commits DB transactions. * Transaction txn = Transaction.currentTxn(); * txn.start(); * ... * txn.commit(); - * + * * 2. Annotate methods that uses a DAO's acquire method. * _dao.acquireInLockTable(id); * ... diff --git a/framework/db/src/com/cloud/utils/db/Encrypt.java b/framework/db/src/com/cloud/utils/db/Encrypt.java index 4973458c686..503c3d4e521 100755 --- a/framework/db/src/com/cloud/utils/db/Encrypt.java +++ b/framework/db/src/com/cloud/utils/db/Encrypt.java @@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; /** - * Encrypt is a replacement for the column modification. + * Encrypt is a replacement for the column modification. */ @Target(FIELD) @Retention(RUNTIME) diff --git a/framework/db/src/com/cloud/utils/db/Filter.java b/framework/db/src/com/cloud/utils/db/Filter.java index e2eb09f4bf8..b2482fdb3a2 100755 --- a/framework/db/src/com/cloud/utils/db/Filter.java +++ b/framework/db/src/com/cloud/utils/db/Filter.java @@ -26,10 +26,10 @@ import com.cloud.utils.ReflectUtil; /** * Try to use static initialization to help you in finding incorrect * field names being passed in early. - * + * * Something like the following: * protected static final Filter s_NameFilter = new Filter(VMInstanceVO, name, true, null, null); - * + * * Filter nameFilter = new Filter(s_nameFilter); * */ diff --git a/framework/db/src/com/cloud/utils/db/GenericDao.java b/framework/db/src/com/cloud/utils/db/GenericDao.java index ab224929414..14169ff9545 100755 --- a/framework/db/src/com/cloud/utils/db/GenericDao.java +++ b/framework/db/src/com/cloud/utils/db/GenericDao.java @@ -72,7 +72,7 @@ public interface GenericDao { /** * Returns a SearchCriteria object that can be used to build search conditions. - * + * * @return SearchCriteria */ SearchCriteria createSearchCriteria(); @@ -80,7 +80,7 @@ public interface GenericDao { /** * lock the rows that matched the search criteria and filter. This method needs * to be called within a transaction. - * + * * @param sc SearchCriteria containing the different search conditions * @param filter Filter containing limits etc * @param exclusive exclusive or share lock @@ -108,7 +108,7 @@ public interface GenericDao { /** * Acquires a database wide lock on the id of the entity. This ensures * that only one is being used. The timeout is the configured default. - * + * * @param id id of the entity to acquire an lock on. * @return object if acquired; null if not. If null, you need to call findById to see if it is actually not found. */ @@ -117,7 +117,7 @@ public interface GenericDao { /** * Acquires a database wide lock on the id of the entity. This ensures * that only one is being used. The timeout is the configured default. - * + * * @param id id of the entity to acquire an lock on. * @param seconds time to wait for the lock. * @return entity if the lock is acquired; null if not. diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java index 4f09d56a519..1a582df1f0d 100755 --- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java +++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java @@ -88,7 +88,7 @@ import com.cloud.utils.net.NetUtils; * GenericDaoBase is completely at the mercy of the annotations you add * to your entity bean. If GenericDaoBase does not fit your needs, then * don't extend from it. - * + * * GenericDaoBase attempts to achieve the following: * 1. If you use _allFieldsStr in your SQL statement and use to() to convert * the result to the entity bean, you don't ever have to worry about @@ -98,7 +98,7 @@ import com.cloud.utils.net.NetUtils; * in all of your DAOs. * 3. You don't have to match the '?' (you know what I'm talking about) to * the fields in the insert statement as that's taken care of for you. - * + * * GenericDaoBase looks at the following annotations: * 1. Table - just name * 2. Column - just name @@ -106,12 +106,12 @@ import com.cloud.utils.net.NetUtils; * 4. SequenceGenerator - sequence generator * 5. Id * 6. SecondaryTable - * + * * Sometime later, I might look into injecting the SQLs as needed but right * now we have to construct them at construction time. The good thing is that * the DAOs are suppose to be one per jvm so the time is all during the * initial load. - * + * **/ @DB public abstract class GenericDaoBase extends ComponentLifecycleBase implements GenericDao, ComponentMethodInterceptable { diff --git a/framework/db/src/com/cloud/utils/db/GenericQueryBuilder.java b/framework/db/src/com/cloud/utils/db/GenericQueryBuilder.java index 28cfebc5f94..9b100d4fda4 100755 --- a/framework/db/src/com/cloud/utils/db/GenericQueryBuilder.java +++ b/framework/db/src/com/cloud/utils/db/GenericQueryBuilder.java @@ -30,26 +30,26 @@ import com.cloud.utils.db.SearchCriteria.Op; * GenericSearchBuilder in that it is used for building queries during runtime * where GenericSearchBuilder expects the query to be built during load time * and parameterized values to be set during runtime. - * + * * GenericQueryBuilder allows results to be a native type, the entity bean, * and a composite type. If you are just retrieving the entity bean, there * is a simpler class called QueryBuilder that you can use. The usage * is approximately the same. - * + * * * // Note that in the following search, it selects a func COUNT to be the * // return result so for the second parameterized type is long. * // Note the entity object itself must have came from search and * // it uses the getters of the object to retrieve the field used in the search. - * + * * GenericQueryBuilder sc = GenericQueryBuilder.create(HostVO.class, Long.class); * HostVO entity = CountSearch.entity(); * sc.select(null, FUNC.COUNT, null, null).where(entity.getType(), Op.EQ, Host.Type.Routing); * sc.and(entity.getCreated(), Op.LT, new Date()); * Long count = sc.find(); - * + * * * - * + * * @see GenericSearchBuilder * @see QueryBuilder * @@ -78,7 +78,7 @@ public class GenericQueryBuilder extends SearchBase extends SearchBase extends SearchBase * // To specify the GenericSearchBuilder, you should do this at load time. * // Note that in the following search, it selects a func COUNT to be the @@ -44,18 +44,18 @@ import com.cloud.utils.db.SearchCriteria.Op; * // presets the type in the search and declares created to be set during * // runtime. Note the entity object itself must have came from search and * // it uses the getters of the object to retrieve the field used in the search. - * + * * GenericSearchBuilder CountSearch = _hostDao.createSearchBuilder(Long.class); * HostVO entity = CountSearch.entity(); * CountSearch.select(null, FUNC.COUNT, null, null).where(entity.getType(), Op.EQ).value(Host.Type.Routing); * CountSearch.and(entity.getCreated(), Op.LT, "create_date").done(); - * + * * // Later in the code during runtime * SearchCriteria sc = CountSearch.create(); * sc.setParameter("create_date", new Date()); * Long count = _hostDao.customizedSearch(sc, null); * - * + * * @see GenericQueryBuilder for runtime construction of search query * @see SearchBuilder for returning VO objects itself * @@ -69,7 +69,7 @@ public class GenericSearchBuilder extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase extends SearchBase, T, K> { /** * Specifies how the search query should be grouped - * + * * @param fields fields of the entity object that should be grouped on. The order is important. * @return GroupBy object to perform more operations on. * @see GroupBy @@ -98,7 +98,7 @@ public abstract class SearchBase, T, K> { /** * Specifies what to select in the search. - * + * * @param fieldName The field name of the result object to put the value of the field selected. This can be null if you're selecting only one field and the result is not a complex object. * @param func function to place. * @param field column to select. Call this with this.entity() method. @@ -148,7 +148,7 @@ public abstract class SearchBase, T, K> { /** * Select fields from the entity object to be selected in the search query. - * + * * @param fields fields from the entity object * @return itself */ @@ -183,7 +183,7 @@ public abstract class SearchBase, T, K> { /** * joins this search with another search - * + * * @param name name given to the other search. used for setJoinParameters. * @param builder The other search * @param joinField1 field of the first table used to perform the join @@ -252,7 +252,7 @@ public abstract class SearchBase, T, K> { /** * creates the SearchCriteria so the actual values can be filled in. - * + * * @return SearchCriteria */ public SearchCriteria create() { @@ -265,13 +265,13 @@ public abstract class SearchBase, T, K> { /** * Adds an OR condition to the search. Normally you should use this to * perform an 'OR' with a big conditional in parenthesis. For example, - * + * * search.or().op(entity.getId(), Op.Eq, "abc").cp() - * + * * The above fragment produces something similar to - * + * * "OR (id = $abc) where abc is the token to be replaced by a value later. - * + * * @return this */ @SuppressWarnings("unchecked") @@ -283,13 +283,13 @@ public abstract class SearchBase, T, K> { /** * Adds an AND condition to the search. Normally you should use this to * perform an 'AND' with a big conditional in parenthesis. For example, - * + * * search.and().op(entity.getId(), Op.Eq, "abc").cp() - * + * * The above fragment produces something similar to - * + * * "AND (id = $abc) where abc is the token to be replaced by a value later. - * + * * @return this */ @SuppressWarnings("unchecked") diff --git a/framework/db/src/com/cloud/utils/db/SearchBuilder.java b/framework/db/src/com/cloud/utils/db/SearchBuilder.java index 45082315a75..3f1fa3b558d 100755 --- a/framework/db/src/com/cloud/utils/db/SearchBuilder.java +++ b/framework/db/src/com/cloud/utils/db/SearchBuilder.java @@ -20,7 +20,7 @@ package com.cloud.utils.db; * SearchBuilder is meant as a static query construct. Often times in DAO code, * we write static sql that just assumes the database table does not change. * change by hand. SearchBuilder is meant to replace that. It provides load-time - * + * * 1. SearchBuilder is declared as final because it should not change after load time. * 2. search.entity().getHostId() allows you to declare which field you are searching * on. By doing this, we take advantage of the compiler to check that we @@ -32,7 +32,7 @@ package com.cloud.utils.db; * 4. Note that the same field (getHostId()) was specified with two param * names. This is basically allowing you to reuse the same field in two * parts of the search. - * + * * {@code * final SearchBuilder search = _userVmDao.createSearchBuilder(); * final String param1 = "param1"; @@ -43,14 +43,14 @@ package com.cloud.utils.db; * SearchCriteria sc = search.create(); * sc.setParameters(param1, 3); * sc.setParameters(param2, 1); - * + * * ... - * + * * SearchCriteria sc2 = search.create(); * sc2.setParameters(param1, 4); * sc2.setParameters(param2, 1); * } - * + * * @param VO object. */ public class SearchBuilder extends GenericSearchBuilder { diff --git a/framework/db/src/com/cloud/utils/db/SequenceFetcher.java b/framework/db/src/com/cloud/utils/db/SequenceFetcher.java index 93b207b8c2d..e0b4f978247 100644 --- a/framework/db/src/com/cloud/utils/db/SequenceFetcher.java +++ b/framework/db/src/com/cloud/utils/db/SequenceFetcher.java @@ -37,7 +37,7 @@ import com.cloud.utils.concurrency.NamedThreadFactory; * Since Mysql does not have sequence support, we have * table retrieval was inside a transaction, the value * gets locked until the transaction is over. - * + * * allocation size. * */ diff --git a/framework/db/src/com/cloud/utils/db/SqlGenerator.java b/framework/db/src/com/cloud/utils/db/SqlGenerator.java index 34dca2ae25f..86e28909660 100755 --- a/framework/db/src/com/cloud/utils/db/SqlGenerator.java +++ b/framework/db/src/com/cloud/utils/db/SqlGenerator.java @@ -615,7 +615,7 @@ public class SqlGenerator { /** * buildDiscriminatorClause builds the join clause when there are multiple tables. - * + * * @return */ public Pair> buildDiscriminatorClause() { diff --git a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java b/framework/db/src/com/cloud/utils/db/TransactionLegacy.java index f7e13402c44..bec35d0356b 100755 --- a/framework/db/src/com/cloud/utils/db/TransactionLegacy.java +++ b/framework/db/src/com/cloud/utils/db/TransactionLegacy.java @@ -49,7 +49,7 @@ import com.cloud.utils.mgmt.JmxUtil; /** * Transaction abstracts away the Connection object in JDBC. It allows the * following things that the Connection object does not. - * + * * 1. Transaction can be started at an entry point and whether the DB * actions should be auto-commit or not determined at that point. * 2. DB Connection is allocated only when it is needed. @@ -455,11 +455,11 @@ public class TransactionLegacy { /** * Prepares an auto close statement. The statement is closed automatically if it is * retrieved with this method. - * + * * @param sql sql String * @return PreparedStatement * @throws SQLException if problem with JDBC layer. - * + * * @see java.sql.Connection */ public PreparedStatement prepareAutoCloseStatement(final String sql) throws SQLException { @@ -481,12 +481,12 @@ public class TransactionLegacy { /** * Prepares an auto close statement. The statement is closed automatically if it is * retrieved with this method. - * + * * @param sql sql String * @param autoGeneratedKeys keys that are generated * @return PreparedStatement * @throws SQLException if problem with JDBC layer. - * + * * @see java.sql.Connection */ public PreparedStatement prepareAutoCloseStatement(final String sql, final int autoGeneratedKeys) throws SQLException { @@ -503,12 +503,12 @@ public class TransactionLegacy { /** * Prepares an auto close statement. The statement is closed automatically if it is * retrieved with this method. - * + * * @param sql sql String * @param columnNames names of the columns * @return PreparedStatement * @throws SQLException if problem with JDBC layer. - * + * * @see java.sql.Connection */ public PreparedStatement prepareAutoCloseStatement(final String sql, final String[] columnNames) throws SQLException { @@ -525,11 +525,11 @@ public class TransactionLegacy { /** * Prepares an auto close statement. The statement is closed automatically if it is * retrieved with this method. - * + * * @param sql sql String * @return PreparedStatement * @throws SQLException if problem with JDBC layer. - * + * * @see java.sql.Connection */ public PreparedStatement prepareAutoCloseStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { @@ -545,11 +545,11 @@ public class TransactionLegacy { /** * Returns the db connection. - * + * * Note: that you can call getConnection() but beaware that * all prepare statements from the Connection are not garbage * collected! - * + * * @return DB Connection but make sure you understand that * you are responsible for closing the PreparedStatement. * @throws SQLException @@ -678,7 +678,7 @@ public class TransactionLegacy { /** * close() is used by endTxn to close the connection. This method only * closes the connection if the name is the same as what's stored. - * + * * @param name * @return true if this close actually closes the connection. false if not. */ @@ -1210,7 +1210,7 @@ public class TransactionLegacy { /** * Used for unit testing primarily - * + * * @param conn */ protected void setConnection(Connection conn) { diff --git a/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java b/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java index 66a8a0d91a8..1075a423176 100644 --- a/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java +++ b/framework/db/test/com/cloud/utils/db/TransactionContextBuilderTest.java @@ -49,7 +49,7 @@ public class TransactionContextBuilderTest { DbAnnotatedBase base = ComponentContext.inject(new DbAnnotatedBase()); base.MethodWithClassDbAnnotated(); - /* + /* Map components = ComponentContext.getApplicationContext().getBeansOfType(DbAnnotatedBase.class); for(Map.Entry entry : components.entrySet()) { System.out.println(entry.getKey()); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java index a0f99aa9be5..b391df17d1d 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java @@ -46,7 +46,7 @@ public interface RpcClientCall { void cancel(); /** - * @return the result object， it may also throw RpcException to indicate RPC failures + * @return the result object， it may also throw RpcException to indicate RPC failures */ T get(); } diff --git a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java index 2b11900ea5c..84b5b3da610 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java @@ -24,7 +24,7 @@ public interface RpcServiceEndpoint { * true call has been handled * false can not find the call handler * @throws - * RpcException, exception when + * RpcException, exception when */ boolean onCallReceive(RpcServerCall call); } diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java index ea38e999c77..177ae09a592 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java @@ -33,7 +33,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarInputStream; // -// Finding classes in a given package code is taken and modified from +// Finding classes in a given package code is taken and modified from // Credit: http://internna.blogspot.com/2007/11/java-5-retrieving-all-classes-from.html // public class OnwireClassRegistry { diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java index e94152959f0..e026b9a3333 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java @@ -31,7 +31,7 @@ public class AsyncSampleListenerStyleCaller { @Override public void complete(String resultObject) { // TODO Auto-generated method stub - + } });*/ } diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java index a4ac3d06dab..d1a4a9d5930 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java @@ -47,7 +47,7 @@ public interface AsyncJobManager extends Manager { /** * A running thread inside management server can have a 1:1 linked pseudo job. * This is to help make some legacy code work without too dramatic changes. - * + * * All pseudo jobs should be expunged upon management start event * * @return pseudo job for the thread @@ -58,11 +58,11 @@ public interface AsyncJobManager extends Manager { * Used by upper level job to wait for completion of a down-level job (usually VmWork jobs) * in synchronous way. Caller needs to use waitAndCheck() to check the completion status * of the down-level job - * + * * Due to the amount of legacy code that relies on synchronous-call semantics, this form of joinJob * is used mostly - * - * + * + * * @param jobId upper job that is going to wait the completion of a down-level job * @param joinJobId down-level job */ @@ -72,7 +72,7 @@ public interface AsyncJobManager extends Manager { * Used by upper level job to wait for completion of a down-level job (usually VmWork jobs) * in asynchronous way, it will cause upper job to cease current execution, upper job will be * rescheduled to execute periodically or on wakeup events detected from message bus - * + * * @param jobId upper job that is going to wait the completion of a down-level job * @param joinJobId down-level job * @Param wakeupHandler wake-up handler @@ -86,7 +86,7 @@ public interface AsyncJobManager extends Manager { /** * Dis-join two related jobs - * + * * @param jobId * @param joinedJobId */ @@ -94,7 +94,7 @@ public interface AsyncJobManager extends Manager { /** * Used by down-level job to notify its completion to upper level jobs - * + * * @param joinJobId down-level job for upper level job to join with * @param joinStatus AsyncJobConstants status code to indicate success or failure of the * down-level job @@ -112,7 +112,7 @@ public interface AsyncJobManager extends Manager { /** * This method will be deprecated after all code has been migrated to fully-asynchronous mode * that uses async-feature of joinJob/disjoinJob - * + * * @param wakupTopicsOnMessageBus topic on message bus to wakeup the wait * @param checkIntervalInMilliSeconds time to break out wait for checking predicate condition * @param timeoutInMiliseconds time out to break out the whole wait process diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/Outcome.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/Outcome.java index b400b71fd20..13a62f222da 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/Outcome.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/Outcome.java @@ -24,11 +24,11 @@ import java.util.concurrent.TimeUnit; * outcome of a job. It fully complies with how Future interface is designed. * In addition, it allows the callee to file a task to be scheduled when the * job completes. - * + * * Note that the callee should schedule a job when using the Task interface. * It shouldn't try to complete the job in the schedule code as that will take * up threads in the jobs framework. - * + * * For the client of the jobs framework, you can either use the OutcomeImpl * class to implement this interface or you can add to this interface to * allow for your specific exceptions to be thrown. @@ -41,7 +41,7 @@ public interface Outcome extends Future { /** * In addition to the normal Future methods, Outcome allows the ability * to register a schedule task to be performed when the job is completed. - * + * * @param listener */ void execute(Task task); diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java index a3c0d600c71..dc9cca498f9 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractBeanCollector.java @@ -29,8 +29,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor; /** * This class provides a method to do basically the same as @Inject of a type, but - * it will only find the types in the current context and not the parent. This class - * should only be used for very specific Spring bootstrap logic. In general @Inject + * it will only find the types in the current context and not the parent. This class + * should only be used for very specific Spring bootstrap logic. In general @Inject * is infinitely better. Basically you need a very good reason to use this. * */ @@ -38,7 +38,7 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple Class[] typeClasses = new Class[] {}; Map, Set> beans = new HashMap, Set>(); - + @Override public int getPhase() { return 2000; @@ -52,21 +52,21 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple break; } } - + return bean; } - + protected void doPostProcessBeforeInitialization(Object bean, String beanName) throws BeansException { } protected void doPostProcessAfterInitialization(Object bean, Class typeClass, String beanName) throws BeansException { Set beansOfType = beans.get(typeClass); - + if ( beansOfType == null ) { beansOfType = new HashSet(); beans.put(typeClass, beansOfType); } - + beansOfType.add(bean); } @@ -77,24 +77,24 @@ public abstract class AbstractBeanCollector extends AbstractSmartLifeCycle imple doPostProcessAfterInitialization(bean, typeClass, beanName); } } - + return bean; } protected Set getBeans(Class typeClass) { @SuppressWarnings("unchecked") Set result = (Set) beans.get(typeClass); - + if ( result == null ) return Collections.emptySet(); - + return result; } - + public Class getTypeClass() { if ( typeClasses == null || typeClasses.length == 0 ) return null; - + return typeClasses[0]; } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractSmartLifeCycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractSmartLifeCycle.java index 071817b0b66..ad26fb19fc3 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractSmartLifeCycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractSmartLifeCycle.java @@ -23,7 +23,7 @@ import org.springframework.context.SmartLifecycle; public abstract class AbstractSmartLifeCycle implements SmartLifecycle { boolean running = false; - + @Override public void start() { running = true; diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java index 1b7ea513061..9f3a66929f2 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycle.java @@ -41,9 +41,9 @@ import com.cloud.utils.mgmt.ManagementBean; public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { private static final Logger log = LoggerFactory.getLogger(CloudStackExtendedLifeCycle.class); - + Map> sorted = new TreeMap>(); - + public CloudStackExtendedLifeCycle() { super(); setTypeClasses(new Class[] { @@ -51,24 +51,24 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { SystemIntegrityChecker.class }); } - + @Override public void start() { sortBeans(); checkIntegrity(); configure(); - + super.start(); } protected void checkIntegrity() { for ( SystemIntegrityChecker checker : getBeans(SystemIntegrityChecker.class) ) { log.info("Running system integrity checker {}", checker); - + checker.check(); } } - + public void startBeans() { log.info("Starting CloudStack Components"); @@ -76,7 +76,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { @Override public void with(ComponentLifecycle lifecycle) { lifecycle.start(); - + if ( lifecycle instanceof ManagementBean ) { ManagementBean mbean = (ManagementBean)lifecycle; try { @@ -97,7 +97,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { log.info("Done Starting CloudStack Components"); } - + public void stopBeans() { with(new WithComponentLifeCycle() { @Override @@ -109,7 +109,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { private void configure() { log.info("Configuring CloudStack Components"); - + with(new WithComponentLifeCycle() { @Override public void with(ComponentLifecycle lifecycle) { @@ -121,19 +121,19 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { } } }); - + log.info("Done Configuring CloudStack Components"); } private void sortBeans() { for ( ComponentLifecycle lifecycle : getBeans(ComponentLifecycle.class) ) { Set set = sorted.get(lifecycle.getRunLevel()); - + if ( set == null ) { set = new HashSet(); sorted.put(lifecycle.getRunLevel(), set); } - + set.add(lifecycle); } } @@ -146,7 +146,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { lifecycle.stop(); } }); - + super.stop(); } @@ -157,7 +157,7 @@ public class CloudStackExtendedLifeCycle extends AbstractBeanCollector { } } } - + @Override public int getPhase() { return 2000; diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycleStart.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycleStart.java index 33d4aea24e4..0dc72f93195 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycleStart.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/CloudStackExtendedLifeCycleStart.java @@ -21,7 +21,7 @@ package org.apache.cloudstack.spring.lifecycle; public class CloudStackExtendedLifeCycleStart extends AbstractSmartLifeCycle implements Runnable { CloudStackExtendedLifeCycle lifeCycle; - + @Override public void stop() { lifeCycle.stopBeans(); diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java index b380028964e..82d6a7af6df 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/ConfigDepotLifeCycle.java @@ -35,7 +35,7 @@ public class ConfigDepotLifeCycle implements BeanPostProcessor { if ( bean instanceof Configurable ) { configDepotAdmin.populateConfiguration((Configurable)bean); } - + return bean; } @@ -43,5 +43,5 @@ public class ConfigDepotLifeCycle implements BeanPostProcessor { public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } - + } diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java index 5614a32aee5..424f6dafc41 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/DumpRegistry.java @@ -32,13 +32,13 @@ import org.slf4j.LoggerFactory; public class DumpRegistry extends ComponentLifecycleBase { private static final Logger log = LoggerFactory.getLogger(DumpRegistry.class); - + List> registries; public List> getRegistries() { return registries; } - + @Inject public void setRegistries(List> registries) { this.registries = registries; @@ -48,20 +48,20 @@ public class DumpRegistry extends ComponentLifecycleBase { public boolean start() { for ( Registry registry : registries ) { StringBuilder buffer = new StringBuilder(); - + for ( Object o : registry.getRegistered() ) { if ( buffer.length() > 0 ) buffer.append(", "); - + buffer.append(getName(o)); } - + log.info("Registry [{}] contains [{}]", registry.getName(), buffer); } - + return super.start(); } - + protected String getName(Object o) { String name = null; if (o instanceof Named) { diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java index 38008bb76f2..9e81e0aa3a6 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/ExtensionRegistry.java @@ -39,38 +39,38 @@ import com.cloud.utils.component.Registry; public class ExtensionRegistry implements Registry, Configurable, BeanNameAware { private static final Logger log = LoggerFactory.getLogger(ExtensionRegistry.class); - + String name; String beanName; - + String orderConfigKey; String orderConfigDefault; ConfigKey orderConfigKeyObj; - + String excludeKey; String excludeDefault; ConfigKey excludeKeyObj; - + String configComponentName; List preRegistered; List registered = new CopyOnWriteArrayList(); List readOnly = Collections.unmodifiableList(registered); - + @Override public boolean register(Object item) { if ( registered.contains(item) ) return false; - + String[] order = new String[] {}; Set exclude = new HashSet(); - + if ( orderConfigKeyObj != null ) { Object value = orderConfigKeyObj.value(); if ( value != null && value.toString().trim().length() > 0 ) { order = value.toString().trim().split("\\s*,\\s*"); } } - + if ( excludeKeyObj != null ) { Object value = excludeKeyObj.value(); if ( value != null && value.toString().trim().length() > 0 ) { @@ -79,17 +79,17 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa } } } - + String name = RegistryUtils.getName(item); - + if ( name != null && exclude.size() > 0 && exclude.contains(name) ) { return false; } - + if ( name == null && order.length > 0 ) { throw new RuntimeException("getName() is null for [" + item + "]"); } - + int i = 0; for ( String orderTest : order ) { if ( orderTest.equals(name) ) { @@ -97,22 +97,22 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa i = -1; break; } - + if ( registered.size() <= i ) { break; } - + if ( RegistryUtils.getName(registered.get(i)).equals(orderTest) ) { i++; } } - + if ( i != -1 ) { registered.add(item); } log.debug("Registering extension [{}] in [{}]", name, this.name); - + return true; } @@ -134,24 +134,24 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa @Override public ConfigKey[] getConfigKeys() { List> result = new ArrayList>(); - + if ( orderConfigKey != null && orderConfigKeyObj == null ) { - orderConfigKeyObj = new ConfigKey("Advanced", String.class, orderConfigKey, orderConfigDefault, + orderConfigKeyObj = new ConfigKey("Advanced", String.class, orderConfigKey, orderConfigDefault, "The order of precedence for the extensions", false); } if ( orderConfigKeyObj != null ) result.add(orderConfigKeyObj); - + if ( excludeKey != null && excludeKeyObj == null ) { - excludeKeyObj = new ConfigKey("Advanced", String.class, excludeKey, excludeDefault, + excludeKeyObj = new ConfigKey("Advanced", String.class, excludeKey, excludeDefault, "Extensions to exclude from being registered", false); } - + if ( excludeKeyObj != null ) { result.add(excludeKeyObj); } - + return result.toArray(new ConfigKey[result.size()]); } @@ -160,11 +160,11 @@ public class ExtensionRegistry implements Registry, Configurable, BeanNa if ( name == null ) { for ( String part : beanName.replaceAll("([A-Z])", " $1").split("\\s+") ) { part = StringUtils.capitalize(part.toLowerCase());; - + name = name == null ? part : name + " " + part; } } - + if ( preRegistered != null ) { for ( Object o : preRegistered ) { register(o); diff --git a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java index 4975c5a4d70..f2a040a05aa 100644 --- a/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java +++ b/framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/registry/RegistryLifecycle.java @@ -37,12 +37,12 @@ import com.cloud.utils.component.Registry; public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, ApplicationContextAware { private static final Logger log = LoggerFactory.getLogger(RegistryLifecycle.class); - + public static final String EXTENSION_EXCLUDE = "extensions.exclude"; public static final String EXTENSION_INCLUDE_PREFIX = "extensions.include."; - + Registry registry; - + /* The bean name works around circular dependency issues in Spring. This shouldn't be * needed if your beans are already nicely organized. If they look like spaghetti, then you * can use this. @@ -71,12 +71,12 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App boolean result = excludes.contains(name); if ( result ) { - log.info("Excluding extension [{}] based on configuration", name); + log.info("Excluding extension [{}] based on configuration", name); } return result; } - + protected synchronized void loadExcluded() { Properties props = applicationContext.getBean("DefaultConfigProperties", Properties.class); excludes = new HashSet(); @@ -96,7 +96,7 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App } } } - + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; @@ -106,7 +106,7 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App public void start() { Iterator iter = beans.iterator(); Registry registry = lookupRegistry(); - + while ( iter.hasNext() ) { Object next = iter.next(); if ( registry.register(next) ) { @@ -120,11 +120,11 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App @Override public void stop() { Registry registry = lookupRegistry(); - + for ( Object bean : beans ) { registry.unregister(bean); } - + beans.clear(); } @@ -148,12 +148,12 @@ public class RegistryLifecycle implements BeanPostProcessor, SmartLifecycle, App stop(); callback.run(); } - + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } - + @SuppressWarnings("unchecked") protected Registry lookupRegistry() { return registry == null ? applicationContext.getBean(registryBeanName, Registry.class) : registry; diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java index 09dbd6c9799..e8dfbee9231 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/CloudStackSpringContext.java @@ -36,89 +36,89 @@ import org.springframework.core.io.Resource; public class CloudStackSpringContext { private static final Logger log = LoggerFactory.getLogger(CloudStackSpringContext.class); - + public static final String CLOUDSTACK_CONTEXT_SERVLET_KEY = CloudStackSpringContext.class.getSimpleName(); public static final String CLOUDSTACK_CONTEXT = "META-INF/cloudstack"; public static final String CLOUDSTACK_BASE = "bootstrap"; - + ModuleBasedContextFactory factory = new ModuleBasedContextFactory(); ModuleDefinitionLocator loader = new ClasspathModuleDefinitionLocator(); ModuleDefinitionSet moduleDefinitionSet; String baseName; String contextName; - + public CloudStackSpringContext(String context, String base) throws IOException { this.baseName = base; this.contextName = context; - + factory = new ModuleBasedContextFactory(); loader = new ClasspathModuleDefinitionLocator(); init(); } - + public CloudStackSpringContext() throws IOException { this(CLOUDSTACK_CONTEXT, CLOUDSTACK_BASE); } - + public void init() throws IOException { Collection defs = loader.locateModules(contextName); - + if ( defs.size() == 0 ) throw new RuntimeException("No modules found to load for Spring"); - + moduleDefinitionSet = factory.loadModules(defs, baseName); } - + public void registerShutdownHook() { ApplicationContext base = moduleDefinitionSet.getApplicationContext(baseName); - + if ( base instanceof ConfigurableApplicationContext ) { ((ConfigurableApplicationContext)base).registerShutdownHook(); } } - + public ModuleDefinition getModuleDefinitionForWeb(String name) { ModuleDefinition def = moduleDefinitionSet.getModuleDefinition(name); - + if ( def != null ) { return def; } - + /* Grab farthest descendant that is deterministic */ def = moduleDefinitionSet.getModuleDefinition(baseName); - + if ( def == null ) { throw new RuntimeException("Failed to find base spring module to extend for web"); } - + while ( def.getChildren().size() == 1 ) { def = def.getChildren().iterator().next(); } - + return def; } - + public ApplicationContext getApplicationContextForWeb(String name) { ModuleDefinition def = getModuleDefinitionForWeb(name); - + return moduleDefinitionSet.getApplicationContext(def.getName()); } - + public String[] getConfigLocationsForWeb(String name, String[] configured) { if ( configured == null ) configured = new String[] {}; - + ModuleDefinition def = getModuleDefinitionForWeb(name); - + List inherited = new ArrayList(); - + while ( def != null ) { inherited.addAll(def.getInheritableContextLocations()); def = moduleDefinitionSet.getModuleDefinition(def.getParentName()); } List urlList = new ArrayList(); - + for ( Resource r : inherited ) { try { String urlString = r.getURL().toExternalForm(); @@ -127,12 +127,12 @@ public class CloudStackSpringContext { log.error("Failed to create URL for {}", r.getDescription(), e); } } - + String[] result = new String[urlList.size() + configured.length]; result = urlList.toArray(result); - + System.arraycopy(configured, 0, result, urlList.size(), configured.length); - + return result; } } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java index 3f89d3ab935..5a2a436f648 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactory.java @@ -30,55 +30,55 @@ import org.apache.cloudstack.spring.module.model.impl.DefaultModuleDefinitionSet public class ModuleBasedContextFactory { public ModuleDefinitionSet loadModules(Collection defs, String root) throws IOException { - + Map modules = wireUpModules(root, defs); - + DefaultModuleDefinitionSet moduleSet = new DefaultModuleDefinitionSet(modules, root); moduleSet.load(); - + return moduleSet; } - + protected Map wireUpModules(String root, Collection defs) throws IOException { Map modules = new HashMap(); - + for ( ModuleDefinition def : defs ) { modules.put(def.getName(), def); } - + ModuleDefinition rootDef = null; Map result = new HashMap(); - + for ( ModuleDefinition def : modules.values() ) { if ( def.getName().equals(root) ) { rootDef = def; } - + if ( def.getParentName() != null ) { ModuleDefinition parentDef = modules.get(def.getParentName()); - + if ( parentDef != null ) parentDef.addChild(def); } } - + return traverse(rootDef, result); } - + protected Map traverse(ModuleDefinition base, Map result) { if ( base == null ) return result; - + if ( result.containsKey(base.getName()) ) { throw new RuntimeException("Circular dependency to [" + base.getName() + "] from current set " + result.keySet()); } - + result.put(base.getName(), base); - + for ( ModuleDefinition childDef : base.getChildren() ) traverse(childDef, result); - + return result; } } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/ModuleDefinitionLocator.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/ModuleDefinitionLocator.java index 6b14e0abfd7..cec1f340cba 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/ModuleDefinitionLocator.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/ModuleDefinitionLocator.java @@ -32,5 +32,5 @@ import org.apache.cloudstack.spring.module.model.ModuleDefinition; public interface ModuleDefinitionLocator { Collection locateModules(String context) throws IOException; - + } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java index c9deacc23e8..c68aa8a5292 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionLocator.java @@ -32,31 +32,31 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; public class ClasspathModuleDefinitionLocator implements ModuleDefinitionLocator { - + protected ResourcePatternResolver getResolver() { return new PathMatchingResourcePatternResolver(); } - + public Collection locateModules(String context) throws IOException { ResourcePatternResolver resolver = getResolver(); - + Map allModules = discoverModules(context, resolver); - + return allModules.values(); } - + protected Map discoverModules(String baseDir, ResourcePatternResolver resolver) throws IOException { Map result = new HashMap(); - + for ( Resource r : resolver.getResources(ModuleLocationUtils.getModulesLocation(baseDir)) ) { DefaultModuleDefinition def = new DefaultModuleDefinition(baseDir, r, resolver); def.init(); - + if ( def.isValid() ) result.put(def.getName(), def); } - + return result; } - + } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinition.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinition.java index b3c46474224..d227e7e1072 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinition.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinition.java @@ -24,25 +24,25 @@ import java.util.List; import org.springframework.core.io.Resource; public interface ModuleDefinition { - + ClassLoader getClassLoader(); - + String getName(); - + String getParentName(); - + List getConfigLocations(); - + List getContextLocations(); - + List getInheritableContextLocations(); - + List getOverrideContextLocations(); - + boolean isValid(); - + Collection getChildren(); - + void addChild(ModuleDefinition childDef); - + } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinitionSet.java index 635a7a193df..7cb15e495c8 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinitionSet.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/ModuleDefinitionSet.java @@ -24,9 +24,9 @@ import org.springframework.core.io.Resource; public interface ModuleDefinitionSet { ModuleDefinition getModuleDefinition(String name); - + ApplicationContext getApplicationContext(String name); - + Resource[] getConfigResources(String name); - + } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java index 979d08e0eae..abd04bde34d 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinition.java @@ -38,34 +38,34 @@ public class DefaultModuleDefinition implements ModuleDefinition { public static final String NAME = "name"; public static final String PARENT = "parent"; - + String name; String baseDir; String parent; Resource moduleProperties; ResourcePatternResolver resolver; boolean valid; - + List configLocations; List contextLocations; List inheritableContextLocations; List overrideContextLocations; Map children = new TreeMap(); - + public DefaultModuleDefinition(String baseDir, Resource moduleProperties, ResourcePatternResolver resolver) { this.baseDir = baseDir; this.resolver = resolver; this.moduleProperties = moduleProperties; } - + public void init() throws IOException { - + if ( ! moduleProperties.exists() ) { return; } - + resolveNameAndParent(); - + contextLocations = Arrays.asList(resolver.getResources(ModuleLocationUtils.getContextLocation(baseDir, name))); configLocations = Arrays.asList(resolver.getResources(ModuleLocationUtils.getDefaultsLocation(baseDir, name))); inheritableContextLocations = Arrays.asList(resolver.getResources(ModuleLocationUtils.getInheritableContextLocation(baseDir, name))); @@ -73,60 +73,60 @@ public class DefaultModuleDefinition implements ModuleDefinition { valid = true; } - + protected void resolveNameAndParent() throws IOException { InputStream is = null; - + try { is = moduleProperties.getInputStream(); Properties props = new Properties(); props.load(is); - + name = props.getProperty(NAME); parent = props.getProperty(PARENT); - + if ( ! StringUtils.hasText(name) ) { throw new IOException("Missing name property in [" + location() + "]"); } - + if ( ! StringUtils.hasText(parent) ) { parent = null; } - + checkNameMatchesSelf(); } finally { IOUtils.closeQuietly(is); } } - + protected void checkNameMatchesSelf() throws IOException { String expectedLocation = ModuleLocationUtils.getModuleLocation(baseDir, name); Resource self = resolver.getResource(expectedLocation); - + if ( ! self.exists() ) { throw new IOException("Resource [" + location() + "] is expected to exist at [" + expectedLocation + "] please ensure the name property is correct"); } - + String moduleUrl = moduleProperties.getURL().toExternalForm(); String selfUrl = self.getURL().toExternalForm(); - + if ( ! moduleUrl.equals(selfUrl) ) { throw new IOException("Resource [" + location() + "] and [" + - self.getURL() + "] do not appear to be the same resource, " + + self.getURL() + "] do not appear to be the same resource, " + "please ensure the name property is correct or that the " + "module is not defined twice"); } } - + private String location() throws IOException { return moduleProperties.getURL().toString(); } - + public void addChild(ModuleDefinition def) { children.put(def.getName(), def); } - + public Collection getChildren() { return children.values(); } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java index 3106ee5234a..8598c5e8eca 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java @@ -49,14 +49,14 @@ import org.springframework.util.StringUtils; public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { private static final Logger log = LoggerFactory.getLogger(DefaultModuleDefinitionSet.class); - + public static final String DEFAULT_CONFIG_RESOURCES = "DefaultConfigResources"; public static final String DEFAULT_CONFIG_PROPERTIES = "DefaultConfigProperties"; public static final String MODULES_EXCLUDE = "modules.exclude"; public static final String MODULES_INCLUDE_PREFIX = "modules.include."; public static final String MODULE_PROPERITES = "ModuleProperties"; public static final String DEFAULT_CONFIG_XML = "defaults-context.xml"; - + String root; Map modules; Map contexts = new HashMap(); @@ -73,25 +73,25 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { public void load() throws IOException { if ( ! loadRootContext() ) return; - + printHierarchy(); loadContexts(); startContexts(); } - + protected boolean loadRootContext() { ModuleDefinition def = modules.get(root); - + if ( def == null ) return false; - + ApplicationContext defaultsContext = getDefaultsContext(); - + rootContext = loadContext(def, defaultsContext); - + return true; } - + protected void startContexts() { withModule(new WithModule() { public void with(ModuleDefinition def, Stack parents) { @@ -102,7 +102,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { log.info("Starting module [{}]", def.getName()); runnable.run(); } catch ( BeansException e ) { - // Ignore + // Ignore } } catch ( EmptyStackException e ) { // The root context is already loaded, so ignore the exception @@ -110,7 +110,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } }); } - + protected void loadContexts() { withModule(new WithModule() { public void with(ModuleDefinition def, Stack parents) { @@ -126,7 +126,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { protected ApplicationContext loadContext(ModuleDefinition def, ApplicationContext parent) { ResourceApplicationContext context = new ResourceApplicationContext(); context.setApplicationName("/" + def.getName()); - + Resource[] resources = getConfigResources(def.getName()); context.setConfigResources(resources); context.setParent(parent); @@ -140,26 +140,26 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } context.refresh(); log.info("Loaded module context [{}] in {} ms", def.getName(), (System.currentTimeMillis() - start)); - + contexts.put(def.getName(), context); - + return context; } - + protected boolean shouldLoad(ModuleDefinition def) { return ! excludes.contains(def.getName()); } - + protected ApplicationContext getDefaultsContext() { URL config = DefaultModuleDefinitionSet.class.getResource(DEFAULT_CONFIG_XML); - + ResourceApplicationContext context = new ResourceApplicationContext(new UrlResource(config)); context.setApplicationName("/defaults"); context.refresh(); - + @SuppressWarnings("unchecked") final List resources = (List) context.getBean(DEFAULT_CONFIG_RESOURCES); - + withModule(new WithModule() { public void with(ModuleDefinition def, Stack parents) { for ( Resource defaults : def.getConfigLocations() ) { @@ -213,7 +213,7 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { IOUtils.closeQuietly(is); } } - + protected void printHierarchy() { withModule(new WithModule() { public void with(ModuleDefinition def, Stack parents) { @@ -221,41 +221,41 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { } }); } - + protected void withModule(WithModule with) { ModuleDefinition rootDef = modules.get(root); withModule(rootDef, new Stack(), with); } - + protected void withModule(ModuleDefinition def, Stack parents, WithModule with) { if ( def == null ) return; - + if ( ! shouldLoad(def) ) { log.info("Excluding context [{}] based on configuration", def.getName()); return; } - + with.with(def, parents); - + parents.push(def); - + for ( ModuleDefinition child : def.getChildren() ) { withModule(child, parents, with); } - + parents.pop(); } - + private static interface WithModule { public void with(ModuleDefinition def, Stack parents); } - + @Configuration public static class ConfigContext { - + List resources; - + public ConfigContext(List resources) { super(); this.resources = resources; @@ -273,22 +273,22 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet { public Resource[] getConfigResources(String name) { Set resources = new LinkedHashSet(); - + ModuleDefinition original = null; ModuleDefinition def = original = modules.get(name); - + if ( def == null ) return new Resource[] {}; - + resources.addAll(def.getContextLocations()); - + while ( def != null ) { resources.addAll(def.getInheritableContextLocations()); def = modules.get(def.getParentName()); } - + resources.addAll(original.getOverrideContextLocations()); - + return resources.toArray(new Resource[resources.size()]); } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java index 3a9660c4793..a93c7c1f6a2 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/Main.java @@ -23,25 +23,25 @@ import org.apache.cloudstack.spring.module.factory.CloudStackSpringContext; public class Main { long start = System.currentTimeMillis(); - + public Main() { - + } - + public void start() throws Exception { CloudStackSpringContext context = new CloudStackSpringContext(); context.registerShutdownHook(); - + if ( Boolean.getBoolean("force.exit") ) { System.exit(0); } } - + public long getTime() { return System.currentTimeMillis() - start; } - - + + public static void main(String... args) { Main main = new Main(); diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/ModuleLocationUtils.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/ModuleLocationUtils.java index eeab154b395..0df04d85a4b 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/ModuleLocationUtils.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/util/ModuleLocationUtils.java @@ -30,23 +30,23 @@ public class ModuleLocationUtils { public static String getModulesLocation(String baseDir) { return String.format(ALL_MODULE_PROPERTIES, baseDir); } - + public static String getModuleLocation(String baseDir, String name) { return String.format(MODULE_PROPERTIES, baseDir, name); } - + public static String getContextLocation(String baseDir, String name) { return String.format(CONTEXT_LOCATION, baseDir, name); } - + public static String getInheritableContextLocation(String baseDir, String name) { return String.format(INHERTIABLE_CONTEXT_LOCATION, baseDir, name); } - + public static String getOverrideContextLocation(String baseDir, String name) { return String.format(OVERRIDE_CONTEXT_LOCATION, baseDir, name); } - + public static String getDefaultsLocation(String baseDir, String name) { return String.format(DEFAULTS_LOCATION, baseDir, name); } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java index 96e686c66df..596e019b6a1 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/CloudStackContextLoaderListener.java @@ -34,12 +34,12 @@ public class CloudStackContextLoaderListener extends ContextLoaderListener { public static final String WEB_PARENT_MODULE = "parentModule"; public static final String WEB_PARENT_MODULE_DEFAULT = "web"; - + private static final Logger log = LoggerFactory.getLogger(CloudStackContextLoaderListener.class); - + CloudStackSpringContext cloudStackContext; String configuredParentName; - + @Override protected ApplicationContext loadParentContext(ServletContext servletContext) { return cloudStackContext.getApplicationContextForWeb(configuredParentName); @@ -54,23 +54,23 @@ public class CloudStackContextLoaderListener extends ContextLoaderListener { log.error("Failed to start CloudStack", e); throw new RuntimeException("Failed to initialize CloudStack Spring modules", e); } - + configuredParentName = event.getServletContext().getInitParameter(WEB_PARENT_MODULE); if ( configuredParentName == null ) { configuredParentName = WEB_PARENT_MODULE_DEFAULT; } - + super.contextInitialized(event); } @Override protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) { super.customizeContext(servletContext, applicationContext); - - String[] newLocations = cloudStackContext.getConfigLocationsForWeb(configuredParentName, + + String[] newLocations = cloudStackContext.getConfigLocationsForWeb(configuredParentName, applicationContext.getConfigLocations()); - + applicationContext.setConfigLocations(newLocations); } - + } diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java index 9dd1b82e902..8b1d31471bf 100644 --- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java +++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/web/ModuleBasedFilter.java @@ -33,7 +33,7 @@ public abstract class ModuleBasedFilter implements Filter { @Override public void init(FilterConfig filterConfig) throws ServletException { String module = filterConfig.getInitParameter("module"); - CloudStackSpringContext context = + CloudStackSpringContext context = (CloudStackSpringContext) filterConfig.getServletContext().getAttribute(CloudStackSpringContext.CLOUDSTACK_CONTEXT_SERVLET_KEY); if ( context == null ) diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/InitTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/InitTest.java index db3549b73b1..1f17075fb5e 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/InitTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/InitTest.java @@ -23,7 +23,7 @@ import javax.annotation.PostConstruct; public class InitTest { public static boolean initted = false; - + @PostConstruct public void init() { setInitted(true); diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java index 3cb00bcc714..7c95c3f1e21 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/factory/ModuleBasedContextFactoryTest.java @@ -34,7 +34,7 @@ import org.springframework.context.ApplicationContext; public class ModuleBasedContextFactoryTest { Collection defs; - + @Before public void setUp() throws IOException { InstantiationCounter.count = 0; @@ -45,27 +45,27 @@ public class ModuleBasedContextFactoryTest { @Test public void testLoad() throws IOException { - + ModuleBasedContextFactory factory = new ModuleBasedContextFactory(); - + ModuleDefinitionSet set = factory.loadModules(defs, "base"); - + assertNotNull(set.getApplicationContext("base")); } - + @Test public void testOverride() throws IOException { - + InitTest.initted = false; - + ModuleBasedContextFactory factory = new ModuleBasedContextFactory(); - + ModuleDefinitionSet set = factory.loadModules(defs, "base"); - + assertTrue(!InitTest.initted); assertEquals("a string", set.getApplicationContext("child1").getBean("override", String.class)); } - + @Test public void testExcluded() throws IOException { ModuleBasedContextFactory factory = new ModuleBasedContextFactory(); @@ -75,29 +75,29 @@ public class ModuleBasedContextFactoryTest { assertNull(set.getApplicationContext("excluded2")); assertNull(set.getApplicationContext("orphan-of-excluded")); } - + @Test public void testBeans() throws IOException { ModuleBasedContextFactory factory = new ModuleBasedContextFactory(); ModuleDefinitionSet set = factory.loadModules(defs, "base"); - + testBeansInContext(set, "base", 1, new String[] { "base" }, new String[] { "child1", "child2", "child1-1" }); testBeansInContext(set, "child1", 2, new String[] { "base", "child1" }, new String[] { "child2", "child1-1" }); testBeansInContext(set, "child2", 4, new String[] { "base", "child2" }, new String[] { "child1", "child1-1" }); testBeansInContext(set, "child1-1", 3, new String[] { "base", "child1", "child1-1" }, new String[] { "child2" }); } - + protected void testBeansInContext(ModuleDefinitionSet set, String name, int order, String[] parents, String[] notTheres) { ApplicationContext context = set.getApplicationContext(name); - + String nameBean = context.getBean("name", String.class); assertEquals(name, nameBean); - + for ( String parent : parents ) { String parentBean = context.getBean(parent, String.class); assertEquals(parent, parentBean); } - + for ( String notThere : notTheres ) { try { context.getBean(notThere, String.class); @@ -105,27 +105,27 @@ public class ModuleBasedContextFactoryTest { } catch ( NoSuchBeanDefinitionException e ) { } } - + int count = context.getBean("count", InstantiationCounter.class).getCount(); - + assertEquals(order, count); } - + public static class InstantiationCounter { public static Integer count = 0; - + int myCount; - + public InstantiationCounter() { synchronized (count) { myCount = count + 1; count = myCount; } } - + public int getCount() { return myCount; } - + } } diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java index 989aa9fbcb9..6ab10eb5c0e 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java @@ -27,13 +27,13 @@ import org.apache.cloudstack.spring.module.model.ModuleDefinition; import org.junit.Test; public class ClasspathModuleDefinitionSetLocatorTest { - + @Test public void testDiscover() throws IOException { ClasspathModuleDefinitionLocator factory = new ClasspathModuleDefinitionLocator(); - + Collection modules = factory.locateModules("testhierarchy"); - + assertEquals(8, modules.size()); } diff --git a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java index 31a82baab20..78880913b18 100644 --- a/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java +++ b/framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionTest.java @@ -33,44 +33,44 @@ import org.springframework.core.io.support.ResourcePatternResolver; public class DefaultModuleDefinitionTest { ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - + protected DefaultModuleDefinition createDef(String name) { - Resource resource = + Resource resource = resolver.getResource(ModuleLocationUtils.getModuleLocation("testfiles", name)); - + return new DefaultModuleDefinition("testfiles", resource, resolver); } - + @Test public void testBlankName() { DefaultModuleDefinition def = createDef("blankname"); - + try { def.init(); fail(); } catch ( IOException e ) { assertTrue(e.getMessage().contains("Missing name property")); } - + } - + @Test public void testMissingName() { DefaultModuleDefinition def = createDef("missingname"); - + try { def.init(); fail(); } catch ( IOException e ) { assertTrue(e.getMessage().contains("Missing name property")); } - + } - + @Test public void testBadName() { DefaultModuleDefinition def = createDef("badname"); - + try { def.init(); fail(); @@ -85,11 +85,11 @@ public class DefaultModuleDefinitionTest { def.init(); assertTrue(def.isValid()); } - + @Test public void testWrongName() { DefaultModuleDefinition def = createDef("wrongname"); - + try { def.init(); fail(); @@ -97,26 +97,26 @@ public class DefaultModuleDefinitionTest { assertTrue(e.getMessage().contains("do not appear to be the same resource")); } } - + @Test public void testAllFiles() throws IOException { DefaultModuleDefinition def = createDef("all"); - + def.init(); - + assertEquals(2, def.getContextLocations().size()); has(def.getContextLocations(), "empty-context.xml", "empty2-context.xml"); - + assertEquals(2, def.getConfigLocations().size()); has(def.getConfigLocations(), "test2-defaults.properties", "defaults.properties"); - + assertEquals(2, def.getInheritableContextLocations().size()); has(def.getInheritableContextLocations(), "empty-context-inheritable.xml", "empty2-context-inheritable.xml"); } - + protected void has(List resources, String... files) throws IOException { int count = 0; - + for ( Resource r : resources ) { for ( String file : files ) { if ( r.getURL().toExternalForm().contains(file) ) { @@ -125,7 +125,7 @@ public class DefaultModuleDefinitionTest { } } } - + assertEquals(resources + " does not contain " + Arrays.toString(files), files.length, count); } } diff --git a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java index 516d4279bb8..97fee883c24 100755 --- a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java +++ b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.deploy; @@ -40,7 +40,7 @@ public class UserDispersingPlanner extends FirstFitPlanner implements Deployment private static final Logger s_logger = Logger.getLogger(UserDispersingPlanner.class); /** - * This method should reorder the given list of Cluster Ids by applying any necessary heuristic + * This method should reorder the given list of Cluster Ids by applying any necessary heuristic * for this planner * For UserDispersingPlanner we need to order the clusters by considering the number of VMs for this account * @return List ordered list of Cluster Ids @@ -69,7 +69,7 @@ public class UserDispersingPlanner extends FirstFitPlanner implements Deployment } /** - * This method should reorder the given list of Pod Ids by applying any necessary heuristic + * This method should reorder the given list of Pod Ids by applying any necessary heuristic * for this planner * For UserDispersingPlanner we need to order the pods by considering the number of VMs for this account * @return List ordered list of Pod Ids diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java index 79286d2f2f3..ba478c38ed8 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappDefaultAllocatorImpl.java @@ -63,7 +63,7 @@ public class NetappDefaultAllocatorImpl implements NetappAllocator { /** * This method does the actual round robin allocation - * @param poolName + * @param poolName * @param lunSizeGb * @return -- the selected volume to create the lun on * @throws IOException @@ -116,7 +116,7 @@ public class NetappDefaultAllocatorImpl implements NetappAllocator { /** * This method does the byte to gb conversion - * @param bytes + * @param bytes * @return -- converted gb */ private long bytesToGb(long bytes) { diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java index de47a0307e1..0e0c186be1f 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java @@ -196,12 +196,12 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { * @param ipAddress -- ip address of filer * @param aggrName -- name of containing aggregate * @param volName -- name of volume to destroy - * @throws ResourceInUseException + * @throws ResourceInUseException * @throws NaException * @throws IOException - * @throws NaProtocolException - * @throws NaAPIFailedException - * @throws NaAuthenticationException + * @throws NaProtocolException + * @throws NaAPIFailedException + * @throws NaAuthenticationException */ @Override @DB @@ -294,7 +294,7 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { * @param username -- username * @param password -- password * @throws UnknownHostException - * @throws InvalidParameterValueException + * @throws InvalidParameterValueException */ @Override @DB @@ -457,7 +457,7 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { } /** - * This method is primarily used to cleanup volume created on the netapp filer, when createVol api command fails at snapshot reservation. + * This method is primarily used to cleanup volume created on the netapp filer, when createVol api command fails at snapshot reservation. * We roll back the db record, but the record on the netapp box still exists. We clean up that record using this helper method. * @param volName * @param s -- server reference @@ -550,7 +550,7 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { * @param userName -- username * @param password -- password * @param serverIp -- ip address of filer - * @throws UnknownHostException + * @throws UnknownHostException * @return-- available size on the volume in terms of bytes; return -1 if volume is offline * @throws ServerException */ @@ -597,9 +597,9 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { * This method creates a lun on the netapp filer * @param poolName -- name of the pool * @param lunSize -- size of the lun to be created - * @return -- lun path + * @return -- lun path * @throws IOException - * @throws ResourceAllocationException + * @throws ResourceAllocationException * @throws NaException */ @Override @@ -972,7 +972,7 @@ public class NetappManagerImpl extends ManagerBase implements NetappManager { s_logger.warn("Unable to associate LUN ", uhe); throw new ServerException("Unable to associate LUN", uhe); } catch (NaAPIFailedException naf) { - if (naf.getErrno() == 9008) { //initiator group already contains node + if (naf.getErrno() == 9008) { //initiator group already contains node return returnVal; } s_logger.warn("Unable to associate LUN ", naf); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDao.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDao.java index fe6d86c80d4..2db56369c4d 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDao.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDao.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java index 014dca5194b..8669260af6b 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java index 0e813b7dbee..4b0ad0d54d4 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpVO.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java index c640638e9ba..231c3ff6d26 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDao.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java index bede34760fe..2a0def07d96 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeVO.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeVO.java index 0632fc708ab..10028961c3b 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeVO.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeVO.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java index a7155115ec0..f6006cad8ac 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.manager; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java index 60edde3c70d..86192ac0cd2 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.manager; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java index 9cc0aee98fc..9c5514495d4 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.manager; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java index afbed692003..78e37934d0a 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPxeServiceBase.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index e5f5f5ffd2e..2dbdd578278 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -325,7 +325,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource } /* * Map changes = new HashMap(); - * + * * if (_vmName != null) { State state = getVmState(); if (state != null) * { changes.put(_vmName, state); } } */ @@ -344,7 +344,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource } /* * Map changes = new HashMap(); - * + * * if (_vmName != null) { State state = getVmState(); if (state != null) * { changes.put(_vmName, state); } } */ @@ -588,7 +588,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource /* * Disable sync until we find a way that only tracks status but not does * action - * + * * The scenario is: Baremetal will reboot host when creating template. * Given most servers take a long time to boot up, there would be a * period that mgmt server finds the host is stopped through fullsync. @@ -597,13 +597,13 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource * running. Because in database the host is already stopped, mgmt server * sends out a stop command. As a result, creating image gets never * happened. - * + * * if (_vmName == null) { return null; } - * + * * State newState = getVmState(); if (newState == null) { * s_logger.warn("Cannot get power state of VM " + _vmName); return * null; } - * + * * final State oldState = removeVmState(_vmName); if (oldState == null) * { changeVmState(_vmName, newState); changes.put(_vmName, newState); } * else if (oldState == State.Starting) { if (newState == State.Running) diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java index 444ffc37d64..000aa7b5f3a 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManager.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java index 5de3399393e..75cddd5cf3f 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResourceBase.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java index c51cbd271c9..3ee346d95cb 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpResponse.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java index c06c5205fef..1000fffe30b 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpdResource.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java index 6d5c19c80ba..6458cf49ffa 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDnsmasqResource.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java index 1849c4e3db7..def1d28c10e 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java index 184058ff57d..6318435907a 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPingPxeResource.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java index 0dae24b1a2b..d061710c077 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java index 5e79d38f60e..13f4d79b1bd 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxePingResponse.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java index 49aca19e624..5b5a959d597 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResourceBase.java @@ -5,20 +5,20 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 // Apache License, Version 2.0 (the "License"); you may not use this // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// +// // Automatically generated by addcopyright.py at 04/03/2012 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java index 268baa8e8f3..296a3757675 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeResponse.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java index b16940292fb..141158a110a 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java index 8500d59370a..4f59a833187 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java index 0f0a99d568b..d0299e0cbe1 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java index 376e5e4f0b1..8a84eef5e94 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java index bbf2aa5608e..bbe6f0eee12 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java index f1e3b0151bd..8b21f072f31 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxeCmd.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java index 37718452ea0..2ec75f56864 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java index 260682bb4ba..23a5b640b89 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java index 07ef781ba28..5b294c88223 100755 --- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java +++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 01/29/2013 package org.apache.cloudstack.api; diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java index f011ce03fa3..159350b243d 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java @@ -383,7 +383,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements } return null; } - + private void prepareSecondaryStorageStore(String storageUrl) { String mountPoint = getMountPoint(storageUrl); diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 1719e8b679c..e50c94d52fd 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2131,7 +2131,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv * * These bindings will read the snapshot and write the contents to * the secondary storage directly - * + * * It will stop doing so if the amount of time spend is longer then * cmds.timeout */ diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java index 9b98637d438..8ddced0da18 100644 --- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java +++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java @@ -78,7 +78,7 @@ public class QemuImg { * Create a new image * * This method calls 'qemu-img create' - * + * * @param file * The file to create * @param backingFile @@ -174,7 +174,7 @@ public class QemuImg { * * This method calls 'qemu-img convert' and takes two objects * as an argument. - * + * * * @param srcFile * The source file diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java index 412f48b8aea..d217ffbcb5b 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/OvmStoragePool.java @@ -52,7 +52,7 @@ public class OvmStoragePool extends OvmObject { } /** - * + * * @param c: connection * @param uuid: uuid of primary storage * @return: Details with full fields @@ -65,12 +65,12 @@ public class OvmStoragePool extends OvmObject { } /** - * + * * @param c: Connection * @param uuid: Pool uuid * @param from: secondary storage download path * @return: - * @throws XmlRpcException + * @throws XmlRpcException */ public static Pair downloadTemplate(Connection c, String uuid, String from) throws XmlRpcException { Object[] params = {uuid, from}; diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java index d0ed652980e..4e6c6a00451 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/object/Test.java @@ -29,16 +29,16 @@ public class Test { public static void main(String[] args) { try { /*Connection c = new Connection("192.168.105.155", "oracle", "password"); - Utils util = new UtilsImpl(c); + Utils util = new UtilsImpl(c); Storage storage = new StorageImpl(c); String[] res = util.listDir("/etc", 1); for (String s : res) { System.out.println(s); } - - + + Pool pool = new PoolImpl(c); - + //pool.registerServer("192.168.105.155", Pool.ServerType.SITE); //pool.registerServer("192.168.105.155", Pool.ServerType.UTILITY); //pool.registerServer("192.168.105.155", Pool.ServerType.XEN); diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java index e32fbc55f54..a0f5563e180 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java index 82799f9d6e3..4e80f6df460 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java index 429c13dfbad..d0190416a41 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java index b341a1b2279..741fd5d710e 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java index 3d03f6f076a..222965f0d0e 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java index a6b17c923da..2ce8e01302d 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java index f2e2f5dda30..24356172a9e 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java index 822ebff868e..bac8efdd890 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java index 5322bc83c2e..b3849466f25 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java index f5774f6eda2..eba243c8156 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java index 886096c2a65..fdd8f7bd074 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java index 5b98e40ff1b..9f9a8f88c63 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java @@ -5,16 +5,16 @@ // 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. -// +// // Automatically generated by addcopyright.py at 02/28/2013 // regarding copyright ownership. The ASF licenses this file // "License"); you may not use this file except in compliance diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java index 55a9f2cd419..324ae7dbbd7 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java index 87428f582c9..dccd62d6603 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsManagerResponse.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java index 84fb945079b..2b38efc2a09 100755 --- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java +++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/response/UcsProfileResponse.java @@ -5,9 +5,9 @@ // 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 diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java index 2c4b3286888..42d69ea034b 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java @@ -48,7 +48,7 @@ public class ListCiscoNexusVSMsCmd extends BaseListCmd { /** * This command returns a list of all the VSMs configured in the management server. - * If a clusterId is specified, it will return a list containing only that VSM + * If a clusterId is specified, it will return a list containing only that VSM * that is associated with that cluster. If a zone is specified, it will pull * up all the clusters of type vmware in that zone, and prepare a list of VSMs * associated with those clusters. diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java index 7d29b0c8f67..b7746f945c0 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareCleanupMaid.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.vmware; @@ -67,7 +67,7 @@ public class VmwareCleanupMaid { // @Override // public int cleanup(CheckPointManager checkPointMgr) { -// +// // // save a check-point in case we crash at current run so that we won't lose it // _checkPoint = checkPointMgr.pushCheckPoint(new VmwareCleanupMaid(_vCenterAddress, _dcMorValue, _vmName)); // addLeftOverVM(this); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java index 6a6a16c56b7..421951f2f1e 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareHostService.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.vmware.manager; diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java index 87899416058..712b49fef2b 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.vmware.manager; diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 32ae0d2dbfa..3c903183e13 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -598,7 +598,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw // disable time-out check until we have found out a VMware API that can check if // there are pending tasks on the subject VM - /* + /* if(System.currentTimeMillis() - startTick > _hungWorkerTimeout) { if(s_logger.isInfoEnabled()) s_logger.info("Worker VM expired, seconds elapsed: " + (System.currentTimeMillis() - startTick) / 1000); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java index 5e80ea3fa97..18fc91125d1 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManager.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.vmware.manager; diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java index 8ea22020093..dd07029766c 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageMount.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.vmware.manager; diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java index 7863f432bf2..da93f556076 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDao.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.dao; @@ -23,7 +23,7 @@ import com.cloud.utils.db.GenericDao; public interface CiscoNexusVSMDeviceDao extends GenericDao { /** - * Return a Cisco Nexus VSM record given its switch domain Id. + * Return a Cisco Nexus VSM record given its switch domain Id. * @param Cisco Nexus VSM Switch Domain Id * @return CiscoNexusVSMDeviceVO for the VSM having the specified switch domain Id. */ @@ -45,7 +45,7 @@ public interface CiscoNexusVSMDeviceDao extends GenericDao listByVlanId(int vlanId); @@ -66,7 +66,7 @@ public interface CiscoNexusVSMDeviceDao extends GenericDao getCiscoNexusVSMs(ListCiscoNexusVSMsCmd cmd) { // If clusterId is defined, then it takes precedence, and we will return - // the VSM associated with this cluster. + // the VSM associated with this cluster. Long clusterId = cmd.getClusterId(); Long zoneId = cmd.getZoneId(); diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElementService.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElementService.java index 20ccb0b2d90..fa4dbabb691 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElementService.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElementService.java @@ -33,13 +33,13 @@ import com.cloud.utils.component.PluggableService; public interface CiscoNexusVSMElementService extends PluggableService { /** * removes a Cisco Nexus VSM - * @param DeleteCiscoNexusVSMCmd + * @param DeleteCiscoNexusVSMCmd * @return true if VSM is deleted successfully */ public boolean deleteCiscoNexusVSM(DeleteCiscoNexusVSMCmd cmd); /** - * Enables a Cisco Nexus VSM. + * Enables a Cisco Nexus VSM. */ public CiscoNexusVSMDeviceVO enableCiscoNexusVSM(EnableCiscoNexusVSMCmd cmd); diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java index 99efcbb1f7e..43101792c57 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.storage.resource; diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java index 9134d8fb80a..92ef65817f5 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutHelper.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.storage.resource; @@ -26,7 +26,7 @@ import com.cloud.hypervisor.vmware.mo.DatastoreMO; import com.cloud.utils.Pair; /** - * + * * To provide helper methods to handle storage layout in one place * */ diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutType.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutType.java index 7fb742149da..f2c8dd7249d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutType.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageLayoutType.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.storage.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java index a312b023674..77ee5d93168 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 376a4859faa..3a537717b41 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -275,14 +275,14 @@ import static com.google.common.collect.Lists.newArrayList; /** * CitrixResourceBase encapsulates the calls to the XenServer Xapi process * to perform the required functionalities for CloudStack. - * + * * ==============> READ THIS <============== * Because the XenServer objects can expire when the session expires, we cannot * keep any of the actual XenServer objects in this class. The only * thing that is constant is the UUID of the XenServer objects but not the * objects themselves! This is very important before you do any changes in * this code here. - * + * */ @Local(value = ServerResource.class) public abstract class CitrixResourceBase implements ServerResource, HypervisorResource { @@ -2609,7 +2609,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe /** * This is the method called for getting the HOST stats - * + * * @param cmd * @return */ @@ -4435,14 +4435,14 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * used to talk to retrieve a network by the name. The reason is * because of the problems in using the name label as the way to find * the Network. - * + * * To see how we are working around these problems, take a look at * enableVlanNetwork(). The following description assumes you have looked * at the description on that method. - * + * * In order to understand this, we have to see what type of networks are * within a XenServer that's under CloudStack control. - * + * * - Native Networks: these are networks that are untagged on the * XenServer and are used to crate VLAN networks on. These are * created by the user and is assumed to be one per cluster. @@ -4451,7 +4451,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * - LinkLocal Networks: these are dynamically created by CloudStack and * can also have problems with duplicated names but these don't have * actual PIFs. - * + * * In order to speed to retrieval of a network, we do the following: * - We retrieve by the name. If only one network is retrieved, we * assume we retrieved the right network. @@ -4459,13 +4459,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * has the pif for the local host and use that. * - If a pif is not found, then we look at the tags and find the * one with the lowest timestamp. (See enableVlanNetwork()) - * + * * @param conn Xapi connection * @param name name of the network * @return XsNic an object that contains network, network record, pif, and pif record. * @throws XenAPIException * @throws XmlRpcException - * + * * @see CitrixResourceBase#enableVlanNetwork */ protected XsLocalNetwork getNetworkByName(Connection conn, String name) throws XenAPIException, XmlRpcException { @@ -4529,13 +4529,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe /** * enableVlanNetwork creates a Network object, Vlan object, and thereby * a tagged PIF object in Xapi. - * + * * In XenServer, VLAN is added by * - Create a network, which is unique cluster wide. * - Find the PIF that you want to create the VLAN on. * - Create a VLAN using the network and the PIF. As a result of this * operation, a tagged PIF object is also created. - * + * * Here is a list of problems with clustered Xapi implementation that * we are trying to circumvent. * - There can be multiple Networks with the same name-label so searching @@ -4550,9 +4550,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * problems in migration because the VMs are logically attached * to different networks in Xapi's database but in reality, they * are attached to the same network. - * + * * To work around these problems, we do the following. - * + * * - When creating the VLAN network, we name it as VLAN-UUID of the * Network it is created on-VLAN Tag. Because VLAN tags is unique with * one particular network, this is a unique name-label to quickly @@ -4564,10 +4564,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * lowest random number as the VLAN network. This allows VLAN creation * to happen on multiple hosts concurrently but even if two VLAN * networks were created with the same name, only one of them is used. - * + * * One cavaet about this approach is that it relies on the timestamp to * be relatively accurate among different hosts. - * + * * @param conn Xapi Connection * @param tag VLAN tag * @param network network on this host to create the VLAN on. diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java index 15d117e7fe7..2d16656f7da 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java index 9015a8cbe0b..062a197739b 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java index 574719a1e6f..94c8c59dad8 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56SP2Resource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java index 11dbc25d42f..22470aabc75 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java index 16211930ff1..d3a9073e0b6 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer602Resource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java index dbf51e9344a..05eec6b3b9d 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java index e6c00892cf6..e91ec35f11e 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.hypervisor.xen.resource; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java index a438cbc0e59..4f86d4b8d13 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java @@ -5,7 +5,7 @@ // 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, diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java index c9f7f8c4c83..421f5f30732 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java @@ -5,7 +5,7 @@ // 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, diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java index 04a4becd76b..2994982534b 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java @@ -5,7 +5,7 @@ // 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, diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java index 87694686bc5..166323d7f60 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java @@ -5,7 +5,7 @@ // 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, diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java index bed6ae42ae9..8c8f089d170 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -603,7 +603,7 @@ public class CiscoVnmcResource implements ServerResource { throw new ExecutionException("Failed to create tenant edge static route in VNMC for guest network with vlan " + vlanId); } - // associate edge + // associate edge if (!_connection.associateTenantVDCEdgeStaticRoutePolicy(tenant)) throw new ExecutionException("Failed to associate edge static route policy with edge device profile in VNMC for guest network with vlan " + vlanId); } diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java index 9ed8ca85b59..b8b1da0be30 100644 --- a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java +++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.cisco; diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index 9071db396dd..fb17ce763e5 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java index fda7f6b695f..ad8c5cbfb83 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElementService.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; @@ -39,14 +39,14 @@ public interface F5ExternalLoadBalancerElementService extends PluggableService { /** * adds a F5 load balancer device in to a physical network - * @param AddF5LoadBalancerCmd + * @param AddF5LoadBalancerCmd * @return ExternalLoadBalancerDeviceVO object for the device added */ public ExternalLoadBalancerDeviceVO addF5LoadBalancer(AddF5LoadBalancerCmd cmd); /** * removes a F5 load balancer device from a physical network - * @param DeleteF5LoadBalancerCmd + * @param DeleteF5LoadBalancerCmd * @return true if F5 load balancer device is successfully deleted */ public boolean deleteF5LoadBalancer(DeleteF5LoadBalancerCmd cmd); diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java index e102ed8d817..150765c712b 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java +++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -366,10 +366,10 @@ public class F5BigIpResource implements ServerResource { // Delete the virtual server with this protocol, source IP, and source port, along with its default pool and all pool members deleteVirtualServerAndDefaultPool(virtualServerName); if (!loadBalancer.isRevoked() && destinationsToAdd) { - // Add the pool + // Add the pool addPool(virtualServerName, lbAlgorithm); - // Add pool members + // Add pool members List activePoolMembers = new ArrayList(); for (DestinationTO destination : loadBalancer.getDestinations()) { if (!destination.isRevoked()) { @@ -379,7 +379,7 @@ public class F5BigIpResource implements ServerResource { } } - // Add the virtual server + // Add the virtual server addVirtualServer(virtualServerName, lbProtocol, srcIp, srcPort, loadBalancer.getStickinessPolicies()); } } @@ -591,7 +591,7 @@ public class F5BigIpResource implements ServerResource { } } - // Login + // Login private void login() throws ExecutionException { try { @@ -1011,7 +1011,7 @@ public class F5BigIpResource implements ServerResource { rollOver = new Double(rollOver.doubleValue() + 1.0); if (high >= 0) { - // shift left 32 bits and mask off new bits to 0's + // shift left 32 bits and mask off new bits to 0's full = new Double((high << 32 & 0xffff0000)); } else { // mask off sign bits + shift left by 32 bits then add the sign bit back diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java index ac8782216b1..803d3a5d7eb 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManager.java @@ -62,7 +62,7 @@ public interface InternalLoadBalancerVMManager { throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException; /** - * + * * @param network * @param rules * @param internalLbVms diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java index 23aa9ab543c..d504df9a72f 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/InternalLbElementServiceTest.java @@ -5,7 +5,7 @@ // 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, diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java index d09e3ee780e..fb136431248 100644 --- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java +++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java @@ -5,7 +5,7 @@ // 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, diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java index 62ab317ed30..7c7ab8f019f 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java @@ -54,7 +54,7 @@ import com.cloud.user.Account; responseObject=ServiceInstanceResponse.class) public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { private static final String s_name = "createserviceinstanceresponse"; - + /// API parameters @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "Availability zone for the service instance") @@ -72,19 +72,19 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Project ID for the service instance") private Long projectId; - + @Parameter(name = "leftnetworkid", type = CommandType.UUID, entityType = NetworkResponse.class, required = true, description = "The left (inside) network for service instance") private Long leftNetworkId; - + @Parameter(name = "rightnetworkid", type = CommandType.UUID, entityType = NetworkResponse.class, required = true, description = "The right (outside) network ID for the service instance") private Long rightNetworkId; - + @Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "The template ID that specifies the image for the service appliance") private Long templateId; - + @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class, required = true, description = "The service offering ID that defines the resources consumed by the service appliance") @@ -92,7 +92,7 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING) private String name; - + /// Implementation @Inject ServiceManager _vrouterService; @Override @@ -103,24 +103,24 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { if (zone == null) { throw new InvalidParameterValueException("Unable to find zone ID " + zoneId); } - + Account owner = _accountService.getActiveAccountById(getEntityOwnerId()); VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, templateId); if (template == null) { throw new InvalidParameterValueException("Invalid template ID " + templateId); } - + ServiceOffering serviceOffering = _entityMgr.findById(ServiceOffering.class, serviceOfferingId); if (serviceOffering == null) { throw new InvalidParameterValueException("Invalid service offering ID " + serviceOfferingId); } - + Network left = _networkService.getNetwork(leftNetworkId); if (left == null) { throw new InvalidParameterValueException("Invalid ID for left network " + leftNetworkId); } - + Network right = _networkService.getNetwork(rightNetworkId); if (right == null) { throw new InvalidParameterValueException("Invalid ID for right network " + rightNetworkId); diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java index 6b17351c1f9..95e85f1518b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java @@ -26,7 +26,7 @@ import com.google.gson.annotations.SerializedName; public class ServiceInstanceResponse extends BaseResponse implements ControlledEntityResponse { - + @SerializedName(ApiConstants.ID) @Param(description="the ID of the virtual machine") private String id; diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java index 85efca5a99e..9e610112b32 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java @@ -81,7 +81,7 @@ public class ContrailElementImpl extends AdapterBase @Inject ServerDBSync _dbSync; private static final Logger s_logger = Logger.getLogger(ContrailElement.class); - + @Override public boolean configure(String name, Map params) throws ConfigurationException { s_logger.debug("configure"); @@ -128,13 +128,13 @@ public class ContrailElementImpl extends AdapterBase s_logger.debug("NetworkElement implement: " + network.getName() + ", traffic type: " + network.getTrafficType()); if (network.getTrafficType() == TrafficType.Guest) { s_logger.debug("ignore network " + network.getName()); - return true; + return true; } - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { - vnModel = new VirtualNetworkModel(network, network.getUuid(), + vnModel = new VirtualNetworkModel(network, network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); vnModel.setProperties(_manager.getModelController(), network); } @@ -142,7 +142,7 @@ public class ContrailElementImpl extends AdapterBase if (!vnModel.verify(_manager.getModelController())) { vnModel.update(_manager.getModelController()); } - _manager.getDatabase().getVirtualNetworks().add(vnModel); + _manager.getDatabase().getVirtualNetworks().add(vnModel); } catch (Exception ex) { s_logger.warn("virtual-network update: ", ex); } @@ -164,10 +164,10 @@ public class ContrailElementImpl extends AdapterBase } s_logger.debug("network: " + network.getId()); - - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), + + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); - + if (vnModel == null) { // There is no notification after a physical network is associated with the VRouter NetworkOffering // this may be the first time we see this network. @@ -187,10 +187,10 @@ public class ContrailElementImpl extends AdapterBase VMInterfaceModel vmiModel = vmModel.getVMInterface(nic.getUuid()); if (vmiModel == null) { vmiModel = new VMInterfaceModel(nic.getUuid()); - vmiModel.addToVirtualMachine(vmModel); - vmiModel.addToVirtualNetwork(vnModel); + vmiModel.addToVirtualMachine(vmModel); + vmiModel.addToVirtualNetwork(vnModel); } - + try { vmiModel.build(_manager.getModelController(), (VMInstanceVO) vm.getVirtualMachine(), nic); } catch (IOException ex) { @@ -211,7 +211,7 @@ public class ContrailElementImpl extends AdapterBase s_logger.warn("virtual-machine-update", ex); return false; } - _manager.getDatabase().getVirtualMachines().add(vmModel); + _manager.getDatabase().getVirtualMachines().add(vmModel); return true; } @@ -339,11 +339,11 @@ public class ContrailElementImpl extends AdapterBase throws ResourceUnavailableException { return true; } - - private boolean isFloatingIpCreate(PublicIpAddress ip) { + + private boolean isFloatingIpCreate(PublicIpAddress ip) { if (ip.getState() == IpAddress.State.Allocated && ip.getAssociatedWithVmId() != null && !ip.isSourceNat()) { return true; } - return false; + return false; } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java index 86b3abaeff7..a1ef8fdeec6 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java @@ -105,7 +105,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork( network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { - vnModel = new VirtualNetworkModel(network, network.getUuid(), + vnModel = new VirtualNetworkModel(network, network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); vnModel.setProperties(_manager.getModelController(), network); } @@ -118,14 +118,14 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { s_logger.warn("virtual-network update: ", ex); return network; } - _manager.getDatabase().getVirtualNetworks().add(vnModel); + _manager.getDatabase().getVirtualNetworks().add(vnModel); return network; } /** * Allocate the NicProfile object. * At this point the UUID of the nic is not yet known. We defer allocating the VMI and instance-ip objects - * until the reserve API is called because of this reason. + * until the reserve API is called because of this reason. */ @Override public NicProfile allocate(Network network, NicProfile profile, @@ -142,7 +142,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { } profile.setStrategy(ReservationStrategy.Start); - + return profile; } @@ -166,7 +166,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); /* Network must have been implemented */ assert vnModel != null; - + VirtualMachineModel vmModel = _manager.getDatabase().lookupVirtualMachine(vm.getUuid()); if (vmModel == null) { VMInstanceVO vmVo = (VMInstanceVO) vm.getVirtualMachine(); @@ -207,7 +207,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { return; } - _manager.getDatabase().getVirtualMachines().add(vmModel); + _manager.getDatabase().getVirtualMachines().add(vmModel); VirtualMachineInterface vmi = vmiModel.getVMInterface(); // allocate mac address @@ -268,7 +268,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { return; } vmModel.removeSuccessor(vmiModel); - + if (!vmModel.hasDescendents()) { _manager.getDatabase().getVirtualMachines().remove(vmModel); try { @@ -290,7 +290,7 @@ public class ContrailGuru extends AdapterBase implements NetworkGuru { @Override public void shutdown(NetworkProfile network, NetworkOffering offering) { s_logger.debug("NetworkGuru shutdown"); - VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), + VirtualNetworkModel vnModel = _manager.getDatabase().lookupVirtualNetwork(network.getUuid(), _manager.getCanonicalName(network), network.getTrafficType()); if (vnModel == null) { return; diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java index b96b00c9e96..ff82b703e21 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java @@ -76,10 +76,10 @@ public interface ContrailManager { public boolean isSystemDefaultNetwork(NetworkVO dbNet); public String getVifNameByVmName(String vm_name, Integer device_id); public String getVifNameByVmUuid(String vm_uuid, Integer device_id); - + public ApiConnector getApiConnector(); public ModelDatabase getDatabase(); - public ModelController getModelController(); + public ModelController getModelController(); public List findJuniperManagedNetworks(List types); public List findJuniperManagedPublicIps(); public VirtualNetwork findDefaultVirtualNetwork(TrafficType trafficType) @@ -90,4 +90,4 @@ public interface ContrailManager { public boolean createFloatingIp(PublicIpAddress ip); public boolean deleteFloatingIp(PublicIpAddress ip); } - + diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java index 3664d1375d9..df21db405e8 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java @@ -111,7 +111,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager @Inject PhysicalNetworkServiceProviderDao _physProviderDao; @Inject NicDao _nicDao; @Inject ServerDBSync _dbSync; - @Inject ServerEventHandler _eventHandler; + @Inject ServerEventHandler _eventHandler; @Inject IPAddressDao _ipAddressDao; @Inject VlanDao _vlanDao; @Inject UserVmDao _vmDao; @@ -126,7 +126,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager private final String configuration = "contrail.properties"; private ModelDatabase _database; private ModelController _controller; - + ContrailManagerImpl() { setRunLevel(ComponentLifecycle.RUN_LEVEL_COMPONENT); _database = new ModelDatabase(); @@ -149,11 +149,11 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager _dbSyncTimer.cancel(); return true; } - + public ModelDatabase getDatabase() { return _database; } - + private NetworkOffering LocateOffering() { List offerList = _configService.listNetworkOfferings(TrafficType.Guest, false); for (NetworkOffering offer: offerList) { @@ -193,7 +193,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager NetworkOfferingVO offering = _networkOfferingDao.createForUpdate(id); offering.setState(State.Enabled); _networkOfferingDao.update(id, offering); - return _networkOfferingDao.findById(id); + return _networkOfferingDao.findById(id); } @Override @@ -299,7 +299,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager @Override public String getDefaultPublicNetworkFQN() { String name = VNC_ROOT_DOMAIN + ":" + VNC_DEFAULT_PROJECT + ":" + "__default_Public__"; - return name; + return name; } private ProjectVO getProject(long accountId) { @@ -324,7 +324,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } return null; } - + @Override public net.juniper.contrail.api.types.Project getVncProject(long domainId, long accountId) throws IOException { String projectId = getProjectId(domainId, accountId); @@ -364,7 +364,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager if (syncMode == DBSyncGeneric.SYNC_MODE_CHECK) { s_logger.info("# Cloudstack DB & VNC are out of sync #"); } else { - s_logger.info("# Cloudstack DB & VNC were out of sync, performed re-sync operation #"); + s_logger.info("# Cloudstack DB & VNC were out of sync, performed re-sync operation #"); } } else { s_logger.info("# Cloudstack DB & VNC are in sync #"); @@ -394,7 +394,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager for (PhysicalNetworkVO phys : net_list) { if(_physProviderDao.findByServiceProvider(phys.getId(), Network.Provider.JuniperContrail.getName()) != null) { return true; - } + } } return false; } @@ -415,7 +415,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager List fqn = ImmutableList.copyOf(StringUtils.split(netname, ':')); return _api.findByName(VirtualNetwork.class, fqn); } - + @Override public VirtualNetwork findDefaultVirtualNetwork(TrafficType trafficType) throws IOException { if (trafficType == TrafficType.Guest || @@ -430,9 +430,9 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } return (VirtualNetwork)_api.findByFQN(VirtualNetwork.class, netname); } - + /* - * Returns list of networks managed by Juniper VRouter filtered by traffic types + * Returns list of networks managed by Juniper VRouter filtered by traffic types */ @Override public List findJuniperManagedNetworks(List types) { @@ -446,12 +446,12 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager if (types == null || types.isEmpty()) { types = new ArrayList(); - types.add(TrafficType.Control); + types.add(TrafficType.Control); types.add(TrafficType.Management); types.add(TrafficType.Public); types.add(TrafficType.Storage); - types.add(TrafficType.Guest); - } + types.add(TrafficType.Guest); + } sc.setParameters("trafficType", types.toArray()); List dbNets = _networksDao.search(sc, null); @@ -481,11 +481,11 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } } } - return dbNets; + return dbNets; } /* - * Returns list of public ip addresses managed by Juniper VRouter + * Returns list of public ip addresses managed by Juniper VRouter */ @Override public List findJuniperManagedPublicIps() { @@ -517,20 +517,20 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager if (publicIps == null) { s_logger.debug("no public ips"); return null; - } + } return publicIps; } - + private void initializeDefaultVirtualNetworkModels() { List types = new ArrayList(); types.add(TrafficType.Management); - types.add(TrafficType.Storage); - types.add(TrafficType.Control); + types.add(TrafficType.Storage); + types.add(TrafficType.Control); List dbNets = findJuniperManagedNetworks(types); for (NetworkVO net:dbNets) { - + VirtualNetworkModel vnModel = getDatabase().lookupVirtualNetwork(null, getCanonicalName(net), net.getTrafficType()); if (vnModel == null) { vnModel = new VirtualNetworkModel(net, null, getCanonicalName(net), net.getTrafficType()); @@ -618,7 +618,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager @Override public String getVifNameByVmUuid(String vm_uuid, Integer device_id) { - VMInstanceVO vm = _vmInstanceDao.findByUuid(vm_uuid); + VMInstanceVO vm = _vmInstanceDao.findByUuid(vm_uuid); if (vm != null) { return vm.getInstanceName() + "-" + device_id.toString(); } @@ -647,7 +647,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager VirtualNetworkModel vnModel = getDatabase().lookupVirtualNetwork(net.getUuid(), getCanonicalName(net), TrafficType.Public); return vnModel; } - + @Override public void createPublicNetworks() { List types = new ArrayList(Arrays.asList(TrafficType.Public)); @@ -673,7 +673,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager continue; } _database.getVirtualNetworks().add(vnModel); - + // Add the Contrail NetworkElement to the Public network. Map providerMap = new HashMap(); providerMap.put(Service.Connectivity.getName(), Provider.JuniperContrail.getName()); @@ -738,7 +738,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager } } } - return true; + return true; } @SuppressWarnings("unchecked") diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java index 7be9c559857..6f81ad7f27b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/DBSyncGeneric.java @@ -35,22 +35,22 @@ public class DBSyncGeneric { private static final Logger s_logger = Logger.getLogger(DBSyncGeneric.class); /* for each synchronization VNC class, following methods - * needs to be defined. + * needs to be defined. * For e.q : VirtualNetwork class should have createMethodPrefix+"VirtualNetwork" etc - */ + */ private final String createMethodPrefix = "create"; private final String deleteMethodPrefix = "delete"; private final String compareMethodPrefix = "compare"; private final String filterMethodPrefix = "filter"; private final String equalMethodPrefix = "equal"; private final String syncMethodPrefix = "sync"; - /* default db, vnc comparators are implemented based on uuid values, - * if user defined comparators are required, then only add these methods + /* default db, vnc comparators are implemented based on uuid values, + * if user defined comparators are required, then only add these methods */ private final String dbComparatorMethodPrefix = "dbComparator"; private final String vncComparatorMethodPrefix = "vncComparator"; - /* sync methods implementation object, if implemented in seperate class + /* sync methods implementation object, if implemented in seperate class * set the scope object */ private Object _scope; @@ -59,7 +59,7 @@ public class DBSyncGeneric { public static final short SYNC_MODE_UPDATE = 0; public static final short SYNC_MODE_CHECK = 1; - + public DBSyncGeneric(Object scope) { this._scope = scope; this._syncMode = SYNC_MODE_UPDATE; @@ -75,11 +75,11 @@ public class DBSyncGeneric { public void setSyncMode(short mode) { this._syncMode = mode; } - + public short getSyncMode() { return this._syncMode; } - + public void setScope(Object scope) { this._scope = scope; setMethodMap(); @@ -89,7 +89,7 @@ public class DBSyncGeneric { _methodMap = new HashMap(); Method methods[] = _scope.getClass().getMethods(); for (int i = 0; i < methods.length; i++) { - _methodMap.put(methods[i].getName(), methods[i]); + _methodMap.put(methods[i].getName(), methods[i]); } } @@ -136,7 +136,7 @@ public class DBSyncGeneric { private Boolean filter(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String filterMethod = filterMethodPrefix + getClassName(cls); Method method = _methodMap.get(filterMethod); - if (method == null) { + if (method == null) { s_logger.debug("Method not implemented: " + getClassName(_scope.getClass()) + ":" + filterMethod); return false; } @@ -146,9 +146,9 @@ public class DBSyncGeneric { private Boolean equal(Class cls, Object... parameters) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { String equalMethod = equalMethodPrefix + getClassName(cls); Method method = _methodMap.get(equalMethod); - if (method == null) { + if (method == null) { s_logger.debug("Method not implemented: " + getClassName(_scope.getClass()) + ":" + equalMethod); - return true; + return true; } return (Boolean)method.invoke(_scope, parameters); } @@ -220,12 +220,12 @@ public class DBSyncGeneric { return str.toString(); } } - + public void syncCollections(Class cls, Collection lhsList, Collection rhsList, boolean modifyMode, SyncStats stats) throws InvocationTargetException, IllegalAccessException, NoSuchMethodException { java.util.Iterator lhsIter = lhsList.iterator(); java.util.Iterator rhsIter = rhsList.iterator(); - + Object lhsItem = lhsIter.hasNext() ? lhsIter.next() : null; Object rhsItem = rhsIter.hasNext() ? rhsIter.next() : null; @@ -250,7 +250,7 @@ public class DBSyncGeneric { } rhsItem = rhsIter.hasNext() ? rhsIter.next() : null; } else { - // Equal + // Equal if (this.equal(cls, lhsItem, rhsItem, stats.logMsg)) { stats.equal++; } else { @@ -283,7 +283,7 @@ public class DBSyncGeneric { rhsItem = rhsIter.hasNext() ? rhsIter.next() : null; } } - + @SuppressWarnings("unchecked") public boolean syncGeneric(Class cls, List dbList, List vncList) throws Exception { SyncStats stats = new SyncStats(); @@ -295,7 +295,7 @@ public class DBSyncGeneric { java.util.Collections.sort(vncList, this.vncComparator(cls)); syncCollections(cls, dbList, vncList, _syncMode != SYNC_MODE_CHECK, stats); - + if (_syncMode != SYNC_MODE_CHECK) { s_logger.debug("Sync stats<" + getClassName(cls) + ">: " + stats.toString()); s_logger.debug(stats.logMsg); @@ -306,14 +306,14 @@ public class DBSyncGeneric { s_logger.debug("DB and VNC objects out of sync is detected : " + getClassName(cls)); s_logger.debug("Log message: \n" + stats.logMsg); } else { - s_logger.debug("DB and VNC objects are in sync : " + getClassName(cls)); + s_logger.debug("DB and VNC objects are in sync : " + getClassName(cls)); } } - + /* return value of this method indicates state of the db & vnc before sync - * false: out of sync, true: in sync; + * false: out of sync, true: in sync; * it does not indicate whether sync operation is performed or not; - * Actual sync is done only if _syncMode is UPDATE + * Actual sync is done only if _syncMode is UPDATE */ return stats.isSynchronized(); } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java index dd18ca65e21..c11315f8939 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java @@ -96,7 +96,7 @@ public class EventUtils { if (actionEvent != null) { CallContext ctx = CallContext.current(); if (!actionEvent.create()) { - publishOnMessageBus(EventCategory.ACTION_EVENT.getName(), + publishOnMessageBus(EventCategory.ACTION_EVENT.getName(), actionEvent.eventType(), ctx.getEventDetails(), com.cloud.event.Event.State.Completed); } } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java index e4570232e57..2b57ec1259d 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ManagementNetworkGuru.java @@ -39,7 +39,7 @@ import com.cloud.utils.PropertiesUtil; /** * ManagementNetworkGuru - * + * * Replace the default management network strategy (PodBasedNetworkGuru) by using a Isolated network for management * traffic. */ @@ -96,7 +96,7 @@ public class ManagementNetworkGuru extends ContrailGuru { @Override public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) { - + if (!canHandle(offering)) { return null; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java index f705f076df7..3cbc9088ece 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ModelDatabase.java @@ -30,7 +30,7 @@ public class ModelDatabase { TreeSet _serviceInstanceTable; TreeSet _vmTable; TreeSet _vnTable; - + ModelDatabase() { initDb(); } @@ -40,11 +40,11 @@ public class ModelDatabase { _vmTable = new TreeSet(new ModelObjectBase.UuidComparator()); _vnTable = new TreeSet(new ModelObjectBase.UuidComparator()); } - + public TreeSet getServiceInstances() { return _serviceInstanceTable; } - + public ServiceInstanceModel lookupServiceInstance(String uuid) { ServiceInstanceModel siKey = new ServiceInstanceModel(uuid); ServiceInstanceModel current = _serviceInstanceTable.ceiling(siKey); @@ -53,11 +53,11 @@ public class ModelDatabase { } return null; } - + public TreeSet getVirtualMachines() { return _vmTable; } - + public VirtualMachineModel lookupVirtualMachine(String uuid) { VirtualMachineModel vmKey = new VirtualMachineModel(null, uuid); VirtualMachineModel current = _vmTable.ceiling(vmKey); @@ -66,11 +66,11 @@ public class ModelDatabase { } return null; } - + public TreeSet getVirtualNetworks() { return _vnTable; } - + public VirtualNetworkModel lookupVirtualNetwork(String uuid, String name, TrafficType ttype) { VirtualNetworkModel vnKey = new VirtualNetworkModel(null, uuid, name, ttype); VirtualNetworkModel current = _vnTable.ceiling(vnKey); @@ -82,7 +82,7 @@ public class ModelDatabase { } } else if (current.getUuid().equals(uuid)) { return current; - } + } } return null; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java index 7a77040e0c9..5968da8e557 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerDBSyncImpl.java @@ -84,7 +84,7 @@ public class ServerDBSyncImpl implements ServerDBSync { Class[] _vncClasses; // Read-Write (true) or Read-Only mode. boolean _rw_mode; - private final ReentrantLock _lockSyncMode = new ReentrantLock(); + private final ReentrantLock _lockSyncMode = new ReentrantLock(); ServerDBSyncImpl() { _vncClasses = new Class[] { @@ -104,22 +104,22 @@ public class ServerDBSyncImpl implements ServerDBSync { * API for syncing all classes of vnc objects with cloudstack * * Sync cloudstack and vnc objects. - * Order has to be maintained + * Order has to be maintained */ @Override public short syncAll(short syncMode) { short syncState = SYNC_STATE_IN_SYNC; - + /* vnc classes need to be synchronized with cloudstack */ s_logger.debug("syncing cloudstack db with vnc"); try { for(Class cls : _vncClasses) { - + /* lock the sync mode*/ _lockSyncMode.lock(); _rw_mode = syncMode == DBSyncGeneric.SYNC_MODE_UPDATE; _dbSync.setSyncMode(syncMode); - + if (_dbSync.getSyncMode() == DBSyncGeneric.SYNC_MODE_CHECK) { s_logger.debug("sync check start: " + DBSyncGeneric.getClassName(cls)); } else { @@ -141,7 +141,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } /* unlock the sync mode */ _lockSyncMode.unlock(); - } + } } catch(Exception ex) { s_logger.warn("DB Synchronization", ex); syncState = SYNC_STATE_UNKNOWN; @@ -151,8 +151,8 @@ public class ServerDBSyncImpl implements ServerDBSync { } return syncState; - } - + } + @Override public void syncClass(Class cls) { @@ -168,8 +168,8 @@ public class ServerDBSyncImpl implements ServerDBSync { s_logger.warn("Sync error: " + cls.getName(), ex); if (_lockSyncMode.isLocked()) { _lockSyncMode.unlock(); - } - } + } + } } public void deleteChildren(List> childs, Class childCls, StringBuffer syncLogMesg) throws Exception { @@ -178,7 +178,7 @@ public class ServerDBSyncImpl implements ServerDBSync { syncLogMesg.append("no children of type: " + childCls.getName() + "\n"); return; } - + syncLogMesg.append("delete children of type : " + DBSyncGeneric.getClassName(childCls) + "\n"); String deleteChildMethod = "delete" + DBSyncGeneric.getClassName(childCls); Method method = null; @@ -193,14 +193,14 @@ public class ServerDBSyncImpl implements ServerDBSync { for (ObjectReference childRef: childs) { @SuppressWarnings("unchecked") ApiObjectBase child = (ApiObjectBase) api.findById((Class)childCls, childRef.getUuid()); - if (method != null) { + if (method != null) { method.invoke(this, child, syncLogMesg); } else { deleteDefault(child, childCls, syncLogMesg); } count ++; } - syncLogMesg.append("deleted children count : " + count + "\n"); + syncLogMesg.append("deleted children count : " + count + "\n"); } public void deleteDefault(ApiObjectBase vnc, Class cls, StringBuffer syncLogMesg) throws IOException { @@ -233,7 +233,7 @@ public class ServerDBSyncImpl implements ServerDBSync { vnc.setUuid(db.getUuid()); if (!api.create(vnc)) { s_logger.error("Unable to create domain " + vnc.getName()); - syncLogMesg.append("Error: Virtual domain# VNC : Unable to create domain: " + + syncLogMesg.append("Error: Virtual domain# VNC : Unable to create domain: " + vnc.getName() + "\n"); return; } @@ -243,7 +243,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public void deleteDomain(net.juniper.contrail.api.types.Domain vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); api.read(vnc); - syncLogMesg.append("Domain# DB: none; VNC: " + vnc.getName() + "(" + + syncLogMesg.append("Domain# DB: none; VNC: " + vnc.getName() + "(" + vnc.getUuid() + "); action: delete\n"); /* delete all projects under this domain */ @@ -276,7 +276,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Boolean equalDomain(DomainVO db, net.juniper.contrail.api.types.Domain vnc, StringBuffer syncLogMesg) { - syncLogMesg.append("Domain# DB: " + db.getName() + "; VNC: " + + syncLogMesg.append("Domain# DB: " + db.getName() + "; VNC: " + vnc.getName() + "; action: equal, no action\n"); return true; } @@ -335,7 +335,7 @@ public class ServerDBSyncImpl implements ServerDBSync { vnc.setUuid(db.getUuid()); if (!api.create(vnc)) { s_logger.error("Unable to create project: " + vnc.getName()); - syncLogMesg.append("Error: Virtual project# VNC : Unable to create project: " + + syncLogMesg.append("Error: Virtual project# VNC : Unable to create project: " + vnc.getName() + "\n"); return; } @@ -345,7 +345,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public void deleteProject(net.juniper.contrail.api.types.Project vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); api.read(vnc); - syncLogMesg.append("Project# DB: none; VNC: " + vnc.getName() + "(" + + syncLogMesg.append("Project# DB: none; VNC: " + vnc.getName() + "(" + vnc.getUuid() + "); action: delete\n"); try { @@ -381,7 +381,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Boolean equalProject(ProjectVO db, net.juniper.contrail.api.types.Project vnc, StringBuffer syncLogMesg) { - syncLogMesg.append("Project# DB: " + db.getName() + "; VNC: " + + syncLogMesg.append("Project# DB: " + db.getName() + "; VNC: " + vnc.getName() + "; action: equal, no action\n"); return true; } @@ -391,7 +391,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public int compare(ProjectVO u1, ProjectVO u2) { if (_manager.isSystemDefaultProject(u1)) { return -1; - } + } if (_manager.isSystemDefaultProject(u2)) { return 1; } @@ -419,13 +419,13 @@ public class ServerDBSyncImpl implements ServerDBSync { /* * Security Groups */ - + public void deleteSecurityGroup(net.juniper.contrail.api.types.SecurityGroup vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); api.delete(vnc); syncLogMesg.append("SecurityGroup# VNC: " + vnc.getName() + " deleted\n"); } - + /* * Virtual Network Synchronization methods */ @@ -436,11 +436,11 @@ public class ServerDBSyncImpl implements ServerDBSync { List types = new ArrayList(); types.add(TrafficType.Public); - types.add(TrafficType.Guest); + types.add(TrafficType.Guest); List dbNets = _manager.findJuniperManagedNetworks(types); List vList = (List) api.list(VirtualNetwork.class, null); - List vncList = new ArrayList(); + List vncList = new ArrayList(); for (VirtualNetwork vn:vList) { if (!_manager.isSystemDefaultNetwork(vn)) { vncList.add(vn); @@ -489,14 +489,14 @@ public class ServerDBSyncImpl implements ServerDBSync { public void createVirtualNetwork(NetworkVO dbNet, StringBuffer syncLogMesg) throws IOException { syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbNet) + "(" + dbNet.getUuid() + "); VNC: none; action: create\n"); - - if (_manager.getDatabase().lookupVirtualNetwork(dbNet.getUuid(), + + if (_manager.getDatabase().lookupVirtualNetwork(dbNet.getUuid(), _manager.getCanonicalName(dbNet), dbNet.getTrafficType()) != null) { - s_logger.warn("VN model object is already present in DB: " + - dbNet.getUuid() + ", name: " + dbNet.getName()); + s_logger.warn("VN model object is already present in DB: " + + dbNet.getUuid() + ", name: " + dbNet.getName()); } - - VirtualNetworkModel vnModel = new VirtualNetworkModel(dbNet, + + VirtualNetworkModel vnModel = new VirtualNetworkModel(dbNet, dbNet.getUuid(), _manager.getCanonicalName(dbNet), dbNet.getTrafficType()); vnModel.build(_manager.getModelController(), dbNet); @@ -507,7 +507,7 @@ public class ServerDBSyncImpl implements ServerDBSync { } } catch (InternalErrorException ex) { s_logger.warn("create virtual-network", ex); - syncLogMesg.append("Error: VN# VNC : Unable to create network " + + syncLogMesg.append("Error: VN# VNC : Unable to create network " + dbNet.getName() + "\n"); return; } @@ -529,15 +529,15 @@ public class ServerDBSyncImpl implements ServerDBSync { api.read(vnet); deleteInstanceIps(vnet.getInstanceIpBackRefs(), syncLogMesg); - + List> fipPools = vnet.getFloatingIpPools(); if (fipPools != null && !fipPools.isEmpty()) { FloatingIpPool floatingIpPool = (FloatingIpPool) api.findById(FloatingIpPool.class, fipPools.get(0).getUuid()); if (floatingIpPool != null ) { deleteFloatingIps(floatingIpPool.getFloatingIps(), syncLogMesg); - } + } } - + deleteVirtualMachineInterfaces(vnet.getVirtualMachineInterfaceBackRefs(), syncLogMesg); syncLogMesg.append("VN# DB: none; VNC: " + vnet.getName() + "(" + vnet.getUuid() + "); action: delete\n"); @@ -565,13 +565,13 @@ public class ServerDBSyncImpl implements ServerDBSync { } public Boolean equalVirtualNetwork(NetworkVO dbn, VirtualNetwork vnet, StringBuffer syncLogMesg) { - syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + + syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + "; VNC: " + vnet.getName() + "; action: equal\n"); - + VirtualNetworkModel current = _manager.getDatabase().lookupVirtualNetwork(vnet.getUuid(), _manager.getCanonicalName(dbn), dbn.getTrafficType()); - VirtualNetworkModel vnModel = new VirtualNetworkModel(dbn, vnet.getUuid(), + VirtualNetworkModel vnModel = new VirtualNetworkModel(dbn, vnet.getUuid(), _manager.getCanonicalName(dbn), dbn.getTrafficType()); vnModel.build(_manager.getModelController(), dbn); @@ -579,13 +579,13 @@ public class ServerDBSyncImpl implements ServerDBSync { if (current != null) { FloatingIpPoolModel fipPoolModel = current.getFipPoolModel(); if (fipPoolModel != null) { - vnModel.setFipPoolModel(fipPoolModel); + vnModel.setFipPoolModel(fipPoolModel); fipPoolModel.addToVirtualNetwork(vnModel); } _manager.getDatabase().getVirtualNetworks().remove(current); } s_logger.debug("add model " + vnModel.getName()); - _manager.getDatabase().getVirtualNetworks().add(vnModel); + _manager.getDatabase().getVirtualNetworks().add(vnModel); try { if (!vnModel.verify(_manager.getModelController())) { vnModel.update(_manager.getModelController()); @@ -594,9 +594,9 @@ public class ServerDBSyncImpl implements ServerDBSync { s_logger.warn("update virtual-network", ex); } } else { - //compare + //compare if (current != null && current.compare(_manager.getModelController(), vnModel) == false) { - syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + + syncLogMesg.append("VN# DB: " + _manager.getCanonicalName(dbn) + "; VNC: " + vnet.getName() + "; attributes differ\n"); return false; } @@ -611,7 +611,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public boolean syncVirtualMachine() { final ApiConnector api = _manager.getApiConnector(); try { - List vmDbList = _vmInstanceDao.listAll(); + List vmDbList = _vmInstanceDao.listAll(); @SuppressWarnings("unchecked") List vncVmList = (List) api.list(VirtualMachine.class, null); s_logger.debug("sync VM: CS size: " + vmDbList.size() + " VNC size: " + vncVmList.size()); @@ -669,7 +669,7 @@ public class ServerDBSyncImpl implements ServerDBSync { deleteFloatingIps(vmi.getFloatingIpBackRefs(), syncLogMesg); api.delete(VirtualMachineInterface.class, vmiRef.getUuid()); syncLogMesg.append("VNC vmi: " + vmi.getUuid() + " deleted\n"); - } + } } private void deleteInstanceIps(List> list, StringBuffer syncLogMesg) throws IOException { @@ -681,9 +681,9 @@ public class ServerDBSyncImpl implements ServerDBSync { api.delete(InstanceIp.class, instIp.getUuid()); syncLogMesg.append("VNC instance ip: " + instIp.getUuid() + " deleted\n"); } - + } - + private void deleteFloatingIps(List> list, StringBuffer syncLogMesg) throws IOException { if (list == null) { return; @@ -718,7 +718,7 @@ public class ServerDBSyncImpl implements ServerDBSync { String dbVmId = dbVm.getUuid(); String vncVmId = vncVm.getUuid(); return dbVmId.compareTo(vncVmId); - } + } public boolean filterVirtualMachine(VirtualMachine vncVm, StringBuffer syncLogMesg) { return false; @@ -741,13 +741,13 @@ public class ServerDBSyncImpl implements ServerDBSync { vmiModel.addToVirtualMachine(vmModel); vmiModel.addToVirtualNetwork(vnModel); } - vmiModel.build(_manager.getModelController(), dbVm, nic); - } + vmiModel.build(_manager.getModelController(), dbVm, nic); + } } public Boolean equalVirtualMachine(VMInstanceVO dbVm, VirtualMachine vncVm, StringBuffer syncLogMsg) { - syncLogMsg.append("VM# DB: " + dbVm.getInstanceName() + "/" + dbVm.getUuid() + + syncLogMsg.append("VM# DB: " + dbVm.getInstanceName() + "/" + dbVm.getUuid() + "; VNC: " + vncVm.getUuid() + "; action: equal; DB VM State: " + dbVm.getState() + "\n"); VirtualMachineModel vmModel = new VirtualMachineModel(dbVm, dbVm.getUuid()); @@ -766,45 +766,45 @@ public class ServerDBSyncImpl implements ServerDBSync { if (current != null) { _manager.getDatabase().getVirtualMachines().remove(current); } - _manager.getDatabase().getVirtualMachines().add(vmModel); + _manager.getDatabase().getVirtualMachines().add(vmModel); try { vmModel.update(_manager.getModelController()); } catch (Exception ex) { s_logger.warn("update virtual-machine", ex); } } else { - //compare + //compare if (current != null && current.compare(_manager.getModelController(), vmModel) == false) { - syncLogMsg.append("VM # DB: " + dbVm.getInstanceName() + + syncLogMsg.append("VM # DB: " + dbVm.getInstanceName() + "; VNC: " + vncVm.getName() + "; attributes differ\n"); return false; } } return true; } - - + + public boolean syncFloatingIp() throws Exception { - + List ipList = _manager.findJuniperManagedPublicIps(); - List vncList = _manager.getFloatingIps(); + List vncList = _manager.getFloatingIps(); if (ipList == null) { ipList = new ArrayList(); - } + } if (vncList == null) { vncList = new ArrayList(); } - + boolean status = false; try { status = _dbSync.syncGeneric(FloatingIp.class, ipList, vncList); } catch (Exception ex) { s_logger.warn("sync floating-ips", ex); throw ex; - } + } return status; } - + public Comparator dbComparatorFloatingIp() { Comparator comparator = new Comparator() { public int compare(IpAddress u1, IpAddress u2) { @@ -822,13 +822,13 @@ public class ServerDBSyncImpl implements ServerDBSync { }; return comparator; } - + public Integer compareFloatingIp(IpAddress db, FloatingIp vnc, StringBuffer syncLogMesg) { String dbId = db.getUuid(); String vncId = vnc.getUuid(); return dbId.compareTo(vncId); - } - + } + public void createFloatingIp(IPAddressVO dbIp, StringBuffer syncLogMesg) throws Exception { if (dbIp.getState() == IpAddress.State.Releasing) { @@ -843,19 +843,19 @@ public class ServerDBSyncImpl implements ServerDBSync { } syncLogMesg.append("fip# VNC: " + dbIp.getUuid() + " created\n"); } - + public void deleteFloatingIp(FloatingIp vnc, StringBuffer syncLogMesg) throws IOException { final ApiConnector api = _manager.getApiConnector(); - syncLogMesg.append("fip# DB: none; VNC: " + vnc.getAddress() + "(" + + syncLogMesg.append("fip# DB: none; VNC: " + vnc.getAddress() + "(" + vnc.getUuid() + "); action: delete\n"); api.delete(vnc); syncLogMesg.append("fip# VNC: " + vnc.getUuid() + " deleted\n"); } - - public Boolean equalFloatingIp(IPAddressVO db, FloatingIp vnc, StringBuffer syncLogMsg) + + public Boolean equalFloatingIp(IPAddressVO db, FloatingIp vnc, StringBuffer syncLogMsg) throws IOException { - syncLogMsg.append("fip# DB: " + db.getAddress().addr() + + syncLogMsg.append("fip# DB: " + db.getAddress().addr() + "; VNC: " + vnc.getAddress() + "; action: equal" + "\n"); VirtualNetworkModel vnModel = _manager.lookupPublicNetworkModel(); @@ -880,7 +880,7 @@ public class ServerDBSyncImpl implements ServerDBSync { s_logger.debug("add model " + db.getAddress().addr()); FloatingIpModel fipModel = new FloatingIpModel(db.getUuid()); fipModel.addToFloatingIpPool(fipPoolModel); - fipModel.build(_manager.getModelController(), + fipModel.build(_manager.getModelController(), PublicIp.createFromAddrAndVlan(db, _vlanDao.findById(db.getVlanId()))); try { fipModel.update(_manager.getModelController()); @@ -891,15 +891,15 @@ public class ServerDBSyncImpl implements ServerDBSync { } return true; } - + public Integer compareServiceInstance(ServiceInstanceModel siModel, ServiceInstance siObj, StringBuffer logMsg) { String fqn = StringUtils.join(siObj.getQualifiedName(), ':'); return siModel.getQualifiedName().compareTo(fqn); } - + /** * createServiceInstance - * + * * This method should never be invoked since the model objects have been installed already when sync is called. * @param siModel * @param logMsg @@ -907,7 +907,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public void createServiceInstance(ServiceInstanceModel siModel, StringBuffer logMsg) { assert false; } - + public void deleteServiceInstance(ServiceInstance siObj, StringBuffer logMsg) { final ApiConnector api = _manager.getApiConnector(); s_logger.debug("delete " + siObj.getQualifiedName()); @@ -923,7 +923,7 @@ public class ServerDBSyncImpl implements ServerDBSync { /** * equalServiceInstance - * + * * @param siModel * @param siObj * @param logMsg @@ -931,7 +931,7 @@ public class ServerDBSyncImpl implements ServerDBSync { public void equalServiceInstance(ServiceInstanceModel siModel, ServiceInstance siObj, StringBuffer logMsg) { s_logger.debug("equal " + siModel.getQualifiedName()); } - + static class ServiceInstanceComparator implements Comparator, Serializable { @Override public int compare(ServiceInstance obj1, ServiceInstance obj2) { @@ -939,7 +939,7 @@ public class ServerDBSyncImpl implements ServerDBSync { String name2 = StringUtils.join(obj2.getQualifiedName(), ':'); return name1.compareTo(name2); } - + } /** * The service-instance model list is build as a result of synchronizing virtual-machines. diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java index ec374409fc0..af1d50b47ef 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServerEventHandlerImpl.java @@ -39,11 +39,11 @@ import org.apache.cloudstack.framework.messagebus.MessageHandler; /* * When an Object is created/deleted in cloudstack DB, it has to be reflected in VNC. * This class handles create, delete and update events of cloudstack db objects. - * - * - subscribe for interested events + * + * - subscribe for interested events * - create events will have db id of the object and hence db object and its parameters can be retrieved - * - delete events will have db id but the object no longer exists in db and hence complete class needs to be synchronized - * + * - delete events will have db id but the object no longer exists in db and hence complete class needs to be synchronized + * */ @Component public class ServerEventHandlerImpl implements ServerEventHandler { @@ -57,7 +57,7 @@ public class ServerEventHandlerImpl implements ServerEventHandler { private HashMap> _classMap; private static final Logger s_logger = Logger.getLogger(MessageHandler.class); - + ServerEventHandlerImpl() { setMethodMap(); setClassMap(); @@ -67,20 +67,20 @@ public class ServerEventHandlerImpl implements ServerEventHandler { _methodMap = new HashMap(); Method methods[] = this.getClass().getMethods(); for (int i = 0; i < methods.length; i++) { - _methodMap.put(methods[i].getName(), methods[i]); + _methodMap.put(methods[i].getName(), methods[i]); } } - + private void setClassMap() { - _classMap = new HashMap>(); + _classMap = new HashMap>(); _classMap.put("Domain", net.juniper.contrail.api.types.Domain.class); _classMap.put("Project", net.juniper.contrail.api.types.Project.class); } - + @MessageHandler(topic=".*") public void defaultMessageHandler(String subject, String topic, Object args) { s_logger.info("DB Event Received - topic: " + topic + "; subject: " + subject); - + if (subject.equals("VLAN.IP.RANGE.CREATE")) { _manager.createPublicNetworks(); return; @@ -90,10 +90,10 @@ public class ServerEventHandlerImpl implements ServerEventHandler { } org.apache.cloudstack.framework.events.Event event = (org.apache.cloudstack.framework.events.Event)args; - + /* Method name should be on for example: onDomainCreate */ Method method = null; - + try { /* Only create event needs special implementation */ if (event.getEventType().contains("CREATE")) { @@ -113,28 +113,28 @@ public class ServerEventHandlerImpl implements ServerEventHandler { s_logger.debug(e); } } - + /* Default create handler */ void defaultCreateHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event ) { - + s_logger.debug("Default handler is invoked for subject: " + subject + "; topic: " + topic); s_logger.debug("description: " + event.getDescription()); s_logger.debug("category: " + event.getEventCategory()); s_logger.debug("type: " + event.getResourceType()); s_logger.debug("event-type: " + event.getEventType()); - + Class cls = _classMap.get(event.getResourceType()); - + if ( cls != null ) { _dbSync.syncClass(cls); } - + return; } - + /* Default handler */ void defaultDeleteHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event ) { - + s_logger.debug("Default handler is invoked for subject: " + subject + "; topic: " + topic); s_logger.debug("description: " + event.getDescription()); @@ -144,13 +144,13 @@ public class ServerEventHandlerImpl implements ServerEventHandler { Class cls = _classMap.get(event.getResourceType()); if ( cls != null ) { _dbSync.syncClass(cls); - } + } return; } - + /* Default handler */ void defaultHandler(String subject, String topic, org.apache.cloudstack.framework.events.Event event ) { - + s_logger.debug("Default handler is invoked for subject: " + subject + "; topic: " + topic); s_logger.debug("description: " + event.getDescription()); @@ -160,15 +160,15 @@ public class ServerEventHandlerImpl implements ServerEventHandler { Class cls = _classMap.get(event.getResourceType()); if ( cls != null ) { _dbSync.syncClass(cls); - } + } return; } - + /* Description string contains substring of format "resourceType Id: " for example: "Project id: 35" - * - * example: + * + * example: * description: {"details":"Successfully completed deleting project. Project Id: 39","status":"Completed","event":"PROJECT.DELETE","account":"3afca502-d83c-11e2-b748-52540076b7ca","user":"3b111406-d83c-11e2-b748-52540076b7ca"} - * + * * If the description string format is changed, this code has to be modified */ private long parseForId(String resourceType, String description) { @@ -177,14 +177,14 @@ public class ServerEventHandlerImpl implements ServerEventHandler { String idStr = description.substring(idIdx, description.indexOf('"', idIdx)); long id = 0; try { - id = Long.parseLong(idStr.trim()); + id = Long.parseLong(idStr.trim()); } catch (Exception e) { s_logger.debug("Unable to parse id string<" + idStr.trim() + "> for long value, ignored"); - } + } return id; } - - + + public void onDomainCreate(String subject, String topic, org.apache.cloudstack.framework.events.Event event) { s_logger.info("onDomainCreate; topic: " + topic + "; subject: " + subject); try { @@ -198,16 +198,16 @@ public class ServerEventHandlerImpl implements ServerEventHandler { } else { /* could not find db record, resync complete class */ _dbSync.syncClass(net.juniper.contrail.api.types.Domain.class); - } + } } else { /* Unknown id, resync complete class */ _dbSync.syncClass(net.juniper.contrail.api.types.Domain.class); } } catch (Exception e) { - s_logger.debug(e); + s_logger.debug(e); } } - + public void onProjectCreate(String subject, String topic, org.apache.cloudstack.framework.events.Event event) { s_logger.info("onProjectCreate; topic: " + topic + "; subject: " + subject); try { @@ -220,8 +220,8 @@ public class ServerEventHandlerImpl implements ServerEventHandler { _dbSync.createProject(project, logMesg); } else { /* could not find db record, resync complete class */ - _dbSync.syncClass(net.juniper.contrail.api.types.Project.class); - } + _dbSync.syncClass(net.juniper.contrail.api.types.Project.class); + } } else { /* Unknown id, resync complete class */ _dbSync.syncClass(net.juniper.contrail.api.types.Project.class); @@ -229,10 +229,10 @@ public class ServerEventHandlerImpl implements ServerEventHandler { } catch (Exception e) { s_logger.info(e); } - + } - - + + @Override public void subscribe() { /* subscribe to DB events */ diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java index 47fc99e371a..a9e5f4a1190 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java @@ -79,20 +79,20 @@ public class ServiceManagerImpl implements ServiceManager { @Inject NetworkModel _networkModel; @Inject AccountService _accountService; @Inject ContrailManager _manager; - + /** * In the case of service instance the master object is in the contrail API server. This object stores the * service instance parameters in the database. - * + * * @param owner Used to determine the project. * @param name Service instance name (user specified). * @param template Image to execute. - * @param serviceOffering + * @param serviceOffering * @param left Inside network. * @param right Outside network. * @return */ - + /** * create a new ServiceVM object. @@ -102,21 +102,21 @@ public class ServiceManagerImpl implements ServiceManager { private ServiceVirtualMachine createServiceVM(DataCenter zone, Account owner, VirtualMachineTemplate template, ServiceOffering serviceOffering, String name, ServiceInstance siObj, Network left, Network right) { long id = _vmDao.getNextInSequence(Long.class, "id"); - + DataCenterDeployment plan = new DataCenterDeployment(zone.getId()); - + LinkedHashMap networks = new LinkedHashMap(); NetworkVO linklocal = (NetworkVO) _networkModel.getSystemNetworkByZoneAndTrafficType(zone.getId(), TrafficType.Management); networks.put(linklocal, null); networks.put((NetworkVO) left, null); networks.put((NetworkVO) right, null); - + String instanceName = VirtualMachineName.getVmName(id, owner.getId(), "SRV"); ServiceVirtualMachine svm = new ServiceVirtualMachine(id, instanceName, name, template.getId(), serviceOffering.getId(), template.getHypervisorType(), template.getGuestOSId(), zone.getId(), owner.getDomainId(), owner.getAccountId(), false); - + // database synchronization code must be able to distinguish service instance VMs. Map kvmap = new HashMap(); kvmap.put("service-instance", siObj.getUuid()); @@ -133,7 +133,7 @@ public class ServiceManagerImpl implements ServiceManager { CallContext.current().setEventDetails("Vm Id: " + svm.getId()); return svm; } - + @Override public ServiceVirtualMachine createServiceInstance(DataCenter zone, Account owner, VirtualMachineTemplate template, ServiceOffering serviceOffering, String name, Network left, Network right) { @@ -146,7 +146,7 @@ public class ServiceManagerImpl implements ServiceManager { if (right.getTrafficType() == TrafficType.Guest) { _networkModel.checkNetworkPermissions(owner, right); } - + final ApiConnector api = _manager.getApiConnector(); final VirtualNetwork netLeft; try { @@ -168,7 +168,7 @@ public class ServiceManagerImpl implements ServiceManager { s_logger.warn("read project", ex); throw new CloudRuntimeException(ex); } - + try { final String srvid = api.findByName(ServiceInstance.class, project, name); if (srvid != null) { @@ -178,7 +178,7 @@ public class ServiceManagerImpl implements ServiceManager { s_logger.warn("service-instance lookup", ex); throw new CloudRuntimeException(ex); } - + // 1. Create service-instance. ServiceInstanceModel serviceModel = new ServiceInstanceModel(project, name, template, serviceOffering, netLeft, netRight); @@ -189,9 +189,9 @@ public class ServiceManagerImpl implements ServiceManager { s_logger.warn("service-instance update", ex); throw new CloudRuntimeException(ex); } - + s_logger.debug("service-instance object created"); - + ServiceInstance siObj; try { _manager.getDatabase().getServiceInstances().add(serviceModel); @@ -200,11 +200,11 @@ public class ServiceManagerImpl implements ServiceManager { s_logger.warn("DB add", ex); throw new CloudRuntimeException(ex); } - + // 2. Create one virtual-machine. String svmName = name.replace(" ", "_") + "-1"; ServiceVirtualMachine svm = createServiceVM(zone, owner, template, serviceOffering, svmName, siObj, left, right); - + s_logger.debug("created VMInstance " + svm.getUuid()); // 3. Create the virtual-machine model and push the update. @@ -217,7 +217,7 @@ public class ServiceManagerImpl implements ServiceManager { s_logger.warn("service virtual-machine update", ex); throw new CloudRuntimeException(ex); } - + return svm; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java index a640b1ed7bd..617b5605c0e 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpModel.java @@ -190,7 +190,7 @@ public class FloatingIpModel extends ModelObjectBase { } catch (IOException ex) { s_logger.warn("floating ip update", ex); throw new CloudRuntimeException("Unable to update floating ip object", ex); - } + } } addToVMInterface(vmiModel); diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java index 1205c8753f3..891a4bde499 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/FloatingIpPoolModel.java @@ -149,7 +149,7 @@ public class FloatingIpPoolModel extends ModelObjectBase { } catch (IOException ex) { s_logger.warn("floating ip pool update", ex); throw new CloudRuntimeException("Unable to update floating ip ppol object", ex); - } + } } for (ModelObject successor: successors()) { diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java index 7588ba74fcd..547775b4d43 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/InstanceIpModel.java @@ -31,18 +31,18 @@ import com.cloud.exception.InternalErrorException; public class InstanceIpModel extends ModelObjectBase { private static final Logger s_logger = Logger.getLogger(InstanceIpModel.class); - + private String _name; private String _uuid; - + private String _ipAddress; - + private VMInterfaceModel _vmiModel; - + public InstanceIpModel(String vmName, int deviceId) { _name = vmName + '-' + deviceId; } - + public void addToVMInterface(VMInterfaceModel vmiModel) { _vmiModel = vmiModel; if (vmiModel != null) { @@ -79,30 +79,30 @@ public class InstanceIpModel extends ModelObjectBase { public String getAddress() { return _ipAddress; } - + public String getName() { return _name; } - + public void setAddress(String ipaddress) { _ipAddress = ipaddress; } - + @Override public void update(ModelController controller) throws InternalErrorException, IOException { assert _vmiModel != null; - + ApiConnector api = controller.getApiAccessor(); VirtualNetworkModel vnModel = _vmiModel.getVirtualNetworkModel(); assert vnModel != null; - + VirtualMachineInterface vmi = _vmiModel.getVMInterface(); VirtualNetwork vnet = vnModel.getVirtualNetwork(); if (vnet == null) { vnet = (VirtualNetwork) api.findById(VirtualNetwork.class, _vmiModel.getNetworkUuid()); } - + String ipid = api.findByName(InstanceIp.class, null, _name); if (ipid == null) { InstanceIp ip_obj = new InstanceIp(); @@ -140,7 +140,7 @@ public class InstanceIpModel extends ModelObjectBase { ip_obj.setAddress(_ipAddress); update = true; } - + String vmi_id = ObjectReference.getReferenceListUuid(ip_obj.getVirtualMachineInterface()); if (vmi_id == null || !vmi_id.equals(_vmiModel.getUuid())) { if (vmi != null) { @@ -155,7 +155,7 @@ public class InstanceIpModel extends ModelObjectBase { api.read(ip_obj); _uuid = ip_obj.getUuid(); _ipAddress = ip_obj.getAddress(); - } + } } @Override diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java index 8d57879a399..9781c6f49a3 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelController.java @@ -29,7 +29,7 @@ import net.juniper.contrail.api.ApiConnector; /** * Collection of state necessary for model object to update the Contrail API server. - * + * */ public class ModelController { ApiConnector _api; @@ -39,8 +39,8 @@ public class ModelController { NicDao _nicDao; VlanDao _vlanDao; IPAddressDao _ipAddressDao; - - public ModelController(ContrailManager manager, ApiConnector api, UserVmDao vmDao, NetworkDao networkDao, + + public ModelController(ContrailManager manager, ApiConnector api, UserVmDao vmDao, NetworkDao networkDao, NicDao nicDao, VlanDao vlanDao, IPAddressDao ipAddressDao) { _manager = manager; assert api != null; @@ -62,19 +62,19 @@ public class ModelController { ContrailManager getManager() { return _manager; } - + UserVmDao getVmDao() { return _vmDao; } - + NetworkDao getNetworkDao() { return _networkDao; } - + NicDao getNicDao() { return _nicDao; } - + VlanDao getVlanDao() { return _vlanDao; } diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java index e43c9db36cd..8aa05bb4e8c 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObject.java @@ -26,16 +26,16 @@ import com.cloud.exception.InternalErrorException; /** * ModelObject - * + * * A model object represents the desired state of the system. - * + * * The object constructor should set the uuid and the internal id of the cloudstack objects. - * + * * The build method reads the master database (typically cloudstack mysql) and derives the state that * we wish to reflect in the contrail API. This method should not modify the Contrail API state. - * + * * The verify method reads the API server state and compares with cached properties. - * + * * The update method pushes updates to the contrail API server. */ public interface ModelObject { @@ -55,7 +55,7 @@ public interface ModelObject { } return -1; } - + return lhs.compareTo(rhs); } @@ -84,12 +84,12 @@ public interface ModelObject { public ModelObject get() { return reference.get(); } - - + + }; - + public void addSuccessor(ModelObject child); - + public TreeSet ancestors(); public void clearSuccessors(); public int compareTo(ModelObject o); @@ -103,31 +103,31 @@ public interface ModelObject { /** * Deletes the object from the data model graph. - * + * * @param controller * @throws IOException */ public void destroy(ModelController controller) throws IOException; - + public void removeSuccessor(ModelObject child); - + public TreeSet successors(); - + /** * Push updates to Contrail API server. This API is only valid for objects in the database. * @param controller - * @throws IOException - * @throws InternalErrorException + * @throws IOException + * @throws InternalErrorException */ public void update(ModelController controller) throws InternalErrorException, IOException; - + /** * Check that the state of the current object matches the state of the API server. * @param controller * @return */ public boolean verify(ModelController controller); - + /* * Compare the state of existing model object with latest model object */ diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java index 8d48fa10492..e3e6788b6bc 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ModelObjectBase.java @@ -38,26 +38,26 @@ public abstract class ModelObjectBase implements ModelObject { } } private TreeSet _ancestors; - + private TreeSet _successors; ModelObjectBase() { _ancestors = new TreeSet(); _successors = new TreeSet(new UuidComparator()); } - + @Override public void addSuccessor(ModelObject child) { _successors.add(child); ModelObjectBase base = (ModelObjectBase) child; base._ancestors.add(new ModelReference(this)); } - + @Override public TreeSet ancestors() { return _ancestors; } - + private void clearAncestorReference(ModelObjectBase child) { ModelReference ref = null; for (ModelReference objref : child._ancestors) { @@ -70,7 +70,7 @@ public abstract class ModelObjectBase implements ModelObject { child._ancestors.remove(ref); } } - + @Override public void clearSuccessors() { for (ModelObject successor : _successors) { @@ -104,7 +104,7 @@ public abstract class ModelObjectBase implements ModelObject { } return compareTo(other) == 0; } - + @Override protected void finalize() { clearSuccessors(); @@ -113,7 +113,7 @@ public abstract class ModelObjectBase implements ModelObject { public boolean hasDescendents() { return !successors().isEmpty(); } - + @Override public void removeSuccessor(ModelObject child) { clearAncestorReference((ModelObjectBase) child); diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java index 20b80bead4c..7796fbbb169 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/ServiceInstanceModel.java @@ -53,7 +53,7 @@ public class ServiceInstanceModel extends ModelObjectBase { private String _mgmtName; private String _leftName; private String _rightName; - + private String _templateName; private String _templateId; private String _templateUrl; @@ -65,7 +65,7 @@ public class ServiceInstanceModel extends ModelObjectBase { /** * Create a ServiceInstance as result of an API call. - * + * * @param owner * @param name * @param template @@ -82,18 +82,18 @@ public class ServiceInstanceModel extends ModelObjectBase { parent_name = ContrailManager.VNC_ROOT_DOMAIN + ":" + ContrailManager.VNC_DEFAULT_PROJECT; } _fq_name = parent_name + ":" + name; - + _mgmtName = ContrailManager.VNC_ROOT_DOMAIN + ":" + ContrailManager.VNC_DEFAULT_PROJECT + ":" + ContrailManager.managementNetworkName; _left = left; _right = right; _leftName = StringUtils.join(left.getQualifiedName(), ":"); _rightName = StringUtils.join(right.getQualifiedName(), ":"); - + _templateName = template.getName(); _templateId = template.getUuid(); _templateUrl = template.getUrl(); - + _projectId = project.getUuid(); } @@ -104,15 +104,15 @@ public class ServiceInstanceModel extends ModelObjectBase { public ServiceInstanceModel(String uuid) { _uuid = uuid; } - + public String getQualifiedName() { return _fq_name; } - + public String getName() { return _fq_name.substring(_fq_name.lastIndexOf(':') + 1); } - + private void applyNetworkPolicy(ModelController controller, NetworkPolicy policy, VirtualNetwork left, VirtualNetwork right) { left.setNetworkPolicy(policy, new VirtualNetworkPolicyType( @@ -125,7 +125,7 @@ public class ServiceInstanceModel extends ModelObjectBase { } catch (IOException ex) { throw new CloudRuntimeException("Unable to update virtual-network", ex); } - + right.setNetworkPolicy(policy, new VirtualNetworkPolicyType( new VirtualNetworkPolicyType.SequenceType(1, 0), null)); // TODO: network_ipam_refs attr is missing @@ -170,7 +170,7 @@ public class ServiceInstanceModel extends ModelObjectBase { s_logger.warn("network-policy read", ex); } } - + @Override public int compareTo(ModelObject o) { ServiceInstanceModel other; @@ -182,7 +182,7 @@ public class ServiceInstanceModel extends ModelObjectBase { } return _fq_name.compareTo(other._fq_name); } - + private ServiceInstance createServiceInstance(ModelController controller) { Project project = null; if (_projectId != null) { @@ -191,7 +191,7 @@ public class ServiceInstanceModel extends ModelObjectBase { project = (Project) api.findById(Project.class, _projectId); } catch (IOException ex) { s_logger.warn("project read", ex); - throw new CloudRuntimeException("Unable to create service-instance object", ex); + throw new CloudRuntimeException("Unable to create service-instance object", ex); } } @@ -210,10 +210,10 @@ public class ServiceInstanceModel extends ModelObjectBase { s_logger.warn("service-instance create", ex); throw new CloudRuntimeException("Unable to create service-instance object", ex); } - + return si_obj; } - + private NetworkPolicy createServicePolicy(ModelController controller) { NetworkPolicy policy = new NetworkPolicy(); policy.setParent(_serviceInstance.getParent()); @@ -227,14 +227,14 @@ public class ServiceInstanceModel extends ModelObjectBase { siList.add(StringUtils.join(_serviceInstance.getQualifiedName(), ':')); List portAny = new ArrayList(); portAny.add(new PolicyRuleType.PortType(0, 65535)); - + PolicyRuleType rule = new PolicyRuleType( new PolicyRuleType.SequenceType(1, 0), /* uuid */ null, "<>", "any", srcList, portAny, /* application */ null, dstList, portAny, new PolicyRuleType.ActionListType("pass", "in-network", siList, null)); policy_map.addPolicyRule(rule); policy.setEntries(policy_map); - + try { ApiConnector api = controller.getApiAccessor(); if (!api.create(policy)) { @@ -245,7 +245,7 @@ public class ServiceInstanceModel extends ModelObjectBase { } return policy; } - + @Override public void delete(ModelController controller) throws IOException { ApiConnector api = controller.getApiAccessor(); @@ -253,11 +253,11 @@ public class ServiceInstanceModel extends ModelObjectBase { api.delete(_serviceInstance); } } - + @Override public void destroy(ModelController controller) throws IOException { } - + public ServiceInstance getServiceInstance() { return _serviceInstance; } @@ -265,7 +265,7 @@ public class ServiceInstanceModel extends ModelObjectBase { public String getUuid() { return _uuid; } - + private ServiceTemplate locateServiceTemplate(ModelController controller) { ServiceTemplate tmpl; try { diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java index 347656968e4..904cbe89f2b 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java @@ -36,7 +36,7 @@ public class VMInterfaceModel extends ModelObjectBase { private static final Logger s_logger = Logger.getLogger(VMInterfaceModel.class); private String _uuid; - + /** * properties */ @@ -54,25 +54,25 @@ public class VMInterfaceModel extends ModelObjectBase { private VirtualMachineModel _vmModel; private VirtualNetworkModel _vnModel; private VirtualMachineInterface _vmi; - + public VMInterfaceModel(String uuid) { _uuid = uuid; } - + public void addToVirtualMachine(VirtualMachineModel vmModel) { _vmModel = vmModel; if (vmModel != null) { vmModel.addSuccessor(this); } } - + public void addToVirtualNetwork(VirtualNetworkModel vnModel) { _vnModel = vnModel; if (vnModel != null) { vnModel.addSuccessor(this); } } - + public void build(ModelController controller, VMInstanceVO instance, NicVO nic) throws IOException { setProperties(controller, instance, nic); @@ -87,7 +87,7 @@ public class VMInterfaceModel extends ModelObjectBase { } else if (ipModel != null) { removeSuccessor(ipModel); } - + _macAddress = nic.getMacAddress(); } @@ -102,7 +102,7 @@ public class VMInterfaceModel extends ModelObjectBase { } return _uuid.compareTo(other._uuid); } - + @Override public void delete(ModelController controller) throws IOException { for (ModelObject successor: successors()) { @@ -110,19 +110,19 @@ public class VMInterfaceModel extends ModelObjectBase { } ApiConnector api = controller.getApiAccessor(); - api.delete(VirtualMachineInterface.class, _uuid); + api.delete(VirtualMachineInterface.class, _uuid); } @Override public void destroy(ModelController controller) throws IOException { delete(controller); - + for (ModelObject successor: successors()) { successor.destroy(controller); } clearSuccessors(); } - + public InstanceIpModel getInstanceIp() { for (ModelObject successor : successors()) { if (successor.getClass() == InstanceIpModel.class) { @@ -131,23 +131,23 @@ public class VMInterfaceModel extends ModelObjectBase { } return null; } - + public String getNetworkUuid() { return _networkId; } - + public VirtualNetworkModel getVirtualNetworkModel() { return _vnModel; } - + public String getUuid() { return _uuid; } - + public VirtualMachineInterface getVMInterface() { return _vmi; } - + public void setProperties(ModelController controller, VMInstanceVO instance, NicVO nic) throws IOException { _vmName = instance.getInstanceName(); _deviceId = nic.getDeviceId(); @@ -162,7 +162,7 @@ public class VMInterfaceModel extends ModelObjectBase { _nicActive = false; break; } - + switch (network.getState()) { case Implemented: case Setup: @@ -173,17 +173,17 @@ public class VMInterfaceModel extends ModelObjectBase { break; } assert _vnModel != null; - _networkId = _vnModel.getUuid(); + _networkId = _vnModel.getUuid(); } - + public void setActive() { _nicActive = true; } - + void setServiceTag(String tag) { _serviceTag = tag; } - + @Override public void update(ModelController controller) throws InternalErrorException, IOException { if (!_netActive || !_nicActive) { @@ -219,7 +219,7 @@ public class VMInterfaceModel extends ModelObjectBase { mac.addMacAddress(_macAddress); vmi.setMacAddresses(mac); } - + if (_serviceTag != null) { vmi.setProperties(new VirtualMachineInterfacePropertiesType(_serviceTag, null)); } @@ -235,7 +235,7 @@ public class VMInterfaceModel extends ModelObjectBase { } api.read(vmi); - + int ipCount = 0; for (ModelObject successor: successors()) { if (successor.getClass() == InstanceIpModel.class) { @@ -249,7 +249,7 @@ public class VMInterfaceModel extends ModelObjectBase { s_logger.warn("virtual-machine-interface " + _uuid + " has no instance-ip"); } } - + @Override public boolean verify(ModelController controller) { // TODO Auto-generated method stub diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java index ec20a9417ec..91354d4e4c7 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java @@ -46,22 +46,22 @@ public class VirtualMachineModel extends ModelObjectBase { private String _uuid; private long _instanceId; - + /* - * current state for object properties + * current state for object properties */ private boolean _initialized; private boolean _active; private String _serviceUuid; private String _instanceName; private String _projectId; - + /* * cached API server objects */ private VirtualMachine _vm; private ServiceInstanceModel _serviceModel; - + public VirtualMachineModel(VMInstanceVO vm, String uuid) { _uuid = uuid; if (vm != null) { @@ -69,7 +69,7 @@ public class VirtualMachineModel extends ModelObjectBase { _instanceName = vm.getInstanceName(); } } - + /** * Resynchronize internal state from the cloudstack DB object. * @param instance @@ -92,7 +92,7 @@ public class VirtualMachineModel extends ModelObjectBase { /** * Link the virtual machine with the service instance when recovering state from database. - * + * * @param controller * @param serviceUuid */ @@ -100,7 +100,7 @@ public class VirtualMachineModel extends ModelObjectBase { ContrailManager manager = controller.getManager(); ApiConnector api = controller.getApiAccessor(); _serviceUuid = serviceUuid; - + ServiceInstanceModel siModel = manager.getDatabase().lookupServiceInstance(serviceUuid); if (siModel == null) { ServiceInstance siObj; @@ -129,14 +129,14 @@ public class VirtualMachineModel extends ModelObjectBase { } return _uuid.compareTo(other._uuid); } - + @Override public void delete(ModelController controller) throws IOException { ApiConnector api = controller.getApiAccessor(); for (ModelObject successor: successors()) { successor.delete(controller); } - + try { api.delete(VirtualMachine.class, _uuid); } catch (IOException ex) { @@ -158,7 +158,7 @@ public class VirtualMachineModel extends ModelObjectBase { } clearSuccessors(); - + if (_serviceModel != null) { _serviceModel.removeSuccessor(this); _serviceModel.destroy(controller); @@ -171,16 +171,16 @@ public class VirtualMachineModel extends ModelObjectBase { public String getInstanceName() { return _instanceName; } - + public String getUuid() { return _uuid; } - + public VirtualMachine getVirtualMachine() { return _vm; } - + public VMInterfaceModel getVMInterface(String uuid) { TreeSet tree = successors(); VMInterfaceModel vmiKey = new VMInterfaceModel(uuid); @@ -190,11 +190,11 @@ public class VirtualMachineModel extends ModelObjectBase { } return null; } - + public boolean isActive() { return _active; } - + boolean isActiveInstance(VMInstanceVO instance) { switch (instance.getState()) { case Migrating: @@ -204,18 +204,18 @@ public class VirtualMachineModel extends ModelObjectBase { case Stopped: case Stopping: return true; - + case Destroyed: case Error: case Expunging: return false; - + default: s_logger.warn("Unknown VMInstance state " + instance.getState().getDescription()); } return true; } - + /** * Initialize the object properties based on the DB object. * Common code between plugin calls and DBSync. @@ -224,7 +224,7 @@ public class VirtualMachineModel extends ModelObjectBase { ContrailManager manager = controller.getManager(); _instanceName = instance.getInstanceName(); _active = isActiveInstance(instance); - + try { _projectId = manager.getProjectId(instance.getDomainId(), instance.getAccountId()); } catch (IOException ex) { @@ -236,7 +236,7 @@ public class VirtualMachineModel extends ModelObjectBase { /** * Link the virtual machine with a service instance via programmatic API call. - * @throws IOException + * @throws IOException */ public void setServiceInstance(ModelController controller, VMInstanceVO instance, ServiceInstanceModel serviceModel) throws IOException { @@ -245,16 +245,16 @@ public class VirtualMachineModel extends ModelObjectBase { serviceModel.addSuccessor(this); setServiceInstanceNics(controller, instance); } - + private void setServiceInstanceNics(ModelController controller, VMInstanceVO instance) throws IOException { NicDao nicDao = controller.getNicDao(); ContrailManager manager = controller.getManager(); NetworkDao networkDao = controller.getNetworkDao(); - + List nics = nicDao.listByVmId(_instanceId); for (NicVO nic : nics) { String tag; - + switch (nic.getDeviceId()) { case 0: tag = "management"; @@ -283,7 +283,7 @@ public class VirtualMachineModel extends ModelObjectBase { vmiModel.setServiceTag(tag); } } - + @Override public void update(ModelController controller) throws InternalErrorException, IOException { assert _initialized; @@ -300,7 +300,7 @@ public class VirtualMachineModel extends ModelObjectBase { project = (Project) api.findById(Project.class, _projectId); } catch (IOException ex) { s_logger.debug("project read", ex); - throw new CloudRuntimeException("Failed to read project", ex); + throw new CloudRuntimeException("Failed to read project", ex); } vm.setParent(project); } @@ -309,7 +309,7 @@ public class VirtualMachineModel extends ModelObjectBase { } } - if (_serviceModel != null) { + if (_serviceModel != null) { vm.setServiceInstance(_serviceModel.getServiceInstance()); } @@ -327,14 +327,14 @@ public class VirtualMachineModel extends ModelObjectBase { } catch (IOException ex) { s_logger.warn("virtual-machine update", ex); throw new CloudRuntimeException("Unable to update virtual-machine object", ex); - } + } } for (ModelObject successor: successors()) { successor.update(controller); } } - + @Override public boolean verify(ModelController controller) { // TODO Auto-generated method stub diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java index b4968ac7805..b1321fc1f63 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VirtualNetworkModel.java @@ -47,10 +47,10 @@ public class VirtualNetworkModel extends ModelObjectBase { private String _uuid; private long _id; - private TrafficType _trafficType; + private TrafficType _trafficType; /* - * current state for object properties + * current state for object properties */ private boolean _initialized; private String _name; @@ -91,13 +91,13 @@ public class VirtualNetworkModel extends ModelObjectBase { /** * Determine whether this network is dynamically created by cloudstack or is created by default by the contrail * API server. - * + * * @return */ boolean isDynamicNetwork() { return (_trafficType == TrafficType.Guest) || (_trafficType == TrafficType.Public); } - + @Override public int compareTo(ModelObject o) { VirtualNetworkModel other; @@ -107,7 +107,7 @@ public class VirtualNetworkModel extends ModelObjectBase { String clsname = o.getClass().getName(); return VirtualNetworkModel.class.getName().compareTo(clsname); } - + if (!isDynamicNetwork()) { if (!other.isDynamicNetwork()) { // name is not unique since both management and storage networks may map to ip-fabric @@ -121,7 +121,7 @@ public class VirtualNetworkModel extends ModelObjectBase { } else if (!other.isDynamicNetwork()) { return 1; } - + return _uuid.compareTo(other._uuid); } @@ -171,7 +171,7 @@ public class VirtualNetworkModel extends ModelObjectBase { _name = manager.getCanonicalName(network); _prefix = network.getCidr(); _gateway = network.getGateway(); - + // For non-cloudstack managed network, find the uuid at this stage. if (!isDynamicNetwork()) { try { @@ -180,14 +180,14 @@ public class VirtualNetworkModel extends ModelObjectBase { s_logger.warn("Unable to read virtual-network", ex); } } - + try { _projectId = manager.getProjectId(network.getDomainId(), network.getAccountId()); } catch (IOException ex) { s_logger.warn("project read", ex); throw new CloudRuntimeException(ex); } - + _initialized = true; } @@ -199,12 +199,12 @@ public class VirtualNetworkModel extends ModelObjectBase { ApiConnector api = controller.getApiAccessor(); VlanDao vlanDao = controller.getVlanDao(); VirtualNetwork vn = _vn; - + if (!isDynamicNetwork()) { _vn = (VirtualNetwork) controller.getApiAccessor().findById(VirtualNetwork.class, _uuid); return; } - + assert _uuid != null : "uuid is not set"; if (_vn == null) { @@ -217,15 +217,15 @@ public class VirtualNetworkModel extends ModelObjectBase { project = (Project) api.findById(Project.class, _projectId); } catch (IOException ex) { s_logger.debug("project read", ex); - throw new CloudRuntimeException("Failed to read project", ex); + throw new CloudRuntimeException("Failed to read project", ex); } vn.setParent(project); } vn.setName(_name); vn.setUuid(_uuid); - } + } } - + if (_ipam == null) { NetworkIpam ipam = null; try { @@ -264,7 +264,7 @@ public class VirtualNetworkModel extends ModelObjectBase { subnet.addIpamSubnets(new SubnetType(ip_addr, plen), vlan.getVlanGateway()); vn.addNetworkIpam(_ipam, subnet); } - } + } if (_vn == null) { try { @@ -280,7 +280,7 @@ public class VirtualNetworkModel extends ModelObjectBase { } catch (IOException ex) { s_logger.warn("virtual-network update", ex); throw new CloudRuntimeException("Unable to update virtual-network object", ex); - } + } } for (ModelObject successor: successors()) { @@ -337,7 +337,7 @@ public class VirtualNetworkModel extends ModelObjectBase { subnet.addIpamSubnets(new SubnetType(ip_addr, plen), vlan.getVlanGateway()); _vn.addNetworkIpam(_ipam, subnet); } - } + } return; } @@ -362,7 +362,7 @@ public class VirtualNetworkModel extends ModelObjectBase { if (!isDynamicNetwork()) { return true; } - + List dbSubnets = new ArrayList(); if (_trafficType == TrafficType.Public) { List vlan_list = vlanDao.listVlansByNetworkId(_id); @@ -371,16 +371,16 @@ public class VirtualNetworkModel extends ModelObjectBase { dbSubnets.add(vlan.getVlanGateway() + cidr); } } else { - dbSubnets.add(this._gateway + this._prefix); + dbSubnets.add(this._gateway + this._prefix); } - + List> ipamRefs = _vn.getNetworkIpam(); List vncSubnets = new ArrayList(); - + if (ipamRefs == null && !dbSubnets.isEmpty()) { return false; } - + if (ipamRefs != null) { for (ObjectReference ref: ipamRefs) { VnSubnetsType vnSubnetType = ref.getAttr(); @@ -389,21 +389,21 @@ public class VirtualNetworkModel extends ModelObjectBase { if (subnets != null && !subnets.isEmpty()) { VnSubnetsType.IpamSubnetType ipamSubnet = subnets.get(0); vncSubnets.add(ipamSubnet.getDefaultGateway() + - ipamSubnet.getSubnet().getIpPrefix() +"/" + ipamSubnet.getSubnet().getIpPrefixLen()); - } - } + ipamSubnet.getSubnet().getIpPrefix() +"/" + ipamSubnet.getSubnet().getIpPrefixLen()); + } + } } } - // unordered, no duplicates hence perform negation operation as set + // unordered, no duplicates hence perform negation operation as set Set diff = new HashSet(dbSubnets); diff.removeAll(vncSubnets); - + if (!diff.isEmpty()) { - s_logger.debug("Subnets changed, network: " + this._name + + s_logger.debug("Subnets changed, network: " + this._name + "; db: " + dbSubnets + ", vnc: " + vncSubnets + ", diff: " + diff); return false; } - + for (ModelObject successor: successors()) { if (!successor.verify(controller)) { return false; @@ -420,12 +420,12 @@ public class VirtualNetworkModel extends ModelObjectBase { assert this._vn != null : "vnc virtual network current is not initialized"; try { - latest = (VirtualNetworkModel) o; + latest = (VirtualNetworkModel) o; } catch (ClassCastException ex) { s_logger.warn("Invalid model object is passed to cast to VirtualNetworkModel"); return false; } - + try { latest.read(controller); } catch (Exception e) { @@ -433,22 +433,22 @@ public class VirtualNetworkModel extends ModelObjectBase { return false; } assert latest._vn != null : "vnc virtual network new is not initialized"; - + List> currentIpamRefs = this._vn.getNetworkIpam(); List> newIpamRefs = latest._vn.getNetworkIpam(); List currentSubnets = new ArrayList(); List newSubnets = new ArrayList(); - - if ((currentIpamRefs == null && newIpamRefs != null) || + + if ((currentIpamRefs == null && newIpamRefs != null) || (currentIpamRefs != null && newIpamRefs == null)) { //Check for existence only s_logger.debug("ipams differ: current=" + currentIpamRefs + ", new=" + newIpamRefs); return false; - } + } if (currentIpamRefs == null) { return true; } - + for (ObjectReference ref: currentIpamRefs) { VnSubnetsType vnSubnetType = ref.getAttr(); if (vnSubnetType != null) { @@ -456,11 +456,11 @@ public class VirtualNetworkModel extends ModelObjectBase { if (subnets != null && !subnets.isEmpty()) { VnSubnetsType.IpamSubnetType ipamSubnet = subnets.get(0); currentSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + - "/" + ipamSubnet.getSubnet().getIpPrefixLen()); - } - } + "/" + ipamSubnet.getSubnet().getIpPrefixLen()); + } + } } - + for (ObjectReference ref: newIpamRefs) { VnSubnetsType vnSubnetType = ref.getAttr(); if (vnSubnetType != null) { @@ -468,20 +468,20 @@ public class VirtualNetworkModel extends ModelObjectBase { if (subnets != null && !subnets.isEmpty()) { VnSubnetsType.IpamSubnetType ipamSubnet = subnets.get(0); newSubnets.add(ipamSubnet.getDefaultGateway() + ipamSubnet.getSubnet().getIpPrefix() + - "/" + ipamSubnet.getSubnet().getIpPrefixLen()); - } - } + "/" + ipamSubnet.getSubnet().getIpPrefixLen()); + } + } } - + Set diff = new HashSet(currentSubnets); diff.removeAll(newSubnets); - + if (!diff.isEmpty()) { - s_logger.debug("Subnets differ, network: " + this._name + + s_logger.debug("Subnets differ, network: " + this._name + "; db: " + currentSubnets + ", vnc: " + newSubnets + ", diff: " + diff); return false; } - + return true; } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java index d9126fc0160..83ef6f56d59 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java @@ -499,7 +499,7 @@ public class IntegrationTestConfiguration { return includedInBasePackageClasses(clsname, cs); } } - + public static boolean includedInBasePackageClasses(String clazzName, ComponentScan cs) { Class clazzToCheck; try { @@ -530,11 +530,11 @@ public class IntegrationTestConfiguration { public AffinityGroupService affinityGroupService() { AffinityGroupService mock = Mockito.mock(AffinityGroupService.class); try { - final AffinityGroupVO gmock = new AffinityGroupVO("grp1", "grp-type", "affinity group", 1, AccountVO.ACCOUNT_ID_SYSTEM, ControlledEntity.ACLType.Account); + final AffinityGroupVO gmock = new AffinityGroupVO("grp1", "grp-type", "affinity group", 1, AccountVO.ACCOUNT_ID_SYSTEM, ControlledEntity.ACLType.Account); Transaction.execute(new TransactionCallbackNoReturn() { @Override public void doInTransactionWithoutResult(TransactionStatus status) { - _affinityGroupDao.persist(gmock); + _affinityGroupDao.persist(gmock); } }); Mockito.when(mock.createAffinityGroupInternal(Mockito.any(String.class), Mockito.any(Long.class), Mockito.any(String.class), Mockito.any(String.class), Mockito.any(String.class))).thenReturn(gmock); @@ -827,7 +827,7 @@ public class IntegrationTestConfiguration { public VolumeDataFactory volumeDataFactory() { return Mockito.mock(VolumeDataFactory.class); } - @Bean + @Bean public VolumeOrchestrationService volumeOrchestrationService() { return Mockito.mock(VolumeOrchestrationService.class); } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java index 86750ca8d1b..6991d2c4ae7 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java @@ -173,7 +173,7 @@ public class ManagementServerMock { List nets = _networksDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public); if (nets != null && !nets.isEmpty()) { - NetworkVO public_net = nets.get(0); + NetworkVO public_net = nets.get(0); public_net_id = public_net.getId(); } else { s_logger.debug("no public network found in the zone: " + _zone.getId()); @@ -271,7 +271,7 @@ public class ManagementServerMock { } catch (OperationTimedoutException e) { e.printStackTrace(); } - + _userVmDao.remove(vm.getId()); } @@ -290,7 +290,7 @@ public class ManagementServerMock { if (tmpl.getHypervisorType() == HypervisorType.XenServer) { return tmpl; } - } + } return null; } @@ -361,7 +361,7 @@ public class ManagementServerMock { PhysicalNetworkServiceProvider provider = providers.first().get(0); if (provider.getState() != PhysicalNetworkServiceProvider.State.Enabled) { _networkService.updateNetworkServiceProvider(provider.getId(), - PhysicalNetworkServiceProvider.State.Enabled.toString(), null); + PhysicalNetworkServiceProvider.State.Enabled.toString(), null); } } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java index 82dd49f6927..c2b06ea454f 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java @@ -72,7 +72,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { @Inject AccountJoinDao _accountJoinDao; @Inject UserDao _userDao; - + UserVO _systemUser; AccountVO _systemAccount; @@ -96,14 +96,14 @@ public class MockAccountManager extends ManagerBase implements AccountManager { public void checkAccess(Account arg0, Domain arg1) throws PermissionDeniedException { // TODO Auto-generated method stub - + } @Override public void checkAccess(Account arg0, AccessType arg1, boolean arg2, ControlledEntity... arg3) throws PermissionDeniedException { // TODO Auto-generated method stub - + } @Override @@ -130,7 +130,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { @Override public Account finalizeOwner(Account arg0, String arg1, Long arg2, Long arg3) { - return _systemAccount; + return _systemAccount; } @Override @@ -199,7 +199,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { @Override public void markUserRegistered(long arg0) { // TODO Auto-generated method stub - + } @Override @@ -214,7 +214,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { SearchBuilder arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub - + } @Override @@ -222,7 +222,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { SearchCriteria arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub - + } @Override @@ -231,7 +231,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { Ternary arg5, boolean arg6, boolean arg7) { // TODO Auto-generated method stub - + } @Override @@ -239,7 +239,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { SearchBuilder arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub - + } @Override @@ -247,7 +247,7 @@ public class MockAccountManager extends ManagerBase implements AccountManager { SearchCriteria arg0, Long arg1, boolean arg2, List arg3, ListProjectResourcesCriteria arg4) { // TODO Auto-generated method stub - + } @Override @@ -365,8 +365,8 @@ public class MockAccountManager extends ManagerBase implements AccountManager { @Override public void logoutUser(long userId) { // TODO Auto-generated method stub - + } - + } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java index 40cd1ea30a8..67d39216edd 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java @@ -111,7 +111,7 @@ public class NetworkProviderTest extends TestCase { @Inject public DomainDao _domainDao; @Inject public ProjectDao _projectDao; @Inject public AgentManager _agentMgr; - + private ManagementServerMock _server; private ApiConnector _api; private static int _mysql_server_port; @@ -127,22 +127,22 @@ public class NetworkProviderTest extends TestCase { s_logger.info("mysql server launched on port " + _mysql_server_port); _msId = ManagementServerNode.getManagementServerId(); - _lockMaster = Merovingian2.createLockMaster(_msId); + _lockMaster = Merovingian2.createLockMaster(_msId); } - + @AfterClass public static void globalTearDown() throws Exception { _lockMaster.cleanupForServer(_msId); JmxUtil.unregisterMBean("Locks", "Locks"); _lockMaster = null; - + AbstractApplicationContext ctx = (AbstractApplicationContext) ComponentContext.getApplicationContext(); Map lifecycleComponents = ctx.getBeansOfType(ComponentLifecycle.class); for (ComponentLifecycle bean: lifecycleComponents.values()) { bean.stop(); } ctx.close(); - + s_logger.info("destroying mysql server instance running at port <" + _mysql_server_port + ">"); TestDbSetup.destroy(_mysql_server_port, null); } @@ -227,7 +227,7 @@ public class NetworkProviderTest extends TestCase { purgeTestNetwork(); createTestNetwork("test"); } - + @Test public void testConnectivity() { Network network = lookupTestNetwork("test"); @@ -383,7 +383,7 @@ public class NetworkProviderTest extends TestCase { fail("unable to create floating ip"); } - /* reset ApiServer objects to default config only, so above created objects + /* reset ApiServer objects to default config only, so above created objects * exists only in cludstack db but not in api server */ ((ApiConnectorMock)_api).initConfig(); @@ -414,7 +414,7 @@ public class NetworkProviderTest extends TestCase { net.setName("test-vnc-only-net-1"); net.setUuid(UUID.randomUUID().toString()); net.setParent(project); - + NetworkIpam ipam = null; try { // Find default-network-ipam @@ -462,16 +462,16 @@ public class NetworkProviderTest extends TestCase { } catch (IOException ex) { fail(ex.getMessage()); } - + //now db sync if (_dbSync.syncAll(DBSyncGeneric.SYNC_MODE_UPDATE) == ServerDBSync.SYNC_STATE_OUT_OF_SYNC) { s_logger.info("# Cloudstack DB & VNC are out of sync - resync done"); } - + if (_dbSync.syncAll(DBSyncGeneric.SYNC_MODE_CHECK) == ServerDBSync.SYNC_STATE_OUT_OF_SYNC) { s_logger.info("# Cloudstack DB & VNC are still out of sync"); - fail("DB Sync failed"); + fail("DB Sync failed"); } } - + } diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java index 8b4e67c44fa..a3ec279ed28 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java @@ -71,7 +71,7 @@ public class PublicNetworkTest extends TestCase { private static Merovingian2 _lockMaster; private ManagementServerMock _server; private ApiConnector _spy; - + @BeforeClass public static void globalSetUp() throws Exception { @@ -130,12 +130,12 @@ public class PublicNetworkTest extends TestCase { ArgumentCaptor createArg = ArgumentCaptor.forClass(ApiObjectBase.class); verify(_spy, times(4)).create(createArg.capture()); - + List argumentList = createArg.getAllValues(); ApiObjectBase vmObj = argumentList.get(0); assertEquals(VirtualNetwork.class, vmObj.getClass()); assertEquals("__default_Public__", vmObj.getName()); - + String vmiName = null; for (ApiObjectBase obj: argumentList) { if (obj.getClass() == VirtualMachineInterface.class) { diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java index ed506f33cb1..22b114ba3d4 100644 --- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java +++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/TestDbSetup.java @@ -45,7 +45,7 @@ public class TestDbSetup { Runtime r = Runtime.getRuntime(); String script = startMysqlScript; if (script == null) { - script = "test/resources/mysql_db_start.sh " + port; + script = "test/resources/mysql_db_start.sh " + port; } Process process = r.exec("sh " + cwd + "/" + script); process.waitFor(); @@ -65,7 +65,7 @@ public class TestDbSetup { Runtime r = Runtime.getRuntime(); String script = stopMysqlScript; if (script == null) { - script = "test/resources/mysql_db_stop.sh " + port; + script = "test/resources/mysql_db_stop.sh " + port; } Process process = r.exec("sh " + script); process.waitFor(); @@ -87,7 +87,7 @@ public class TestDbSetup { public static void updateSqlPort(int port, String propertyFileOverride) throws Exception { PropertiesConfiguration config = new PropertiesConfiguration(propertyFileOverride); - System.out.println("File: " + propertyFileOverride + "; old: db.properties port: " + + System.out.println("File: " + propertyFileOverride + "; old: db.properties port: " + config.getProperty("db.cloud.port") + ", new port: " + port); config.setProperty("db.cloud.port", "" + port); config.setProperty("db.cloud.username", System.getProperty("user.name")); @@ -107,7 +107,7 @@ public class TestDbSetup { config.save(); } - + public static void initCloudstackDb() throws Exception { try { File dir = new File("../../../"); @@ -136,16 +136,16 @@ public class TestDbSetup { public static int init(String startScript) throws Exception { int port = TestDbSetup.findFreePort(); TestDbSetup.startMysqlServer(port, startScript); - copyDbPropertiesFile(); + copyDbPropertiesFile(); /* both of these files needs to have mysql port, username password details */ TestDbSetup.updateSqlPort(port, "db.properties"); /* for cloudstack runtime */ TestDbSetup.updateSqlPort(port, "../../../utils/conf/db.properties.override"); /* for deploying db */ TestDbSetup.initCloudstackDb(); return port; - } + } public static void destroy(int port, String stopScript) throws Exception { TestDbSetup.stopMysqlServer(port, stopScript); - } + } } diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java index e8066fb8163..0b58c2e4a25 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java index 580927d1529..d78cc67437c 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java index dbc05d317ed..1cf24b9461b 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java index 28033aab550..8c278fb9a72 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java index 5989dccafda..b7e7887858a 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java index c665e68959a..e67d72142dc 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java index 97661629b2d..d07e7a59a82 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java index 488cbfa6cdb..1f9f3866352 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java index 0543ddcf601..34a333c4207 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXFirewallElementService.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; @@ -38,14 +38,14 @@ public interface JuniperSRXFirewallElementService extends PluggableService { /** * adds a SRX firewall device in to a physical network - * @param AddSrxFirewallCmd + * @param AddSrxFirewallCmd * @return ExternalFirewallDeviceVO object for the firewall added */ public ExternalFirewallDeviceVO addSrxFirewall(AddSrxFirewallCmd cmd); /** * removes SRX firewall device from a physical network - * @param DeleteSrxFirewallCmd + * @param DeleteSrxFirewallCmd * @return true if firewall device successfully deleted */ public boolean deleteSrxFirewall(DeleteSrxFirewallCmd cmd); diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java index a0bb46d1572..259abad3bfd 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -564,7 +564,7 @@ public class JuniperSrxResource implements ServerResource { } /* - * The usage data will be handled on it's own socket, so usage + * The usage data will be handled on it's own socket, so usage * commands will use the following methods... */ private boolean usageLogin() throws ExecutionException { @@ -702,7 +702,7 @@ public class JuniperSrxResource implements ServerResource { // Remove the guest network: // Remove source, static, and destination NAT rules - // Remove VPN + // Remove VPN shutdownGuestNetwork(type, ip.getAccountId(), publicVlanTag, sourceNatIpAddress, guestVlanTag, guestVlanGateway, guestVlanSubnet, cidrSize); if (ip.isAdd()) { @@ -1076,7 +1076,7 @@ public class JuniperSrxResource implements ServerResource { manageSecurityPolicy(SecurityPolicyType.VPN, SrxCommand.DELETE, accountId, null, null, null, null, securityPolicyName, false); } - // Delete all address book entries + // Delete all address book entries for (String addressBookEntryName : getVpnObjectNames(SrxXml.ADDRESS_BOOK_ENTRY_GETALL, accountId)) { manageAddressBookEntry(SrxCommand.DELETE, _privateZone, null, addressBookEntryName); } @@ -3209,7 +3209,7 @@ public class JuniperSrxResource implements ServerResource { } /* - * Usage + * Usage */ private ExternalNetworkResourceUsageAnswer getUsageAnswer(ExternalNetworkResourceUsageCommand cmd) throws ExecutionException { diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java b/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java index b6f7601535f..8cc45fc8daf 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/NetScalerPodVO.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network; @@ -27,8 +27,8 @@ import javax.persistence.Table; /** * NetScalerPodVO contains information about a EIP deployment where on datacenter L3 router a PBR (policy - * based routing) is setup between a POD's subnet IP range to a NetScaler device. This VO object - * represents a mapping between a POD and NetScaler device where PBR is setup. + * based routing) is setup between a POD's subnet IP range to a NetScaler device. This VO object + * represents a mapping between a POD and NetScaler device where PBR is setup. * */ @Entity diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDao.java b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDao.java index 4a82cffdac6..5b412ebbebc 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDao.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDao.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.dao; diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java index 19eefc7743d..155db7b4a8a 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.dao; diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 18ebc30ae5f..6e2cc7318e6 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; @@ -809,7 +809,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl } else { if (rules != null) { for (StaticNat rule : rules) { - // validate if EIP rule can be configured. + // validate if EIP rule can be configured. ExternalLoadBalancerDeviceVO lbDevice = getNetScalerForEIP(rule); if (lbDevice == null) { String errMsg = "There is no NetScaler device configured to perform EIP to guest IP address: " + rule.getDestIpAddress(); diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java index 03b7a262d19..378671d22b0 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerLoadBalancerElementService.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; @@ -31,14 +31,14 @@ public interface NetscalerLoadBalancerElementService extends PluggableService { /** * adds a Netscaler load balancer device in to a physical network - * @param AddNetscalerLoadBalancerCmd + * @param AddNetscalerLoadBalancerCmd * @return ExternalLoadBalancerDeviceVO object for the device added */ public ExternalLoadBalancerDeviceVO addNetscalerLoadBalancer(AddNetscalerLoadBalancerCmd cmd); /** * removes a Netscaler load balancer device from a physical network - * @param DeleteNetscalerLoadBalancerCmd + * @param DeleteNetscalerLoadBalancerCmd * @return true if Netscaler device is deleted successfully */ public boolean deleteNetscalerLoadBalancer(DeleteNetscalerLoadBalancerCmd cmd); diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java index 7a030a7b7d4..b9b07aea6ed 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java @@ -199,7 +199,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage } // Try to fetch GRE endpoint IP address for cloud db - // If not found, then find it on the hypervisor + // If not found, then find it on the hypervisor OvsTunnelInterfaceVO tunnelIface = _tunnelInterfaceDao.getByHostAndLabel(host.getId(), physNetLabel); if (tunnelIface == null) { //Now find and fetch configuration for physical interface @@ -278,7 +278,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage } ta = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(), hostId, nw.getId()); - // Try and create the tunnel even if a previous attempt failed + // Try and create the tunnel even if a previous attempt failed if (ta == null || ta.getState().equals("FAILED")) { s_logger.debug("Attempting to create tunnel from:" + rh.longValue() + " to:" + hostId); if (ta == null) { @@ -404,7 +404,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage return; } try { - /* Now we are last one on host, destroy the bridge with all + /* Now we are last one on host, destroy the bridge with all * the tunnels for this network */ int key = getGreKey(nw); Command cmd = new OvsDestroyBridgeCommand(nw.getId(), key); diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java index 948544f0dca..e2784437db5 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.api.commands; diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java index 3eb802ed8f6..088e6830f4e 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; @@ -89,8 +89,8 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkElement.class, FirewallServiceProvider.class, - PortForwardingServiceProvider.class, IpDeployer.class, +@Local(value = {NetworkElement.class, FirewallServiceProvider.class, + PortForwardingServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class}) public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider, PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, StaticNatServiceProvider { diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java index d2842ab101d..ecd32f928a4 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoFirewallElementService.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.element; @@ -38,14 +38,14 @@ public interface PaloAltoFirewallElementService extends PluggableService { /** * adds a Palo Alto firewall device in to a physical network - * @param AddPaloAltoFirewallCmd + * @param AddPaloAltoFirewallCmd * @return ExternalFirewallDeviceVO object for the firewall added */ public ExternalFirewallDeviceVO addPaloAltoFirewall(AddPaloAltoFirewallCmd cmd); /** * removes Palo Alto firewall device from a physical network - * @param DeletePaloAltoFirewallCmd + * @param DeletePaloAltoFirewallCmd * @return true if firewall device successfully deleted */ public boolean deletePaloAltoFirewall(DeletePaloAltoFirewallCmd cmd); @@ -79,10 +79,10 @@ public interface PaloAltoFirewallElementService extends PluggableService { @Deprecated // API helper function supported for backward compatibility public boolean deleteExternalFirewall(DeleteExternalFirewallCmd cmd); - + @Deprecated // API helper function supported for backward compatibility public List listExternalFirewalls(ListExternalFirewallsCmd cmd); - + @Deprecated // API helper function supported for backward compatibility public ExternalFirewallResponse createExternalFirewallResponse(Host externalFirewall); } diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java index 2251ce06851..e95ef91e2c6 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/resource/PaloAltoResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -208,7 +208,7 @@ public class PaloAltoResource implements ServerResource { _password = (String) params.get("password"); if (_password == null) { throw new ConfigurationException("Unable to find password"); - } + } _publicInterface = (String) params.get("publicinterface"); if (_publicInterface == null) { @@ -311,7 +311,7 @@ public class PaloAltoResource implements ServerResource { } - public StartupCommand[] initialize() { + public StartupCommand[] initialize() { StartupExternalFirewallCommand cmd = new StartupExternalFirewallCommand(); cmd.setName(_name); cmd.setDataCenter(_zoneId); @@ -391,7 +391,7 @@ public class PaloAltoResource implements ServerResource { String keygenBody; try { - keygenBody = request(PaloAltoMethod.GET, params); + keygenBody = request(PaloAltoMethod.GET, params); } catch (ExecutionException e) { return false; } @@ -411,7 +411,7 @@ public class PaloAltoResource implements ServerResource { // ENTRY POINTS... - + private Answer execute(ReadyCommand cmd) { return new ReadyAnswer(cmd); @@ -435,7 +435,7 @@ public class PaloAltoResource implements ServerResource { return execute(cmd, _numRetries); } - private Answer execute(IpAssocCommand cmd, int numRetries) { + private Answer execute(IpAssocCommand cmd, int numRetries) { String[] results = new String[cmd.getIpAddresses().length]; int i = 0; try { @@ -444,9 +444,9 @@ public class PaloAltoResource implements ServerResource { throw new ExecutionException("Received an invalid number of guest IPs to associate."); } else { ip = cmd.getIpAddresses()[0]; - } + } - String sourceNatIpAddress = null; + String sourceNatIpAddress = null; GuestNetworkType type = GuestNetworkType.INTERFACE_NAT; if (ip.isSourceNat()) { @@ -463,8 +463,8 @@ public class PaloAltoResource implements ServerResource { String guestVlanGateway = cmd.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY); String cidr = cmd.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR); long cidrSize = NetUtils.cidrToLong(cidr)[1]; - String guestVlanSubnet = NetUtils.getCidrSubNet(guestVlanGateway, cidrSize); - + String guestVlanSubnet = NetUtils.getCidrSubNet(guestVlanGateway, cidrSize); + Long publicVlanTag = null; if (ip.getBroadcastUri() != null && !ip.getBroadcastUri().equals("untagged")) { try { @@ -472,11 +472,11 @@ public class PaloAltoResource implements ServerResource { } catch (Exception e) { throw new ExecutionException("Could not parse public VLAN tag: " + ip.getBroadcastUri()); } - } + } ArrayList commandList = new ArrayList(); - if (ip.isAdd()) { + if (ip.isAdd()) { // Implement the guest network for this VLAN implementGuestNetwork(commandList, type, publicVlanTag, sourceNatIpAddress, guestVlanTag, guestVlanGateway, guestVlanSubnet, cidrSize); } else { @@ -518,23 +518,23 @@ public class PaloAltoResource implements ServerResource { s_logger.debug(msg); } - private void shutdownGuestNetwork(ArrayList cmdList, GuestNetworkType type, Long publicVlanTag, String sourceNatIpAddress, long privateVlanTag, String privateGateway, String privateSubnet, long privateCidrSize) throws ExecutionException { + private void shutdownGuestNetwork(ArrayList cmdList, GuestNetworkType type, Long publicVlanTag, String sourceNatIpAddress, long privateVlanTag, String privateGateway, String privateSubnet, long privateCidrSize) throws ExecutionException { privateSubnet = privateSubnet+"/"+privateCidrSize; if (type.equals(GuestNetworkType.SOURCE_NAT)) { manageNetworkIsolation(cmdList, PaloAltoPrimative.DELETE, privateVlanTag, privateSubnet, privateGateway); manageSrcNatRule(cmdList, PaloAltoPrimative.DELETE, type, publicVlanTag, sourceNatIpAddress+"/32", privateVlanTag, privateGateway+"/"+privateCidrSize); - managePublicInterface(cmdList, PaloAltoPrimative.DELETE, publicVlanTag, sourceNatIpAddress+"/32", privateVlanTag); + managePublicInterface(cmdList, PaloAltoPrimative.DELETE, publicVlanTag, sourceNatIpAddress+"/32", privateVlanTag); } - managePrivateInterface(cmdList, PaloAltoPrimative.DELETE, privateVlanTag, privateGateway+"/"+privateCidrSize); + managePrivateInterface(cmdList, PaloAltoPrimative.DELETE, privateVlanTag, privateGateway+"/"+privateCidrSize); String msg = "Shut down guest network with type " + type +". Guest VLAN tag: " + privateVlanTag + ", guest gateway: " + privateGateway+"/"+privateCidrSize; msg += type.equals(GuestNetworkType.SOURCE_NAT) ? ", source NAT IP: " + sourceNatIpAddress : ""; s_logger.debug(msg); } - + /* * Firewall rule entry point @@ -543,7 +543,7 @@ public class PaloAltoResource implements ServerResource { refreshPaloAltoConnection(); return execute(cmd, _numRetries); } - + private Answer execute(SetFirewallRulesCommand cmd, int numRetries) { FirewallRuleTO[] rules = cmd.getRules(); try { @@ -558,7 +558,7 @@ public class PaloAltoResource implements ServerResource { } boolean status = requestWithCommit(commandList); - + return new Answer(cmd); } catch (ExecutionException e) { s_logger.error(e); @@ -581,9 +581,9 @@ public class PaloAltoResource implements ServerResource { private synchronized Answer execute(SetStaticNatRulesCommand cmd) { refreshPaloAltoConnection(); return execute(cmd, _numRetries); - } + } - private Answer execute(SetStaticNatRulesCommand cmd, int numRetries) { + private Answer execute(SetStaticNatRulesCommand cmd, int numRetries) { StaticNatRuleTO[] rules = cmd.getRules(); try { @@ -622,7 +622,7 @@ public class PaloAltoResource implements ServerResource { return execute(cmd, _numRetries); } - private Answer execute(SetPortForwardingRulesCommand cmd, int numRetries) { + private Answer execute(SetPortForwardingRulesCommand cmd, int numRetries) { PortForwardingRuleTO[] rules = cmd.getRules(); try { @@ -636,12 +636,12 @@ public class PaloAltoResource implements ServerResource { } } - boolean status = requestWithCommit(commandList); + boolean status = requestWithCommit(commandList); return new Answer(cmd); } catch (ExecutionException e) { s_logger.error(e); - + if (numRetries > 0 && refreshPaloAltoConnection()) { int numRetriesRemaining = numRetries - 1; s_logger.debug("Retrying SetPortForwardingRulesCommand. Number of retries remaining: " + numRetriesRemaining); @@ -887,7 +887,7 @@ public class PaloAltoResource implements ServerResource { return true; } - String xml = ""; + String xml = ""; xml += ""+_privateZone+""; xml += ""+_publicZone+""; xml += ""+privateGateway+""; @@ -1000,7 +1000,7 @@ public class PaloAltoResource implements ServerResource { cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); // add the destination nat rule for the public IP - String xml = ""; + String xml = ""; xml += ""+_publicZone+""; xml += ""+_publicZone+""; xml += "any"; @@ -1117,7 +1117,7 @@ public class PaloAltoResource implements ServerResource { cmdList.add(new DefaultPaloAltoCommand(PaloAltoMethod.GET, a_sub_params)); // add the static nat rule for the public IP - String xml = ""; + String xml = ""; xml += ""+_publicZone+""; xml += ""+_publicZone+""; xml += "any"; @@ -1164,7 +1164,7 @@ public class PaloAltoResource implements ServerResource { } } - + /* * Firewall rule implementation */ @@ -1249,7 +1249,7 @@ public class PaloAltoResource implements ServerResource { if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { srcCidrXML += ""+getPrivateSubnet(rule.getSrcVlanTag())+""; } else { - srcCidrXML += "any"; + srcCidrXML += "any"; } } else { srcCidrXML += ""+ruleSrcCidrList.get(i).trim()+""; @@ -1259,7 +1259,7 @@ public class PaloAltoResource implements ServerResource { if (rule.getTrafficType() == FirewallRule.TrafficType.Egress) { srcCidrXML = ""+getPrivateSubnet(rule.getSrcVlanTag())+""; } else { - srcCidrXML = "any"; + srcCidrXML = "any"; } } @@ -1311,7 +1311,7 @@ public class PaloAltoResource implements ServerResource { /* - * Usage + * Usage */ @@ -1449,7 +1449,7 @@ public class PaloAltoResource implements ServerResource { public boolean manageService(ArrayList cmdList, PaloAltoPrimative prim, String protocol, String dstPorts, String srcPorts) throws ExecutionException { String serviceName = genServiceName(protocol, dstPorts, srcPorts); - + switch (prim) { case CHECK_IF_EXISTS: @@ -1523,7 +1523,7 @@ public class PaloAltoResource implements ServerResource { } if (response_body.getLength() > 0) { return response_body.item(0).getAttributes().getNamedItem("name").getTextContent(); - } + } } return null; } @@ -1565,7 +1565,7 @@ public class PaloAltoResource implements ServerResource { } catch (UnsupportedEncodingException e) { debug_msg = debug_msg + "GET request: https://" + _ip + _apiUri + queryString + "\n"; } - + HttpGet get_request = new HttpGet("https://" + _ip + _apiUri + queryString); ResponseHandler responseHandler = new BasicResponseHandler(); @@ -1608,10 +1608,10 @@ public class PaloAltoResource implements ServerResource { debug_msg = debug_msg + prettyFormat(responseBody); debug_msg = debug_msg + "\n" + responseBody.replace("\"", "\\\"") + "\n\n"; // test cases //s_logger.debug(debug_msg); // this can be commented if we don't want to show each request in the log. - + return responseBody; } - + /* Used for requests that require polling to get a result (eg: commit) */ private String requestWithPolling(PaloAltoMethod method, Map params) throws ExecutionException { String job_id; @@ -1688,7 +1688,7 @@ public class PaloAltoResource implements ServerResource { Map check_params = new HashMap(); check_params.put("type", "op"); check_params.put("cmd", ""); - String check_response = request(PaloAltoMethod.GET, check_params); + String check_response = request(PaloAltoMethod.GET, check_params); Document check_doc = getDocument(check_response); XPath check_xpath = XPathFactory.newInstance().newXPath(); try { @@ -1705,7 +1705,7 @@ public class PaloAltoResource implements ServerResource { Map add_lock_params = new HashMap(); add_lock_params.put("type", "op"); add_lock_params.put("cmd", ""); - String add_lock_response = request(PaloAltoMethod.GET, add_lock_params); + String add_lock_response = request(PaloAltoMethod.GET, add_lock_params); Document add_lock_doc = getDocument(add_lock_response); XPath add_lock_xpath = XPathFactory.newInstance().newXPath(); try { @@ -1744,7 +1744,7 @@ public class PaloAltoResource implements ServerResource { Map remove_lock_params = new HashMap(); remove_lock_params.put("type", "op"); remove_lock_params.put("cmd", ""); - String remove_lock_response = request(PaloAltoMethod.GET, remove_lock_params); + String remove_lock_response = request(PaloAltoMethod.GET, remove_lock_params); Document remove_lock_doc = getDocument(remove_lock_response); XPath remove_lock_xpath = XPathFactory.newInstance().newXPath(); try { @@ -1757,7 +1757,7 @@ public class PaloAltoResource implements ServerResource { throw new ExecutionException("Could not release the Palo Alto device. Please notify an administrator!"); } } - + } catch (ExecutionException ex) { // REVERT TO RUNNING String revert_job_id; @@ -1771,7 +1771,7 @@ public class PaloAltoResource implements ServerResource { Map remove_lock_params = new HashMap(); remove_lock_params.put("type", "op"); remove_lock_params.put("cmd", ""); - String remove_lock_response = request(PaloAltoMethod.GET, remove_lock_params); + String remove_lock_response = request(PaloAltoMethod.GET, remove_lock_params); Document remove_lock_doc = getDocument(remove_lock_response); XPath remove_lock_xpath = XPathFactory.newInstance().newXPath(); try { @@ -1853,8 +1853,8 @@ public class PaloAltoResource implements ServerResource { throw new ExecutionException(e.getCause().getMessage()); } - if (response_body.getLength() > 0 && - (!response_body.item(0).getTextContent().equals("") || + if (response_body.getLength() > 0 && + (!response_body.item(0).getTextContent().equals("") || (response_body.item(0).hasChildNodes() && response_body.item(0).getFirstChild().hasChildNodes()))) { return true; } else { @@ -1907,7 +1907,7 @@ public class PaloAltoResource implements ServerResource { private abstract class AbstractPaloAltoCommand implements IPaloAltoCommand { PaloAltoMethod method; Map params; - + public AbstractPaloAltoCommand() {} public AbstractPaloAltoCommand(PaloAltoMethod method, Map params) { @@ -1931,8 +1931,8 @@ public class PaloAltoResource implements ServerResource { /* * Misc - */ - + */ + private String genIpIdentifier(String ip) { return ip.replace('.', '-').replace('/', '-'); } @@ -1944,13 +1944,13 @@ public class PaloAltoResource implements ServerResource { return Protocol.valueOf(protocolName); } catch (Exception e) { throw new ExecutionException("Invalid protocol: " + protocolName); - } + } } private Document getDocument(String xml) throws ExecutionException { StringReader xmlReader = new StringReader(xml); InputSource xmlSource = new InputSource(xmlReader); - Document doc = null; + Document doc = null; try { doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(xmlSource); @@ -1974,7 +1974,7 @@ public class PaloAltoResource implements ServerResource { StreamResult xmlOutput = new StreamResult(stringWriter); TransformerFactory transformerFactory = TransformerFactory.newInstance(); transformerFactory.setAttribute("indent-number", indent); - Transformer transformer = transformerFactory.newTransformer(); + Transformer transformer = transformerFactory.newTransformer(); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.transform(xmlInput, xmlOutput); @@ -2000,13 +2000,13 @@ public class PaloAltoResource implements ServerResource { //@Override public void setName(String name) { // TODO Auto-generated method stub - + } //@Override public void setConfigParams(Map params) { // TODO Auto-generated method stub - + } //@Override @@ -2024,7 +2024,7 @@ public class PaloAltoResource implements ServerResource { //@Override public void setRunLevel(int level) { // TODO Auto-generated method stub - - } - + + } + } diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java b/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java index 7dfec92cbe6..79c7884ea21 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.utils; @@ -35,36 +35,36 @@ import org.apache.http.impl.client.DefaultHttpClient; import java.io.*; public class HttpClientWrapper { - + public static HttpClient wrapClient(HttpClient base) { try { SSLContext ctx = SSLContext.getInstance("TLS"); X509TrustManager tm = new X509TrustManager() { - + public void checkClientTrusted(X509Certificate[] xcs, String string) throws CertificateException { } - + public void checkServerTrusted(X509Certificate[] xcs, String string) throws CertificateException { } - + public X509Certificate[] getAcceptedIssuers() { return null; } }; X509HostnameVerifier verifier = new X509HostnameVerifier() { - + @Override public void verify(String string, SSLSocket ssls) throws IOException { } - + @Override public void verify(String string, X509Certificate xc) throws SSLException { } - + @Override public void verify(String string, String[] strings, String[] strings1) throws SSLException { } - + @Override public boolean verify(String string, SSLSession ssls) { return true; diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java index 350a4d2a356..312601cc835 100755 --- a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java +++ b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/MockablePaloAltoResource.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -113,7 +113,7 @@ public class MockablePaloAltoResource extends PaloAltoResource { if (params.containsKey("type") && params.get("type").equals("keygen")) { response = "LUFRPT14MW5xOEo1R09KVlBZNnpnemh0VHRBOWl6TGM9bXcwM3JHUGVhRlNiY0dCR0srNERUQT09"; } - + // 'config' requests if (params.containsKey("type") && params.get("type").equals("config") && params.containsKey("action")) { // action = 'get' @@ -419,7 +419,7 @@ public class MockablePaloAltoResource extends PaloAltoResource { if (params.get("cmd").equals("1")) { if (context.containsKey("simulate_commit_failure") && context.get("simulate_commit_failure").equals("true")) { response = "2013/07/10 11:11:491adminCommitFINnoFAIL11:11:5411:11:54
Bad configCommit failed
"; - } else { + } else { response = "2013/07/02 14:49:491adminCommitFINnoOK14:50:0214:50:02
Configuration committed successfully
"; } } diff --git a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java index d8bc52b394f..6eb07bf6093 100755 --- a/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java +++ b/plugins/network-elements/palo-alto/test/com/cloud/network/resource/PaloAltoResourceTest.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.network.resource; @@ -121,7 +121,7 @@ public class PaloAltoResourceTest { MockablePaloAltoResource _resource; Map _resource_params; HashMap _context; - + @Before public void setUp() { _resource = new MockablePaloAltoResource(); @@ -161,8 +161,8 @@ public class PaloAltoResourceTest { public void resourceConfigureFailure() throws ConfigurationException { _resource.configure("PaloAltoResource", new HashMap()); } - - @Test + + @Test public void resourceConfigureWithoutManagementProfile() throws ConfigurationException { if (_context.containsKey("enable_console_output") && _context.get("enable_console_output").equals("true")) { System.out.println("\nTEST: resourceConfigureWithoutManagementProfile"); @@ -173,7 +173,7 @@ public class PaloAltoResourceTest { _resource.configure("PaloAltoResource", _resource_params); } - @Test + @Test public void resourceConfigureWithManagementProfile() throws ConfigurationException { if (_context.containsKey("enable_console_output") && _context.get("enable_console_output").equals("true")) { System.out.println("\nTEST: resourceConfigureWithManagementProfile"); @@ -345,7 +345,7 @@ public class PaloAltoResourceTest { List rules = new ArrayList(); List cidrList = new ArrayList(); cidrList.add("0.0.0.0/0"); - FirewallRuleVO activeVO = new FirewallRuleVO(null, null, 80, 80, "tcp", + FirewallRuleVO activeVO = new FirewallRuleVO(null, null, 80, 80, "tcp", 1, 1, 1, Purpose.Firewall, cidrList, null, null, null, FirewallRule.TrafficType.Egress); FirewallRuleTO active = new FirewallRuleTO(activeVO, Long.toString(vlanId), null, Purpose.Firewall, FirewallRule.TrafficType.Egress); @@ -376,7 +376,7 @@ public class PaloAltoResourceTest { long vlanId = 3954; List rules = new ArrayList(); - FirewallRuleVO revokedVO = new FirewallRuleVO(null, null, 80, 80, "tcp", + FirewallRuleVO revokedVO = new FirewallRuleVO(null, null, 80, 80, "tcp", 1, 1, 1, Purpose.Firewall, null, null, null, null, FirewallRule.TrafficType.Egress); revokedVO.setState(State.Revoke); FirewallRuleTO revoked = new FirewallRuleTO(revokedVO, Long.toString(vlanId), null, Purpose.Firewall, FirewallRule.TrafficType.Egress); diff --git a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java b/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java index 3c996f7bc3b..1d760042d8e 100644 --- a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java +++ b/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java @@ -95,7 +95,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver * { result = new CreateCmdResult(volAnswer.getPath(), volAnswer); } * else { result = new CreateCmdResult("", null); * result.setResult(volAnswer.getDetails()); } - * + * * context.getParentCallback().complete(result); */ return null; @@ -105,7 +105,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver public void deleteAsync(DataStore dataStore, DataObject vo, AsyncCompletionCallback callback) { /* * DeleteCommand cmd = new DeleteCommand(vo.getUri()); - * + * * EndPoint ep = selector.select(vo); AsyncRpcContext * context = new AsyncRpcContext(callback); * AsyncCallbackDispatcher @@ -128,14 +128,14 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver /* * private class CreateVolumeFromBaseImageContext extends * AsyncRpcContext { private final VolumeObject volume; - * + * * public CreateVolumeFromBaseImageContext(AsyncCompletionCallback * callback, VolumeObject volume) { super(callback); this.volume = volume; } - * + * * public VolumeObject getVolume() { return this.volume; } - * + * * } - * + * * @Override public void createVolumeFromBaseImageAsync(VolumeObject volume, * TemplateInfo template, AsyncCompletionCallback callback) { * VolumeTO vol = this.dataStore.getVolumeTO(volume); List @@ -144,14 +144,14 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver * template.getDataStore().grantAccess(template, ep); * CreateVolumeFromBaseImageCommand cmd = new * CreateVolumeFromBaseImageCommand(vol, templateUri); - * + * * CreateVolumeFromBaseImageContext context = new * CreateVolumeFromBaseImageContext(callback, volume); * AsyncCallbackDispatcher caller * = AsyncCallbackDispatcher.create(this); caller.setContext(context) * .setCallback * (caller.getTarget().createVolumeFromBaseImageAsyncCallback(null, null)); - * + * * ep.sendMessageAsync(cmd, caller); } */ /* diff --git a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java index 79215618914..a1d683d5c3a 100644 --- a/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java +++ b/plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java @@ -45,7 +45,7 @@ public class ChildTestConfiguration extends TestConfiguration { /* * @Override - * + * * @Bean public PrimaryDataStoreDao primaryDataStoreDao() { return * Mockito.mock(PrimaryDataStoreDaoImpl.class); } */ diff --git a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java index 613a9b17016..8dbe0bb3ac5 100644 --- a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java +++ b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java @@ -30,9 +30,9 @@ import com.cloud.user.dao.UserAccountDao; import com.cloud.utils.exception.CloudRuntimeException; /** - * Simple UserAuthenticator that performs a MD5 hash of the password before + * Simple UserAuthenticator that performs a MD5 hash of the password before * comparing it against the local database. - * + * */ @Local(value = {UserAuthenticator.class}) public class MD5UserAuthenticator extends DefaultUserAuthenticator { diff --git a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java index c9ee372a149..098d0703853 100644 --- a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java +++ b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java @@ -61,7 +61,7 @@ public class AffinityGroupAccessChecker extends DomainChecker { return true; } } else { - //acl_type account + //acl_type account if (caller.getId() != group.getAccountId()) { throw new PermissionDeniedException(caller + " does not have permission to operate with resource " + entity); } else { diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java index 93b7908e824..0ebc10c6f2d 100755 --- a/server/src/com/cloud/api/ApiServlet.java +++ b/server/src/com/cloud/api/ApiServlet.java @@ -311,7 +311,7 @@ public class ApiServlet extends HttpServlet { * params.put(BaseCmd.Properties.ACCOUNT_OBJ.getName(), new Object[] { accountObj }); } else { * params.put(BaseCmd.Properties.USER_ID.getName(), new String[] { userId }); * params.put(BaseCmd.Properties.ACCOUNT_OBJ.getName(), new Object[] { accountObj }); } } - * + * * // update user context info here so that we can take information if the request is authenticated // via api * key mechanism updateUserContext(params, session != null ? session.getId() : null); */ @@ -359,9 +359,9 @@ public class ApiServlet extends HttpServlet { * private void updateUserContext(Map requestParameters, String sessionId) { String userIdStr = * (String)(requestParameters.get(BaseCmd.Properties.USER_ID.getName())[0]); Account accountObj = * (Account)(requestParameters.get(BaseCmd.Properties.ACCOUNT_OBJ.getName())[0]); - * + * * Long userId = null; Long accountId = null; if(userIdStr != null) userId = Long.parseLong(userIdStr); - * + * * if(accountObj != null) accountId = accountObj.getId(); UserContext.updateContext(userId, accountId, sessionId); } */ diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 80242011710..dda6d3ae7a4 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -939,7 +939,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati /* * Commenting out due to Bug 11593 - CIDR conflicts with zone when * extending pod but not when creating it - * + * * checkCidrVlanOverlap(zoneId, cidr); */ } diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java index f9b6f854e3b..5de74901955 100755 --- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java @@ -5,7 +5,7 @@ // 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, diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java index cdaba75c0ed..526eec74ff5 100644 --- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -930,7 +930,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy } // Cluster can be put in avoid set in following scenarios: - // 1. If storage allocators haven't put any pools in avoid set means either no pools in cluster + // 1. If storage allocators haven't put any pools in avoid set means either no pools in cluster // or pools not suitable for the allocators to handle or there is no // linkage of any suitable host to any of the pools in cluster // 2. If all 'shared' or 'local' pools are in avoid set diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index 4cc0fe5082a..2e686fa2f05 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -79,7 +79,7 @@ import com.cloud.vm.dao.VMInstanceDao; * HighAvailabilityManagerImpl coordinates the HA process. VMs are registered with the HA Manager for HA. The request is stored * within a database backed work queue. HAManager has a number of workers that pick up these work items to perform HA on the * VMs. - * + * * The HA process goes as follows: 1. Check with the list of Investigators to determine that the VM is no longer running. If a * Investigator finds the VM is still alive, the HA process is stopped and the state of the VM reverts back to its previous * state. If a Investigator finds the VM is dead, then HA process is started on the VM, skipping step 2. 2. If the list of @@ -88,7 +88,7 @@ import com.cloud.vm.dao.VMInstanceDao; * process of starting VMs. Note that once the VM is marked as stopped, the user may have started the VM himself. 5. VMs that * have re-started more than the configured number of times are marked as in Error state and the user is not allowed to restart * the VM. - * + * * @config {@table || Param Name | Description | Values | Default || || workers | number of worker threads to spin off to do the * processing | int | 1 || || time.to.sleep | Time to sleep if no work items are found | seconds | 60 || || max.retries * | number of times to retry start | int | 5 || || time.between.failure | Time elapsed between failures before we diff --git a/server/src/com/cloud/ha/dao/HighAvailabilityDao.java b/server/src/com/cloud/ha/dao/HighAvailabilityDao.java index 5f72bb87b21..7f532f2ae1e 100644 --- a/server/src/com/cloud/ha/dao/HighAvailabilityDao.java +++ b/server/src/com/cloud/ha/dao/HighAvailabilityDao.java @@ -26,7 +26,7 @@ public interface HighAvailabilityDao extends GenericDao { /** * Takes an available HA work item. - * + * * @param serverId server that is taking this. * @return WorkVO if there's one to work on; null if none. */ @@ -34,7 +34,7 @@ public interface HighAvailabilityDao extends GenericDao { /** * Finds all the work items related to this instance. - * + * * @param instanceId * @return list of WorkVO or empty list. */ @@ -44,7 +44,7 @@ public interface HighAvailabilityDao extends GenericDao { /** * Finds all the work items that were successful and is now ready to be purged. - * + * * @param time that the work item must be successful before. * @return list of WorkVO or empty list. */ @@ -56,7 +56,7 @@ public interface HighAvailabilityDao extends GenericDao { /** * finds out if a work item has been scheduled for this work type but has not been taken yet. - * + * * @param instanceId vm instance id * @param type type of work scheduled for it. * @return true if it has been scheduled and false if it hasn't. @@ -67,7 +67,7 @@ public interface HighAvailabilityDao extends GenericDao { /** * Look for HA work that has been scheduled for a vm since a certain work id. - * + * * @param vmId virtual machine id. * @param workId work item id. * @return List of work items. @@ -76,7 +76,7 @@ public interface HighAvailabilityDao extends GenericDao { /** * Look for HA work that is being run right now for a VM. - * + * * @param vmId virtual machine id * @return List of work items */ diff --git a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java index c6fffd268fa..54eb41fb705 100755 --- a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java +++ b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java @@ -342,7 +342,7 @@ public class CloudZonesStartupProcessor extends AdapterBase implements StartupCo private void updatePodNetmaskIfNeeded(HostPodVO pod, String agentNetmask) { // If the server's private netmask is less inclusive than the pod's CIDR - // netmask, update cidrSize of the default POD + // netmask, update cidrSize of the default POD //(reason: we are maintaining pods only for internal accounting.) long cidrSize = pod.getCidrSize(); String cidrNetmask = NetUtils.getCidrSubNet("255.255.255.255", cidrSize); diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManager.java b/server/src/com/cloud/network/ExternalFirewallDeviceManager.java index 2768f57f23b..c225932d43e 100644 --- a/server/src/com/cloud/network/ExternalFirewallDeviceManager.java +++ b/server/src/com/cloud/network/ExternalFirewallDeviceManager.java @@ -28,7 +28,7 @@ import com.cloud.resource.ServerResource; import com.cloud.utils.component.Manager; /* ExternalFirewallDeviceManager provides a abstract implementation for managing a external firewall in devices agnostic manner. - * Device specific managers for external firewall (like SRX) should be implemented as pluggable service extending + * Device specific managers for external firewall (like SRX) should be implemented as pluggable service extending * ExternalFirewallDeviceManager implementation. An implementation of device specific manager can override default behaviour when needed. */ @@ -41,7 +41,7 @@ public interface ExternalFirewallDeviceManager extends Manager { * @param username username * @param password password * @param deviceName device name - * @param server resource that will handle the commands specific to this device + * @param server resource that will handle the commands specific to this device * @return Host object for the device added */ public ExternalFirewallDeviceVO addExternalFirewall(long physicalNetworkId, String url, String username, String password, String deviceName, ServerResource resource); @@ -54,7 +54,7 @@ public interface ExternalFirewallDeviceManager extends Manager { public boolean deleteExternalFirewall(Long hostId); /** - * list external firewall devices of given device name type added in to a physical network + * list external firewall devices of given device name type added in to a physical network * @param physicalNetworkId * @param deviceName * @return list of host objects for the external load balancers added in to the physical network @@ -64,7 +64,7 @@ public interface ExternalFirewallDeviceManager extends Manager { /** * finds a suitable firewall device which can be used by this network * @param network guest network - * @param dedicatedLb true if a dedicated load balancer is needed for this guest network + * @param dedicatedLb true if a dedicated load balancer is needed for this guest network * @return ExternalLoadBalancerDeviceVO corresponding to the suitable device * @throws InsufficientCapacityException */ @@ -73,7 +73,7 @@ public interface ExternalFirewallDeviceManager extends Manager { /** * returns the firewall device allocated for the guest network * @param network guest network id - * @return ExternalFirewallDeviceVO object corresponding the firewall device assigned for this guest network + * @return ExternalFirewallDeviceVO object corresponding the firewall device assigned for this guest network */ public ExternalFirewallDeviceVO getExternalFirewallForNetwork(Network network); diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java index 5d28eed09d7..c1b48d9eeb3 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManager.java @@ -28,7 +28,7 @@ import com.cloud.resource.ServerResource; import com.cloud.utils.component.Manager; /* ExternalLoadBalancerDeviceManager provides a abstract implementation for managing a external load balancer in device agnostic manner. - * Device specific managers for external load balancers (like F5 and Netscaler) should be implemented as pluggable service extending + * Device specific managers for external load balancers (like F5 and Netscaler) should be implemented as pluggable service extending * ExternalLoadBalancerDeviceManager implementation. An implementation of device specific manager can override default behaviour if needed. */ @@ -43,7 +43,7 @@ public interface ExternalLoadBalancerDeviceManager extends Manager { * @param username username * @param password password * @param deviceName device name - * @param server resource that will handle the commands specific to this device + * @param server resource that will handle the commands specific to this device * @return Host object for the device added */ public ExternalLoadBalancerDeviceVO addExternalLoadBalancer(long physicalNetworkId, String url, String username, String password, String deviceName, ServerResource resource, @@ -57,7 +57,7 @@ public interface ExternalLoadBalancerDeviceManager extends Manager { public boolean deleteExternalLoadBalancer(long hostId); /** - * list external load balancers of given device name type added in to a physical network + * list external load balancers of given device name type added in to a physical network * @param physicalNetworkId * @param deviceName * @return list of host objects for the external load balancers added in to the physical network @@ -67,7 +67,7 @@ public interface ExternalLoadBalancerDeviceManager extends Manager { /** * finds a suitable load balancer device which can be used by this network * @param network guest network - * @param dedicatedLb true if a dedicated load balancer is needed for this guest network + * @param dedicatedLb true if a dedicated load balancer is needed for this guest network * @return ExternalLoadBalancerDeviceVO corresponding to the suitable device * @throws InsufficientCapacityException */ @@ -76,7 +76,7 @@ public interface ExternalLoadBalancerDeviceManager extends Manager { /** * returns the load balancer device allocated for the guest network * @param network guest network id - * @return ExternalLoadBalancerDeviceVO object corresponding the load balancer device assigned for this guest network + * @return ExternalLoadBalancerDeviceVO object corresponding the load balancer device assigned for this guest network */ public ExternalLoadBalancerDeviceVO getExternalLoadBalancerForNetwork(Network network); diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index 2760d7bde32..f309fce2fde 100755 --- a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java @@ -121,7 +121,7 @@ public class ExternalNetworkDeviceManagerImpl extends ManagerBase implements Ext int _externalNetworkStatsInterval; // obsolete - // private final static IdentityService _identityService = (IdentityService)ComponentLocator.getLocator(ManagementServer.Name).getManager(IdentityService.class); + // private final static IdentityService _identityService = (IdentityService)ComponentLocator.getLocator(ManagementServer.Name).getManager(IdentityService.class); private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalNetworkDeviceManagerImpl.class); diff --git a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java index e21ac9cd6de..82c107ae3b1 100644 --- a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java +++ b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java @@ -98,7 +98,7 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa while (_ipv6Dao.findByNetworkIdAndIp(networkId, ip) != null) { ip = NetUtils.getNextIp6InRange(ip, vlan.getIp6Range()); count++; - // It's an arbitrate number to prevent the infinite loop + // It's an arbitrate number to prevent the infinite loop if (count > _ipv6RetryMax) { ip = null; break; diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index ea3b7e01c6e..69771e4d8bc 100755 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -217,7 +217,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { static HashMap s_providerToNetworkElementMap = new HashMap(); /** - * + * */ public NetworkModelImpl() { super(); diff --git a/server/src/com/cloud/network/PortProfileManagerImpl.java b/server/src/com/cloud/network/PortProfileManagerImpl.java index a7d64f06c38..b21c424cb2e 100644 --- a/server/src/com/cloud/network/PortProfileManagerImpl.java +++ b/server/src/com/cloud/network/PortProfileManagerImpl.java @@ -40,7 +40,7 @@ public class PortProfileManagerImpl { @DB public PortProfileVO addPortProfile(String portProfName, long vsmId, int vlanId, PortType pType, BindingType bType) { - // In this function, we create a port profile record in the port_profile table. + // In this function, we create a port profile record in the port_profile table. // First, check if a port profile with the given name already exists. If it does, throw an exception. if (_portProfileDao.findByName(portProfName) != null) { @@ -63,7 +63,7 @@ public class PortProfileManagerImpl { // In this function, we create a port profile record in the port_profile table. - // First, check if a port profile with the given name already exists. If it does, throw an exception. + // First, check if a port profile with the given name already exists. If it does, throw an exception. PortProfileVO portProfileObj; portProfileObj = _portProfileDao.findByName(portProfName); @@ -99,7 +99,7 @@ public class PortProfileManagerImpl { // TODO: Should we be putting any checks here before removing // the port profile record from the db? - // Remove the VSM entry in CiscoNexusVSMDeviceVO's table. + // Remove the VSM entry in CiscoNexusVSMDeviceVO's table. return _portProfileDao.remove(portProfileId); } } \ No newline at end of file diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index cfad95d3c3e..51f4002bc23 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -623,7 +623,7 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl return true; } boolean result = true; - // NOTE that we need to pass caller account to destroyRouter, otherwise it will fail permission check there. Context passed in from deleteNetwork is the network account, + // NOTE that we need to pass caller account to destroyRouter, otherwise it will fail permission check there. Context passed in from deleteNetwork is the network account, // not caller account Account callerAccount = _accountMgr.getAccount(context.getCaller().getAccountId()); for (DomainRouterVO router : routers) { diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java index ce02bde9d99..bc97ff65c10 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java @@ -78,7 +78,7 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA /** * save a vm password on the router. * @param routers TODO - * + * */ boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile profile, List routers) throws ResourceUnavailableException; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 8b85d1e7c39..7e0e129ba1d 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2190,7 +2190,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } // TODO : This is a hacking fix - // at VR startup time, information in VirtualMachineProfile may not updated to DB yet, + // at VR startup time, information in VirtualMachineProfile may not updated to DB yet, // getRouterControlIp() may give wrong IP under basic network mode in VMware environment NicProfile controlNic = getControlNic(profile); SetMonitorServiceCommand command = new SetMonitorServiceCommand(servicesTO); diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java index ad2dc233573..07addafc760 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java @@ -63,8 +63,8 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian * @param gateway * @param router TODO * @return - * @throws ResourceUnavailableException - * @throws ConcurrentOperationException + * @throws ResourceUnavailableException + * @throws ConcurrentOperationException */ boolean setupPrivateGateway(PrivateGateway gateway, VirtualRouter router) throws ConcurrentOperationException, ResourceUnavailableException; @@ -72,8 +72,8 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian * @param gateway * @param router * @return - * @throws ResourceUnavailableException - * @throws ConcurrentOperationException + * @throws ResourceUnavailableException + * @throws ConcurrentOperationException */ boolean destroyPrivateGateway(PrivateGateway gateway, VirtualRouter router) throws ConcurrentOperationException, ResourceUnavailableException; @@ -81,7 +81,7 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian * @param routes * @param routers * @return - * @throws ResourceUnavailableException + * @throws ResourceUnavailableException */ boolean applyStaticRoutes(List routes, List routers) throws ResourceUnavailableException; @@ -108,7 +108,7 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian List getVpcRouters(long vpcId); /** - * @param vpn + * @param vpn * @param router * @return * @throws ResourceUnavailableException @@ -116,7 +116,7 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian boolean startRemoteAccessVpn(RemoteAccessVpn vpn, VirtualRouter router) throws ResourceUnavailableException; /** - * @param vpn + * @param vpn * @param router * @return * @throws ResourceUnavailableException @@ -124,8 +124,8 @@ public interface VpcVirtualNetworkApplianceManager extends VirtualNetworkApplian boolean stopRemoteAccessVpn(RemoteAccessVpn vpn, VirtualRouter router) throws ResourceUnavailableException; /** - * @param vpn - * @param users + * @param vpn + * @param users * @param routers * @return * @throws ResourceUnavailableException diff --git a/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java b/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java index 365410ee96e..82f8abc2dd5 100644 --- a/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java +++ b/server/src/com/cloud/network/security/LocalSecurityGroupWorkQueue.java @@ -37,7 +37,7 @@ import com.cloud.network.security.SecurityGroupWork.Step; public class LocalSecurityGroupWorkQueue implements SecurityGroupWorkQueue { protected static Logger s_logger = Logger.getLogger(LocalSecurityGroupWorkQueue.class); - //protected Set _currentWork = new HashSet(); + //protected Set _currentWork = new HashSet(); protected Set _currentWork = new TreeSet(); private final ReentrantLock _lock = new ReentrantLock(); diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java index 8e86ca77d11..908921a9bad 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java @@ -224,7 +224,7 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl { //TODO: over time clean up op_vm_ruleset_log table for destroyed vms } - /* + /* * Same as the superclass, except that we use the ip address(es) returned from the join * made with the nics table when retrieving the SecurityGroupVmMapVO. If a vm has a single * nic then that nic is the default and then this query is correct. If the vm has multiple nics diff --git a/server/src/com/cloud/network/security/SecurityGroupWorkQueue.java b/server/src/com/cloud/network/security/SecurityGroupWorkQueue.java index 7c863e1b010..3abebed6690 100644 --- a/server/src/com/cloud/network/security/SecurityGroupWorkQueue.java +++ b/server/src/com/cloud/network/security/SecurityGroupWorkQueue.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Set; /** - * Security Group Work queue + * Security Group Work queue * standard producer / consumer interface * */ diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 7fc0334a626..8c72183d4ec 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -217,7 +217,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc throw new InvalidParameterValueException("Vpn service is not supported in network id=" + ipAddr.getAssociatedWithNetworkId()); } cidr = NetUtils.getCidr(network.getCidr()); - } else { // Don't need to check VPC because there is only one IP(source NAT IP) available for VPN + } else { // Don't need to check VPC because there is only one IP(source NAT IP) available for VPN Vpc vpc = _vpcDao.findById(vpcId); cidr = NetUtils.getCidr(vpc.getCidr()); } diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java index 3dd944a1706..25c84d6d956 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManager.java @@ -5,7 +5,7 @@ // 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, diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index 37532475623..cb79a5af0d3 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index efd263eef3f..97b37b9bdd4 100755 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/server/src/com/cloud/server/ConfigurationServer.java b/server/src/com/cloud/server/ConfigurationServer.java index d128fb5db81..a5021d7910d 100644 --- a/server/src/com/cloud/server/ConfigurationServer.java +++ b/server/src/com/cloud/server/ConfigurationServer.java @@ -29,7 +29,7 @@ public interface ConfigurationServer { /** * Persists default values for the configuration table, pods/zones, and VLANs - * + * * @return */ public void persistDefaultValues() throws InternalErrorException; diff --git a/server/src/com/cloud/server/ManagementServer.java b/server/src/com/cloud/server/ManagementServer.java index 59a12c87929..5a751e8c6c4 100755 --- a/server/src/com/cloud/server/ManagementServer.java +++ b/server/src/com/cloud/server/ManagementServer.java @@ -32,7 +32,7 @@ public interface ManagementServer extends ManagementService, PluggableService { /** * returns the instance id of this management server. - * + * * @return id of the management server */ long getId(); @@ -45,7 +45,7 @@ public interface ManagementServer extends ManagementService, PluggableService { /** * Retrieves a host by id - * + * * @param hostId * @return Host */ @@ -57,7 +57,7 @@ public interface ManagementServer extends ManagementService, PluggableService { /** * Returns the vnc port of the vm. - * + * * @param VirtualMachine vm * @return the vnc port if found; -1 if unable to find. */ diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java index dddbf9985f1..ea8e87b480b 100644 --- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java +++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java @@ -22,7 +22,7 @@ import com.cloud.utils.component.AdapterBase; /** * Use this UserAuthenticator if users are already authenticated outside - * + * */ @Local(value = {UserAuthenticator.class}) public abstract class DefaultUserAuthenticator extends AdapterBase implements UserAuthenticator { diff --git a/server/src/com/cloud/server/auth/UserAuthenticator.java b/server/src/com/cloud/server/auth/UserAuthenticator.java index 3c9c6a5754d..3fccebc4dc7 100644 --- a/server/src/com/cloud/server/auth/UserAuthenticator.java +++ b/server/src/com/cloud/server/auth/UserAuthenticator.java @@ -22,12 +22,12 @@ import com.cloud.utils.component.Adapter; /** * which UserAuthenticator to user in components.xml. - * + * */ public interface UserAuthenticator extends Adapter { /** - * + * * @param username * @param password * @param domainId diff --git a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java b/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java index a00fe59abd6..b64bb019405 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java +++ b/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java @@ -170,7 +170,7 @@ public class ConsoleProxyPasswordBasedEncryptor { random.nextBytes(ivBytes); KeyIVPair keyIvPair = new KeyIVPair("8x/xUBgX0Up+3UEo39dSeG277JhVj31+ElHkN5+EC0Q=", "Y2SUiIN6JXTdKNK/ZMDyVtLB7gAM9MCCiyrP1xd3bSQ="); - //keyIvPair.setKeyBytes(keyBytes); + //keyIvPair.setKeyBytes(keyBytes); //keyIvPair.setIvBytes(ivBytes); Gson gson = new GsonBuilder().create(); diff --git a/server/src/com/cloud/storage/CreateSnapshotPayload.java b/server/src/com/cloud/storage/CreateSnapshotPayload.java index 32654e15b19..94de70b3fe4 100644 --- a/server/src/com/cloud/storage/CreateSnapshotPayload.java +++ b/server/src/com/cloud/storage/CreateSnapshotPayload.java @@ -11,7 +11,7 @@ // 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 +// KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. package com.cloud.storage; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotScheduler.java b/server/src/com/cloud/storage/snapshot/SnapshotScheduler.java index b001f903bb1..c744f69b4d2 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotScheduler.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotScheduler.java @@ -28,7 +28,7 @@ public interface SnapshotScheduler extends Manager, Scheduler { /** * Schedule the next snapshot job for this policy instance. - * + * * @return The timestamp at which the next snapshot is scheduled. */ public Date scheduleNextSnapshotJob(SnapshotPolicyVO policyInstance); diff --git a/server/src/com/cloud/test/IPRangeConfig.java b/server/src/com/cloud/test/IPRangeConfig.java index 084bce3bb94..5bd821ba2dc 100755 --- a/server/src/com/cloud/test/IPRangeConfig.java +++ b/server/src/com/cloud/test/IPRangeConfig.java @@ -572,7 +572,7 @@ public class IPRangeConfig { // return DatabaseConfig.getDatabaseValueString("SELECT * FROM `cloud`.`configuration` WHERE name = \"guest.ip.network\"", "value", // "Unable to start DB connection to read guest IP network. Please contact Cloud Support."); // } -// +// // public static String getGuestNetmask() { // return DatabaseConfig.getDatabaseValueString("SELECT * FROM `cloud`.`configuration` WHERE name = \"guest.netmask\"", "value", // "Unable to start DB connection to read guest netmask. Please contact Cloud Support."); @@ -581,10 +581,10 @@ public class IPRangeConfig { // public static String getGuestSubnet() { // String guestIpNetwork = getGuestIpNetwork(); // String guestNetmask = getGuestNetmask(); -// +// // if (guestIpNetwork == null || guestIpNetwork.isEmpty()) printError("Please enter a valid guest IP network address."); // if (guestNetmask == null || guestNetmask.isEmpty()) printError("Please enter a valid guest IP network netmask"); -// +// // return NetUtils.getSubNet(guestIpNetwork, guestNetmask); // } diff --git a/server/src/com/cloud/test/PodZoneConfig.java b/server/src/com/cloud/test/PodZoneConfig.java index 4800e34cdc6..a5d2b72c30b 100644 --- a/server/src/com/cloud/test/PodZoneConfig.java +++ b/server/src/com/cloud/test/PodZoneConfig.java @@ -5,7 +5,7 @@ // 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, diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java index b0882e51615..caac2559128 100755 --- a/server/src/com/cloud/usage/UsageServiceImpl.java +++ b/server/src/com/cloud/usage/UsageServiceImpl.java @@ -163,7 +163,7 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag //If accountId couldn't be found using accountName and domainId, get it from userContext if (accountId == null) { accountId = caller.getId(); - //List records for all the accounts if the caller account is of type admin. + //List records for all the accounts if the caller account is of type admin. //If account_id or account_name is explicitly mentioned, list records for the specified account only even if the caller is of type admin if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN) { isAdmin = true; diff --git a/server/src/com/cloud/user/AccountManager.java b/server/src/com/cloud/user/AccountManager.java index 9a3bb726017..1f191fc8cb9 100755 --- a/server/src/com/cloud/user/AccountManager.java +++ b/server/src/com/cloud/user/AccountManager.java @@ -59,7 +59,7 @@ public interface AccountManager extends AccountService { /** * Authenticates a user when s/he logs in. - * + * * @param username * required username for authentication * @param password @@ -75,7 +75,7 @@ public interface AccountManager extends AccountService { /** * Locate a user by their apiKey - * + * * @param apiKey * that was created for a particular user * @return the user/account pair if one exact match was found, null otherwise diff --git a/server/src/com/cloud/user/DomainManager.java b/server/src/com/cloud/user/DomainManager.java index c895af49e5e..41d9d3429e7 100644 --- a/server/src/com/cloud/user/DomainManager.java +++ b/server/src/com/cloud/user/DomainManager.java @@ -41,7 +41,7 @@ public interface DomainManager extends DomainService { /** * update an existing domain - * + * * @param cmd * - the command containing domainId and new domainName * @return Domain object if the command succeeded diff --git a/server/src/com/cloud/vm/UserVmManager.java b/server/src/com/cloud/vm/UserVmManager.java index fd37f2976a6..fec24107fd9 100755 --- a/server/src/com/cloud/vm/UserVmManager.java +++ b/server/src/com/cloud/vm/UserVmManager.java @@ -39,7 +39,7 @@ import com.cloud.utils.Pair; /** * - * + * */ public interface UserVmManager extends UserVmService { static final String EnableDynamicallyScaleVmCK = "enable.dynamic.scale.vm"; diff --git a/server/src/org/apache/cloudstack/region/RegionManager.java b/server/src/org/apache/cloudstack/region/RegionManager.java index cb23e019754..d4b063d412e 100644 --- a/server/src/org/apache/cloudstack/region/RegionManager.java +++ b/server/src/org/apache/cloudstack/region/RegionManager.java @@ -84,7 +84,7 @@ public interface RegionManager { /** * Updates an account - * isPopagate falg is set to true if sent from peer Region + * isPopagate falg is set to true if sent from peer Region * * @param cmd * - the parameter containing accountId or account nameand domainId @@ -125,7 +125,7 @@ public interface RegionManager { /** * update an existing domain - * + * * @param cmd * - the command containing domainId and new domainName * @return Domain object if the command succeeded diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/test/com/cloud/network/MockFirewallManagerImpl.java index abfe8dc300d..f5e2994618b 100644 --- a/server/test/com/cloud/network/MockFirewallManagerImpl.java +++ b/server/test/com/cloud/network/MockFirewallManagerImpl.java @@ -5,7 +5,7 @@ // 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, diff --git a/server/test/com/cloud/network/dao/NetworkDaoTest.java b/server/test/com/cloud/network/dao/NetworkDaoTest.java index 9e5cef525ef..140c850a609 100644 --- a/server/test/com/cloud/network/dao/NetworkDaoTest.java +++ b/server/test/com/cloud/network/dao/NetworkDaoTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; public class NetworkDaoTest extends TestCase { public void testTags() { // NetworkDaoImpl dao = ComponentLocator.inject(NetworkDaoImpl.class); -// +// // dao.expunge(1001l); // NetworkVO network = new NetworkVO(1001, TrafficType.Control, GuestType.Shared, Mode.Dhcp, BroadcastDomainType.Native, 1, 1, 1, 1, 1001, "Name", "DisplayText", false, true, true, null, null); // network.setGuruName("guru_name"); @@ -38,23 +38,23 @@ public class NetworkDaoTest extends TestCase { // NetworkVO retrieved = dao.findById(1001l); // List retrievedTags = retrieved.getTags(); // Assert.assertTrue(retrievedTags.size() == 2 && retrievedTags.contains("a") && retrievedTags.contains("b")); -// +// // List updateTags = new ArrayList(); // updateTags.add("e"); // updateTags.add("f"); // retrieved.setTags(updateTags); // dao.update(retrieved.getId(), retrieved); -// +// // retrieved = dao.findById(1001l); // retrievedTags = retrieved.getTags(); // Assert.assertTrue("Unable to retrieve back the data updated", retrievedTags.size() == 2 && retrievedTags.contains("e") && retrievedTags.contains("f")); -// +// // dao.expunge(1001l); } public void testListBy() { // NetworkDaoImpl dao = ComponentLocator.inject(NetworkDaoImpl.class); -// +// // dao.listBy(1l, 1l, 1l, "192.168.192.0/24"); } diff --git a/server/test/com/cloud/network/vpn/RemoteAccessVpnTest.java b/server/test/com/cloud/network/vpn/RemoteAccessVpnTest.java index 0ca3f6e44f8..58315e60f57 100644 --- a/server/test/com/cloud/network/vpn/RemoteAccessVpnTest.java +++ b/server/test/com/cloud/network/vpn/RemoteAccessVpnTest.java @@ -34,7 +34,7 @@ public class RemoteAccessVpnTest { // locator.addDao("ConfigurationDao", ConfigurationDaoImpl.class); // // } -// +// // private static void addManagers(MockComponentLocator locator) { // locator.addManager("AccountManager", MockAccountManagerImpl.class); // locator.addManager("DomainManager", MockDomainManagerImpl.class); @@ -58,7 +58,7 @@ public class RemoteAccessVpnTest { @Test public void testInjected() throws Exception { -// List>> list = +// List>> list = // new ArrayList>>(); // list.add(new Pair>("RemoteAccessVPNServiceProvider", MockRemoteAccessVPNServiceProvider.class)); // locator.addAdapterChain(RemoteAccessVPNServiceProvider.class, list); diff --git a/server/test/com/cloud/vpc/Site2SiteVpnTest.java b/server/test/com/cloud/vpc/Site2SiteVpnTest.java index 093cf95d8d6..b4168bfa10c 100644 --- a/server/test/com/cloud/vpc/Site2SiteVpnTest.java +++ b/server/test/com/cloud/vpc/Site2SiteVpnTest.java @@ -60,7 +60,7 @@ public class Site2SiteVpnTest { @Test public void testInjected() throws Exception { -// List>> list = +// List>> list = // new ArrayList>>(); // list.add(new Pair>("Site2SiteVpnServiceProvider", MockSite2SiteVpnServiceProvider.class)); // locator.addAdapterChain(Site2SiteVpnServiceProvider.class, list); diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java index 601e69e07b4..47c43010796 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java @@ -118,7 +118,7 @@ public class MockNetworkOfferingDaoImpl extends NetworkOfferingDaoImpl implement false, false, false); vo.setRedundantRouter(true); } else if (id.longValue() == 6) { - //network offering invalid for vpc (has lb service) + //network offering invalid for vpc (has lb service) vo = new NetworkOfferingVO("vpc", "vpc", TrafficType.Guest, false, true, null, null, false, Availability.Optional, null, Network.GuestType.Isolated, false, false, false, false, false); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java index 438755f4869..f594df67197 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java @@ -23,7 +23,7 @@ import streamer.Order; /** * Not an order, but derived from Order class for compatibility with orders. - * + * * @see http://msdn.microsoft.com/en-us/library/dd306368.aspx */ public class BitmapOrder extends Order { diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java index 6e7738fad3e..f78bef07240 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java @@ -31,7 +31,7 @@ public class BufferedImageCanvas extends Canvas { // Offline screen buffer private BufferedImage offlineImage; - + // Cached Graphics2D object for offline screen buffer private Graphics2D graphics; @@ -39,7 +39,7 @@ public class BufferedImageCanvas extends Canvas { super(); setBackground(Color.black); - + setFocusable(true); // Don't intercept TAB key diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java index bbd5142cad6..1e11bd8d5e2 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java @@ -53,7 +53,7 @@ public class BufferedImageCopyRectAdapter extends BaseElement { public void handleData(ByteBuffer buf, Link link) { if (buf == null) return; - + if (verbose) System.out.println("[" + this + "] INFO: Data received: " + buf + "."); @@ -98,11 +98,11 @@ public class BufferedImageCopyRectAdapter extends BaseElement { // 3 13, 14, 15, 16 }; - + // Initalize image int[] data = ((DataBufferInt) canvas.getOfflineImage().getRaster().getDataBuffer()).getData(); System.arraycopy(pixelsBeforeCopy, 0, data, 0, pixelsBeforeCopy.length); - + ByteBuffer buf = new ByteBuffer(new byte[0]); buf.putMetadata(TARGET_X, 0); buf.putMetadata(TARGET_Y, 0); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java index 343fe0abec4..71c725e11df 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java @@ -88,7 +88,7 @@ public class Client { pipeline.link("socket", main.getId(), "socket"); pipeline.validate(); - + frame = createVncClientMainWindow(canvas, "VNC", new WindowAdapter() { public void windowClosing(WindowEvent evt) { shutdown(); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java index 726d8a094d5..b0adf7fce13 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java @@ -27,19 +27,19 @@ public class KeyOrder extends Order { public KeyOrder(KeyEvent event, boolean pressed) { type = "key event"; - + this.event = event; this.pressed = pressed; } public KeyEvent event; - + public boolean pressed; @Override public String toString() { return "KeyOrder [event=" + event + ", pressed=" + pressed + "]"; } - - + + } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java b/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java index a01f22e8459..ffbc8dcc2e6 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java @@ -24,7 +24,7 @@ import java.util.Set; * VncScreenDescription - contains information about remote VNC screen. */ public class ScreenDescription { - + protected Set sizeChangeListeners = new HashSet(); // Frame buffer size @@ -109,7 +109,7 @@ public class ScreenDescription { this.framebufferWidth = width; this.framebufferHeight = height; - + callSizeChangeListeners(width, height); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java index 371bffc8ae1..09608bcc958 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/AwtRdpMouseAdapter.java @@ -127,7 +127,7 @@ public class AwtRdpMouseAdapter extends BaseElement { if (order.pressed) { // Mouse pressed flags |= PTRFLAGS_DOWN; - + // Check, which one of buttons is released boolean b1 = ((modifiers & MouseEvent.BUTTON1_DOWN_MASK) > 0) && !button1; boolean b2 = ((modifiers & MouseEvent.BUTTON2_DOWN_MASK) > 0) && !button2; @@ -149,7 +149,7 @@ public class AwtRdpMouseAdapter extends BaseElement { } } else if (order.released) { // Mouse released - + // Check, which one of buttons is released boolean b1 = !((modifiers & MouseEvent.BUTTON1_DOWN_MASK) > 0) && button1; boolean b2 = !((modifiers & MouseEvent.BUTTON2_DOWN_MASK) > 0) && button2; diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java index 9a1caab0c88..6c174961eb0 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientConfirmActivePDU.java @@ -37,7 +37,7 @@ public class ClientConfirmActivePDU extends BaseElement { public static final int CAPSTYPE_BITMAP = 0x2; protected int numberCapabilities; - + protected RdpState state; protected ScreenDescription screen; @@ -148,44 +148,44 @@ public class ClientConfirmActivePDU extends BaseElement { // MCS Send Data Request (byte)0x64, // Initiator: 1004 (1001+3) - (byte)0x00, (byte)0x03, + (byte)0x00, (byte)0x03, // Channel ID: 1003 (I/O channel) - (byte)0x03, (byte)0xeb, + (byte)0x03, (byte)0xeb, // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - (byte)0x70, + (byte)0x70, // User data length: 26 bytes (0x1a, variable length field) (byte)0x80, (byte)0x1a, - + // Total length: 26 bytes (0x1a, LE) - (byte)0x1a, (byte)0x00, + (byte)0x1a, (byte)0x00, // PDU type: PDUTYPE_DATAPDU (0x7), PDU version: 1 (0x0010) (LE) - (byte)0x17, (byte)0x00, + (byte)0x17, (byte)0x00, // PDU source: 1004 (LE) - (byte)0xec, (byte)0x03, + (byte)0xec, (byte)0x03, }); // Share ID, 4 bytes (LE) buf.writeIntLE((int)state.serverShareId); - + buf.writeBytes(new byte[] { // Padding 1 byte - (byte)0x00, + (byte)0x00, // Stream ID: STREAM_LOW (1) - (byte)0x01, + (byte)0x01, // uncompressedLength : 12 bytes (LE) (byte)0x0c, (byte)0x00, - + // pduType2: PDUTYPE2_FONTLIST (39) - (byte)0x27, + (byte)0x27, // generalCompressedType: 0 - (byte)0x00, + (byte)0x00, // generalCompressedLength: 0 (LE) - (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, // numberEntries (should be set to zero): 0 (LE) (byte)0x00, (byte)0x00, // totalNumEntries (should be set to zero): 0 (LE) (byte)0x00, (byte)0x00, - // listFlags (should be set to 0x3): 0x0003 (LE), FONTLIST_LAST(0x2) | FONTLIST_FIRST(0x1) + // listFlags (should be set to 0x3): 0x0003 (LE), FONTLIST_LAST(0x2) | FONTLIST_FIRST(0x1) (byte)0x03, (byte)0x00, // entrySize: 50 bytes (0x0032, LE) (byte)0x32, (byte)0x00, @@ -206,44 +206,44 @@ public class ClientConfirmActivePDU extends BaseElement { /* @formatter:off */ buf.writeBytes(new byte[] { // MCS Send Data Request - (byte)0x64, + (byte)0x64, // Initiator: 1004 (1001+3) (byte)0x00, (byte)0x03, // Channel ID: 1003 (I/O channel) - (byte)0x03, (byte)0xeb, + (byte)0x03, (byte)0xeb, // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - (byte)0x70, + (byte)0x70, // User data length: 26 bytes (0x1a, variable length field) (byte)0x80, (byte)0x1a, - + // Total length: 26 bytes (0x1a, LE) (byte)0x1a, (byte)0x00, // PDU type: PDUTYPE_DATAPDU (0x7), PDU version: 1 (0x0010) (LE) - (byte)0x17, (byte)0x00, + (byte)0x17, (byte)0x00, // PDU source: 1004 (LE) (byte)0xec, (byte)0x03, }); // Share ID, 4 bytes (LE) buf.writeIntLE((int)state.serverShareId); - + buf.writeBytes(new byte[] { // Padding 1 byte - (byte)0x00, + (byte)0x00, // Stream ID: STREAM_LOW (1) - (byte)0x01, + (byte)0x01, // uncompressedLength : 12 bytes (LE) - (byte)0x0c, (byte)0x00, + (byte)0x0c, (byte)0x00, // pduType2: PDUTYPE2_CONTROL (20) - (byte)0x14, + (byte)0x14, // generalCompressedType: 0 - (byte)0x00, + (byte)0x00, // generalCompressedLength: 0 (LE) (byte)0x00, (byte)0x00, - + // action: CTRLACTION_REQUEST_CONTROL (1) (LE) (byte)0x01, (byte)0x00, // grantId: 0 (LE) - (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, // controlId: 0 (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, }); @@ -262,39 +262,39 @@ public class ClientConfirmActivePDU extends BaseElement { /* @formatter:off */ buf.writeBytes(new byte[] { // MCS Send Data Request - (byte)0x64, + (byte)0x64, // Initiator: 1004 (1001+3) - (byte)0x00, (byte)0x03, + (byte)0x00, (byte)0x03, // Channel ID: 1003 (I/O channel) - (byte)0x03, (byte)0xeb, + (byte)0x03, (byte)0xeb, // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - (byte)0x70, + (byte)0x70, // User data length: 26 bytes (0x1a, variable length field) (byte)0x80, (byte)0x1a, - + // Total length: 26 bytes (0x1a, LE) (byte)0x1a,(byte)0x00, // PDU type: PDUTYPE_DATAPDU (0x7), PDU version: 1 (0x0010) (LE) - (byte)0x17, (byte)0x00, + (byte)0x17, (byte)0x00, // PDU source: 1004 (LE) - (byte)0xec, (byte)0x03, + (byte)0xec, (byte)0x03, }); // Share ID, 4 bytes (LE) buf.writeIntLE((int)state.serverShareId); - + buf.writeBytes(new byte[] { // Padding 1 byte - (byte)0x00, + (byte)0x00, // Stream ID: STREAM_LOW (1) - (byte)0x01, + (byte)0x01, // uncompressedLength : 12 bytes (LE) - (byte)0x0c, (byte)0x00, + (byte)0x0c, (byte)0x00, // pduType2: PDUTYPE2_CONTROL (20) - (byte)0x14, + (byte)0x14, // generalCompressedType: 0 - (byte)0x00, + (byte)0x00, // generalCompressedLength: 0 (LE?) - (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, // action: CTRLACTION_COOPERATE (4) (LE) (byte)0x04, (byte)0x00, // grantId: 0 (LE) @@ -321,37 +321,37 @@ public class ClientConfirmActivePDU extends BaseElement { // Channel ID: 1003 (I/O Channel) (byte)0x03, (byte)0xeb, // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - (byte)0x70, + (byte)0x70, // Data length: 22 bytes (0x16, variable length field) - (byte)0x80, (byte)0x16, - + (byte)0x80, (byte)0x16, + // RDP: total length: 22 bytes (LE) - (byte)0x16, (byte)0x00, - + (byte)0x16, (byte)0x00, + // PDU type: PDUTYPE_DATAPDU (0x7), TS_PROTOCOL_VERSION (0x10) (LE) (byte)0x17, (byte)0x00, - + // PDU source: 1007 (LE) (byte)0xec, (byte)0x03, }); // Share ID, 4 bytes (LE) buf.writeIntLE((int)state.serverShareId); - + buf.writeBytes(new byte[] { // Padding: 1 byte (byte)0x00, // Stream ID: STREAM_LOW (1) - (byte)0x01, + (byte)0x01, // uncompressedLength : 8 bytes (LE) (byte)0x08, (byte)0x00, // pduType2 = PDUTYPE2_SYNCHRONIZE (31) - (byte)0x1f, + (byte)0x1f, // generalCompressedType: 0 (byte)0x00, // generalCompressedLength: 0 (LE?) (byte)0x00, (byte)0x00, // messageType: SYNCMSGTYPE_SYNC (1) (LE) - (byte)0x01, (byte)0x00, + (byte)0x01, (byte)0x00, // targetUser: 0x03ea (byte)0xea, (byte)0x03, }); @@ -617,37 +617,37 @@ public class ClientConfirmActivePDU extends BaseElement { private void writeBitmapCS(ByteBuffer buf) { // Bitmap capability set (28 bytes), see // http://msdn.microsoft.com/en-us/library/cc240554.aspx - + numberCapabilities++; - + // Capability set type: CAPSTYPE_BITMAP (2) (LE) buf.writeShortLE(CAPSTYPE_BITMAP); - + // Length of capability set: 28 bytes (LE) buf.writeShortLE(28); - + // preferredBitsPerPixel: 16 bpp (LE) buf.writeShortLE(prefferedBitsPerPixel); - + // receive1BitPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) buf.writeShortLE(1); - + // receive4BitsPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) buf.writeShortLE(1); - + // receive8BitsPerPixel (ignored and SHOULD be set to TRUE (0x1)): TRUE (0x1) (LE) buf.writeShortLE(1); - + // Desktop width and height (LE) buf.writeShortLE(screen.getFramebufferWidth()); buf.writeShortLE(screen.getFramebufferHeight()); - + // Padding 2 bytes buf.writeShortLE(0); - + // desktopResizeFlag (LE) buf.writeShortLE((desktopResize )?1:0); - + buf.writeBytes(new byte[] { (byte) 0x01, (byte) 0x00, // bitmapCompressionFlag (must be set to TRUE // (0x1)): TRUE (0x1) (LE) @@ -830,62 +830,62 @@ public class ClientConfirmActivePDU extends BaseElement { /* @formatter:off */ byte[] packet = new byte[] { // MCS Send Data Request - (byte)0x64, - + (byte)0x64, + // Initiator: 1004 (1001+3) - (byte)0x00, (byte)0x03, - + (byte)0x00, (byte)0x03, + // Channel ID: 1003 (I/O channel) (byte)0x03, (byte)0xeb, - + // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) (byte)0x70, - + // User data length: 432 bytes (0x1b0, variable length field) - (byte)0x81, (byte)0xb0, - + (byte)0x81, (byte)0xb0, + // Total length: 432 bytes (0x1b0, LE) - (byte)0xb0, (byte)0x01, - + (byte)0xb0, (byte)0x01, + // PDU type: Confirm Active PDU (0x3), TS_PROTOCOL_VERSION (0x10) (LE) - (byte)0x13, (byte)0x00, - + (byte)0x13, (byte)0x00, + // PDU source: 1004 (LE) - (byte)0xec, (byte)0x03, - + (byte)0xec, (byte)0x03, + // Share ID: 0x000103ea (LE) (byte)0xea, (byte)0x03, (byte)0x01, (byte)0x00, - + // Originator ID: 1002 (LE) (byte)0xea, (byte)0x03, - - // Length of source descriptor: 6 bytes (including NULL character) (LE) - (byte)0x06, (byte)0x00, - + + // Length of source descriptor: 6 bytes (including NULL character) (LE) + (byte)0x06, (byte)0x00, + // Length of combined capabilities: 410 bytes (LE) (byte)0x9a, (byte)0x01, - + // Source descriptor: "MSTSC" ??? (byte)0x4d, (byte)0x53, (byte)0x54, (byte)0x53, (byte)0x43, (byte)0x00, - + // Number of capabilities: 15 (LE) (byte)0x0f, (byte)0x00, - + // Padding 2 bytes (byte)0x00, (byte)0x00, - + // Capabilities, see http://msdn.microsoft.com/en-us/library/cc240486.aspx - + // // General capability set (24 bytes), see http://msdn.microsoft.com/en-us/library/cc240549.aspx - (byte)0x01, (byte)0x00, // capability set type: CAPSTYPE_GENERAL (1) (LE) + (byte)0x01, (byte)0x00, // capability set type: CAPSTYPE_GENERAL (1) (LE) (byte)0x18, (byte)0x00, // length of capability set: 24 bytes (LE) (byte)0x01, (byte)0x00, // TS_OSMAJORTYPE_WINDOWS (1) (LE) (byte)0x03, (byte)0x00, // TS_OSMINORTYPE_WINDOWS_NT (3) (LE) (byte)0x00, (byte)0x02, // TS_CAPS_PROTOCOLVERSION (0x0200) (LE) (byte)0x00, (byte)0x00, // Padding 2 bytes (byte)0x00, (byte)0x00, // generalCompressionTypes: 0 (LE) - + // Extra flags: 0x040d (LE) // FastPathOutput: (...............1) Advertiser supports fast-path output // ShadowCompression: (..............0.) Advertiser NOT supports shadow compression @@ -896,13 +896,13 @@ public class ClientConfirmActivePDU extends BaseElement { // CompressedBitMapDataFlag: (.....1..........) No 8-UINT8 header is present for compressed bitmap data // Reserved2: (00000...........) (byte)0x0d, (byte)0x04, - + (byte)0x00, (byte)0x00, // updateCapabilityFlag: 0 (LE) (byte)0x00, (byte)0x00, // remoteUnshareFlag: 0 (LE) (byte)0x00, (byte)0x00, // generalCompressionLevel: 0 (LE) (byte)0x00, // refreshRectSupport: FALSE (0) (byte)0x00, // suppressOutputSupport: FALSE (0) - + // // Bitmap capability set (28 bytes), see http://msdn.microsoft.com/en-us/library/cc240554.aspx (byte)0x02, (byte)0x00, // capability set type: CAPSTYPE_BITMAP (2) (LE) @@ -916,11 +916,11 @@ public class ClientConfirmActivePDU extends BaseElement { (byte)0x00, (byte)0x00, // Padding 2 bytes (byte)0x00, (byte)0x00, // desktopResizeFlag: FALSE (0x0) (LE) (byte)0x01, (byte)0x00, // bitmapCompressionFlag (must be set to TRUE (0x1)): TRUE (0x1) (LE) - (byte)0x00, // highColorFlags (field is ignored and SHOULD be set to zero): 0 + (byte)0x00, // highColorFlags (field is ignored and SHOULD be set to zero): 0 (byte)0x01, // drawingFlags: 0x1 TODO: padding, why 0x1 ??? - (byte)0x01, (byte)0x00, // multipleRectangleSupport: TRUE (LE) + (byte)0x01, (byte)0x00, // multipleRectangleSupport: TRUE (LE) (byte)0x00, (byte)0x00, // Padding 2 bytes - + // // Order Capability Set (88 bytes), see http://msdn.microsoft.com/en-us/library/cc240556.aspx (byte)0x03, (byte)0x00, // capability set type: CAPSTYPE_ORDER (3) (LE) @@ -928,24 +928,24 @@ public class ClientConfirmActivePDU extends BaseElement { // terminalDescriptor = "" (16 bytes, UCS2) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // pad4octetsA + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // pad4octetsA (byte)0x01, (byte)0x00, // desktopSaveXGranularity (ignored): 1 (LE) (byte)0x14, (byte)0x00, // desktopSaveYGranularity (ignored): 20 (LE) (byte)0x00, (byte)0x00, // pad2octetsA (ignored) - (byte)0x01, (byte)0x00, // maximumOrderLevel: ORD_LEVEL_1_ORDERS (1) - (byte)0x00, (byte)0x00, // number of fonts (ignored): 0 + (byte)0x01, (byte)0x00, // maximumOrderLevel: ORD_LEVEL_1_ORDERS (1) + (byte)0x00, (byte)0x00, // number of fonts (ignored): 0 (byte)0x4a, (byte)0x00, // orderFlags = 0x004a (LE), SOLIDPATTERNBRUSHONLY (0x40), ZEROBOUNDSDELTASSUPPORT (0x8, MUST), NEGOTIATEORDERSUPPORT (0x2, MUST) // Order support: 32 bytes (no primary drawing orders are supported, so this array MUST be initialized to all zeros, use 0x01 for TRUE). - (byte)0x00, // TS_NEG_DSTBLT_INDEX: FALSE - (byte)0x00, // TS_NEG_PATBLT_INDEX: FALSE - (byte)0x00, // TS_NEG_SCRBLT_INDEX: FALSE - (byte)0x00, // TS_NEG_MEMBLT_INDEX: FALSE - (byte)0x00, // TS_NEG_MEM3BLT_INDEX: FALSE - (byte)0x00, // TS_NEG_ATEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_DSTBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_PATBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_SCRBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MEMBLT_INDEX: FALSE + (byte)0x00, // TS_NEG_MEM3BLT_INDEX: FALSE + (byte)0x00, // TS_NEG_ATEXTOUT_INDEX: FALSE (byte)0x00, // TS_NEG_AEXTTEXTOUT_INDEX: FALSE (byte)0x00, // TS_NEG_DRAWNINEGRID_INDEX: FALSE (byte)0x00, // TS_NEG_LINETO_INDEX: FALSE - (byte)0x00, // TS_NEG_MULTI_DRAWNINEGRID_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTI_DRAWNINEGRID_INDEX: FALSE (byte)0x00, // TS_NEG_OPAQUERECT_INDEX: FALSE (byte)0x00, // TS_NEG_SAVEBITMAP_INDEX: FALSE (byte)0x00, // TS_NEG_WTEXTOUT_INDEX: FALSE @@ -954,61 +954,61 @@ public class ClientConfirmActivePDU extends BaseElement { (byte)0x00, // TS_NEG_MULTIDSTBLT_INDEX: FALSE (byte)0x00, // TS_NEG_MULTIPATBLT_INDEX: FALSE (byte)0x00, // TS_NEG_MULTISCRBLT_INDEX: FALSE - (byte)0x00, // TS_NEG_MULTIOPAQUERECT_INDEX: FALSE - (byte)0x00, // TS_NEG_FAST_INDEX_INDEX: FALSE - (byte)0x00, // TS_NEG_POLYGON_SC_INDEX: FALSE - (byte)0x00, // TS_NEG_POLYGON_CB_INDEX: FALSE - (byte)0x00, // TS_NEG_POLYLINE_INDEX: TRUE - (byte)0x00, // Unused: 0 - (byte)0x00, // TS_NEG_FAST_GLYPH_INDEX: FALSE - (byte)0x00, // TS_NEG_ELLIPSE_SC_INDEX: FALSE + (byte)0x00, // TS_NEG_MULTIOPAQUERECT_INDEX: FALSE + (byte)0x00, // TS_NEG_FAST_INDEX_INDEX: FALSE + (byte)0x00, // TS_NEG_POLYGON_SC_INDEX: FALSE + (byte)0x00, // TS_NEG_POLYGON_CB_INDEX: FALSE + (byte)0x00, // TS_NEG_POLYLINE_INDEX: TRUE + (byte)0x00, // Unused: 0 + (byte)0x00, // TS_NEG_FAST_GLYPH_INDEX: FALSE + (byte)0x00, // TS_NEG_ELLIPSE_SC_INDEX: FALSE (byte)0x00, // TS_NEG_ELLIPSE_CB_INDEX: FALSE - (byte)0x00, // TS_NEG_INDEX_INDEX: FALSE - (byte)0x00, // TS_NEG_WEXTTEXTOUT_INDEX: FALSE - (byte)0x00, // TS_NEG_WLONGTEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_INDEX_INDEX: FALSE + (byte)0x00, // TS_NEG_WEXTTEXTOUT_INDEX: FALSE + (byte)0x00, // TS_NEG_WLONGTEXTOUT_INDEX: FALSE (byte)0x00, // TS_NEG_WLONGEXTTEXTOUT_INDEX: FALSE - (byte)0x00, // Unused: 0 + (byte)0x00, // Unused: 0 (byte)0x00, (byte)0x00, // Text flags (ignored): 0 (LE) (byte)0x00, (byte)0x00, // Order support extra flags: 0 (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding 4 bytes - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Desktop save size (ignored): 0 (assumed to be 230400 bytes (480*480, 0x38400, LE)) - (byte)0x00, (byte)0x00, // Padding 2 bytes + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Desktop save size (ignored): 0 (assumed to be 230400 bytes (480*480, 0x38400, LE)) (byte)0x00, (byte)0x00, // Padding 2 bytes - (byte)0xe4, (byte)0x04, // Text ANSI Code Page: 1252, ANSI - Latin I (0x04e4, LE) (byte)0x00, (byte)0x00, // Padding 2 bytes - + (byte)0xe4, (byte)0x04, // Text ANSI Code Page: 1252, ANSI - Latin I (0x04e4, LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes + // // Bitmap Cache Rev. 2 Capability Set (40 bytes), see http://msdn.microsoft.com/en-us/library/cc240560.aspx - (byte)0x13, (byte)0x00, // capability set type: CAPSTYPE_BITMAPCACHE_REV2 (19) (LE) + (byte)0x13, (byte)0x00, // capability set type: CAPSTYPE_BITMAPCACHE_REV2 (19) (LE) (byte)0x28, (byte)0x00, // length of capability set: 40 bytes (LE) - (byte)0x00, (byte)0x00, // Cache flags: 0 (LE) - (byte)0x00, // Padding 1 byte - (byte)0x00, // Number of cell caches: 0 - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache0 cell info: 0 (LE) + (byte)0x00, (byte)0x00, // Cache flags: 0 (LE) + (byte)0x00, // Padding 1 byte + (byte)0x00, // Number of cell caches: 0 + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache0 cell info: 0 (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache1 cell info: 0 (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache2 cell info: 0 (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache3 cell info: 0 (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Bitmap cache4 cell info: 0 (LE) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding 12 bytes + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding 12 bytes (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // Padding - + // // Color Table Cache Capability Set (8 bytes), see http://msdn.microsoft.com/en-us/library/cc241564.aspx (byte)0x0a, (byte)0x00, // capability set type: CAPSTYPE_COLORCACHE (10) (LE) (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) (byte)0x06, (byte)0x00, // Color table cache size (must be ignored during capability exchange and is assumed to be 0x0006): 6 (LE) (byte)0x00, (byte)0x00, // Padding 2 bytes - + // // Window Activation Capability Set (12 bytes), see http://msdn.microsoft.com/en-us/library/cc240569.aspx - (byte)0x07, (byte)0x00, // capability set type: CAPSTYPE_ACTIVATION (7) (LE) + (byte)0x07, (byte)0x00, // capability set type: CAPSTYPE_ACTIVATION (7) (LE) (byte)0x0c, (byte)0x00, // length of capability set: 12 bytes (LE) (byte)0x00, (byte)0x00, // helpKeyFlag (should be set to FALSE (0)): FALSE (0, LE) (byte)0x00, (byte)0x00, // helpKeyIndexFlag (should be set to FALSE (0)): FALSE (0, LE) (byte)0x00, (byte)0x00, // helpExtendedKeyFlag (should be set to FALSE (0)): FALSE (0, LE) (byte)0x00, (byte)0x00, // windowManagerKeyFlag (should be set to FALSE (0)): FALSE (0, LE) - + // // Control Capability Set (12 bytes), see http://msdn.microsoft.com/en-us/library/cc240568.aspx (byte)0x05, (byte)0x00, // capability set type: CAPSTYPE_ACTIVATION (7) @@ -1017,7 +1017,7 @@ public class ClientConfirmActivePDU extends BaseElement { (byte)0x00, (byte)0x00, // remoteDetachFlag (should be set to 0): 0 (LE) (byte)0x02, (byte)0x00, // controlInterest (should be set to CONTROLPRIORITY_NEVER): CONTROLPRIORITY_NEVER (2) (LE) (byte)0x02, (byte)0x00, // detachInterest (should be set to CONTROLPRIORITY_NEVER): CONTROLPRIORITY_NEVER (2) (LE) - + // // Pointer Capability Set (10 bytes), see http://msdn.microsoft.com/en-us/library/cc240562.aspx (byte)0x08, (byte)0x00, // capability set type: CAPSTYPE_POINTER (8, LE) @@ -1025,66 +1025,66 @@ public class ClientConfirmActivePDU extends BaseElement { (byte)0x00, (byte)0x00, // colorPointerFlag: FALSE (LE) (byte)0x00, (byte)0x00, // colorPointerCacheSize: 0 (LE) (byte)0x14, (byte)0x00, // pointerCacheSize: 20 (LE) - + // // Share Capability Set (8 bytes), see http://msdn.microsoft.com/en-us/library/cc240570.aspx (byte)0x09, (byte)0x00, // capability set type: CAPSTYPE_SHARE (9, LE) (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) (byte)0x00, (byte)0x00, // nodeID (must be set to 0 by client): 0 (LE) (byte)0x00, (byte)0x00, // Padding 2 bytes (LE) - + // // Input Capability Set (88 bytes), see http://msdn.microsoft.com/en-us/library/cc240563.aspx (byte)0x0d, (byte)0x00, // capability set type: CAPSTYPE_INPUT (13, LE) (byte)0x58, (byte)0x00, // length of capability set: 88 bytes (LE) (byte)0x35, (byte)0x00, // inputFlags: 0x0035 (LE), INPUT_FLAG_FASTPATH_INPUT2 (0x20), INPUT_FLAG_VKPACKET (0x10), INPUT_FLAG_MOUSEX (0x4), INPUT_FLAG_SCANCODES (0x1) - (byte)0x00, (byte)0x00, // Padding 2 bytes - (byte)0x09, (byte)0x04, (byte)0x00, (byte)0x00, // keyboardLayout: "US" keyboard layout (0x000409, LE) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // keyboardType: unknown (LE) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // keyboardSubType: unknown (LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes + (byte)0x09, (byte)0x04, (byte)0x00, (byte)0x00, // keyboardLayout: "US" keyboard layout (0x000409, LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // keyboardType: unknown (LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // keyboardSubType: unknown (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // keyboardFunctionKey: unknown (LE) - // imeFileName: "", (64 bytes, including trailing NULL characters, UCS2) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + // imeFileName: "", (64 bytes, including trailing NULL characters, UCS2) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + // // Brush Capability Set (8 bytes), see http://msdn.microsoft.com/en-us/library/cc240564.aspx (byte)0x0f, (byte)0x00, // capability set type: CAPSTYPE_BRUSH (15, LE) (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // brushSupportLevel: BRUSH_DEFAULT (0x0, LE) - + // // Sound Capability Set (8 bytes), see http://msdn.microsoft.com/en-us/library/cc240552.aspx (byte)0x0c, (byte)0x00, // capability set type: CAPSTYPE_SOUND (12, LE) (byte)0x08, (byte)0x00, // length of capability set: 8 bytes (LE) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // soundFlags: 0x0000 (LE) // SOUND_FLAG_BEEPS (0x1) - + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // soundFlags: 0x0000 (LE) // SOUND_FLAG_BEEPS (0x1) + // // Font Capability Set (8 bytes), see http://msdn.microsoft.com/en-us/library/cc240571.aspx - (byte)0x0e, (byte)0x00, - (byte)0x08, (byte)0x00, - (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00, - + (byte)0x0e, (byte)0x00, + (byte)0x08, (byte)0x00, + (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00, + // // Offscreen Bitmap Cache Capability Set (12 bytes), see http://msdn.microsoft.com/en-us/library/cc240550.aspx (byte)0x11, (byte)0x00, // capability set type: CAPSTYPE_OFFSCREENCACHE (17, LE) (byte)0x0c, (byte)0x00, // length of capability set: 12 bytes (LE) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // offscreenSupportLevel: FALSE (LE) + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // offscreenSupportLevel: FALSE (LE) (byte)0x00, (byte)0x00, // offscreenCacheSize: 0 (LE) (byte)0x00, (byte)0x00, // offscreenCacheEntries: 0 (LE) - + // // Glyph Cache Capability Set (52 bytes), see http://msdn.microsoft.com/en-us/library/cc240565.aspx (byte)0x10, (byte)0x00, // capability set type: CAPSTYPE_OFFSCREENCACHE (16, LE) (byte)0x34, (byte)0x00, // length of capability set: 52 bytes (LE) // Glyph Cache (40 bytes) - (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) + (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) (byte)0x04, (byte)0x00, // CacheMaximumCellSize: 4 (LE) (byte)0xfe, (byte)0x00, // CacheEntries: 254 (LE) (byte)0x04, (byte)0x00, // CacheMaximumCellSize: 4 (LE) @@ -1107,16 +1107,16 @@ public class ClientConfirmActivePDU extends BaseElement { // FragCache (byte)0x00, (byte)0x01, // CacheEntries: 256 (LE) (byte)0x00, (byte)0x01, // CacheMaximumCellSize: 256 (LE) - // - (byte)0x00, (byte)0x00, // GlyphSupportLevel: GLYPH_SUPPORT_NONE (0x0, LE) - (byte)0x00, (byte)0x00, // Padding 2 bytes + // + (byte)0x00, (byte)0x00, // GlyphSupportLevel: GLYPH_SUPPORT_NONE (0x0, LE) + (byte)0x00, (byte)0x00, // Padding 2 bytes }; /* @formatter:on */ RdpState rdpState = new RdpState(); ScreenDescription screenDescription = new ScreenDescription(); screenDescription.setFramebufferSize(1024, 768); - + rdpState.serverShareId = 0x000103ea; MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(new byte[] {})); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java index f5efc2c35b1..4410f70804f 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientInfoPDU.java @@ -77,139 +77,139 @@ public class ClientInfoPDU extends OneTimeSwitch { // Length of packet ByteBuffer buf = new ByteBuffer(1024, true); - // MCS Send Data Request PDU + // MCS Send Data Request PDU buf.writeByte(0x64); - + // Initiator: 0x03 + 1001 = 1004 - buf.writeShort(3); - + buf.writeShort(3); + // Channel ID: 1003 buf.writeShort(1003); - + // Data priority: high, segmentation: begin | end (0x40 | 0x20 | 0x10 = 0x70) buf.writeByte(0x70); - + // User data length: (variable length field) int length=224+userName.length + password.length+alternateShell.length+domain.length+workingDir.length+clientAddress.length+clientDir.length; buf.writeShort(length | 0x8000); - + // Flags: SEC_INFO_PKT (0x4000) buf.writeShort(0x4000); - - // TS_SECURITY_HEADER::flagsHi - ignored - buf.writeShort(0x0000); - // Codepage: 0 (UNKNOWN, LE) (use 0x04090409 (1033,1033) for EN_US) + // TS_SECURITY_HEADER::flagsHi - ignored + buf.writeShort(0x0000); + + // Codepage: 0 (UNKNOWN, LE) (use 0x04090409 (1033,1033) for EN_US) buf.writeIntLE(0x0000); - + // Flags - buf.writeIntLE(INFO_MOUSE | INFO_DISABLECTRLALTDEL | INFO_UNICODE | + buf.writeIntLE(INFO_MOUSE | INFO_DISABLECTRLALTDEL | INFO_UNICODE | INFO_MAXIMIZESHELL | INFO_LOGONNOTIFY | INFO_ENABLEWINDOWSKEY | INFO_MOUSE_HAS_WHEEL | INFO_NOAUDIOPLAYBACK ); - + // // Lengths // - + // cbDomain length: 0 bytes (LE) (NOT including size of mandatory NULL terminator) - buf.writeShortLE(domain.length); - + buf.writeShortLE(domain.length); + // cbUserName length: 16 bytes (0x10, LE) (NOT including size of mandatory NULL terminator) buf.writeShortLE(userName.length); - + // cbPassword length: (LE) (NOT including size of mandatory NULL terminator) buf.writeShortLE(password.length); - + // cbAlternateShell: (LE) (NOT including size of mandatory NULL terminator) buf.writeShortLE(alternateShell.length); - + // cbWorkingDir: (LE) (NOT including size of mandatory NULL terminator) buf.writeShortLE(workingDir.length); - + // // Values // - + // Domain: (UCS2), see cbDomain buf.writeBytes(domain); buf.writeShort(0); - + // User name: (UCS2), see cbUserName buf.writeBytes(userName); buf.writeShort(0); - + // Password: (UCS2), see cbPassword buf.writeBytes(password); buf.writeShort(0); - + // Alternate shell: (UCS2), see cbAlternateShell buf.writeBytes(alternateShell); buf.writeShort(0); - + // Working directory: (UCS2), see cbWorkingDir buf.writeBytes(workingDir); buf.writeShort(0); - + // Client address family: 2 (AF_INET, LE) buf.writeShortLE(2); - + // cbClientAddress: ( LE) (including the size of the mandatory NULL terminator) buf.writeShortLE(clientAddress.length+2); - - // Client address: (UCS2) + + // Client address: (UCS2) buf.writeBytes(clientAddress); buf.writeShort(0); - + // cbClientDir: 64 bytes (0x40, LE) (including the size of the mandatory NULL terminator) buf.writeShortLE(clientDir.length+2); - + // Client directory: (UCS2) buf.writeBytes(clientDir); buf.writeShort(0); - + // // Client time zone: // - + // Bias: 0 minutes (LE) - buf.writeIntLE(0); - + buf.writeIntLE(0); + // Standard name: "EET, Standard Time" (fixed string: 64 bytes, UCS2) buf.writeFixedString(62, standardTimeZoneName, RdpConstants.CHARSET_16); buf.writeShort(0); - + // Standard date - buf.writeBytes(new byte[] { + buf.writeBytes(new byte[] { // wYear: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMonth: unknown (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wDayOfWeek: Sunday (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wDay: unknown (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wHour: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMinute: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wSecond: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMilliseconds: 0 (byte) 0x00, (byte) 0x00, - + }); - + // StandardBias: 0 minutes (LE) - buf.writeIntLE(standardTimeZoneBias); - + buf.writeIntLE(standardTimeZoneBias); + // Daylight name: "EET, Summer Time" (fixed string: 64 bytes, UCS2) buf.writeFixedString(62, daylightTimeZoneName, RdpConstants.CHARSET_16); buf.writeShort(0); - + // Daylight date - buf.writeBytes(new byte[] { + buf.writeBytes(new byte[] { // wYear: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMonth: unknown (LE) (byte) 0x00, (byte) 0x00, // wDayOfWeek: Sunday (LE) @@ -224,18 +224,18 @@ public class ClientInfoPDU extends OneTimeSwitch { (byte) 0x00, (byte) 0x00, // wMilliseconds: 0 (byte) 0x00, (byte) 0x00, - + }); - + // Daylight bias: 60 minutes (LE) buf.writeIntLE(daylightTimeZoneBias); - + // Client session ID: 0x00000000 (LE) buf.writeIntLE(0); - + // Performance flags: 0x7 (LE) = PERF_DISABLE_WALLPAPER (0x1), PERF_DISABLE_FULLWINDOWDRAG (0x2), PERF_DISABLE_MENUANIMATIONS (0x4) buf.writeIntLE(PERF_DISABLE_WALLPAPER | PERF_DISABLE_FULLWINDOWDRAG | PERF_DISABLE_MENUANIMATIONS); - + // cbAutoReconnectCookie: 0 bytes (LE) buf.writeShortLE(0); @@ -257,158 +257,158 @@ public class ClientInfoPDU extends OneTimeSwitch { /* @formatter:off */ byte[] packet = new byte[] { - + // TPKT (byte) 0x03, (byte) 0x00, // TPKT length: 343 bytes (byte) 0x01, (byte) 0x57, - + // X224 Data PDU (byte) 0x02, (byte) 0xf0, (byte) 0x80, - - - // MCS Send Data Request PDU - (byte) 0x64, - + + + // MCS Send Data Request PDU + (byte) 0x64, + // Initiator: 0x03 + 1001 = 1004 (byte) 0x00, (byte) 0x03, - + // Channel ID: 1003 (IO Channel) (byte) 0x03, (byte) 0xeb, - + // Data priority: high, segmentation: begin | end (0x40 | 0x20 | 0x10 = 0x70) - (byte) 0x70, - - // User data length: 328 (0x148) bytes, variable length field - (byte) 0x81, (byte) 0x48, - + (byte) 0x70, + + // User data length: 328 (0x148) bytes, variable length field + (byte) 0x81, (byte) 0x48, + // Flags: SEC_INFO_PKT (0x4000) - (byte) 0x40, (byte) 0x00, + (byte) 0x40, (byte) 0x00, // TS_SECURITY_HEADER::flagsHi - ignored (byte) 0x00, (byte) 0x00, - - // Codepage: 0 (UNKNOWN, LE) (use 0x04090409 (1033,1033) for EN_US) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - - // Flags: 0xa0173 (LE), INFO_MOUSE (0x1), INFO_DISABLECTRLALTDEL (0x2), INFO_UNICODE (0x10), + + // Codepage: 0 (UNKNOWN, LE) (use 0x04090409 (1033,1033) for EN_US) + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + + // Flags: 0xa0173 (LE), INFO_MOUSE (0x1), INFO_DISABLECTRLALTDEL (0x2), INFO_UNICODE (0x10), // INFO_MAXIMIZESHELL (0x20), INFO_LOGONNOTIFY (0x40), INFO_ENABLEWINDOWSKEY (0x100), - // INFO_MOUSE_HAS_WHEEL (0x00020000), INFO_NOAUDIOPLAYBACK (0x00080000), - (byte) 0x73, (byte) 0x01, (byte) 0x0a, (byte) 0x00, - + // INFO_MOUSE_HAS_WHEEL (0x00020000), INFO_NOAUDIOPLAYBACK (0x00080000), + (byte) 0x73, (byte) 0x01, (byte) 0x0a, (byte) 0x00, + // Lengths - + // cbDomain length: 0 bytes (LE) (NOT including size of mandatory NULL terminator) - (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, + // cbUserName length: 16 bytes (0x10, LE) (NOT including size of mandatory NULL terminator) (byte) 0x10, (byte) 0x00, - + // cbPassword length: 0 bytes (LE) (NOT including size of mandatory NULL terminator) (byte) 0x00, (byte) 0x00, - + // cbAlternateShell: 0 bytes (LE) (NOT including size of mandatory NULL terminator) - (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, + // cbWorkingDir: 0 bytes (LE) (NOT including size of mandatory NULL terminator) (byte) 0x00, (byte) 0x00, - + // Values - + // Domain: "" (UCS2), see cbDomain - (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, + // User name: "vlisivka" (UCS2), see cbUserName - (byte) 0x76, (byte) 0x00, (byte) 0x6c, (byte) 0x00, (byte) 0x69, (byte) 0x00, (byte) 0x73, (byte) 0x00, - (byte) 0x69, (byte) 0x00, (byte) 0x76, (byte) 0x00, (byte) 0x6b, (byte) 0x00, (byte) 0x61, (byte) 0x00, - (byte) 0x00, (byte) 0x00, - + (byte) 0x76, (byte) 0x00, (byte) 0x6c, (byte) 0x00, (byte) 0x69, (byte) 0x00, (byte) 0x73, (byte) 0x00, + (byte) 0x69, (byte) 0x00, (byte) 0x76, (byte) 0x00, (byte) 0x6b, (byte) 0x00, (byte) 0x61, (byte) 0x00, + (byte) 0x00, (byte) 0x00, + // Password: "" (UCS2), see cbPassword - (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, + // Alternate shell: "" (UCS2), see cbAlternateShell - (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, + // Working directory: "" (UCS2), see cbWorkingDir - (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, + // Client address family: 2 (AF_INET, LE) - (byte) 0x02, (byte) 0x00, - + (byte) 0x02, (byte) 0x00, + // cbClientAddress = 28 bytes (0x1c, LE) (including the size of the mandatory NULL terminator) - (byte) 0x1c, (byte) 0x00, - - // Client address: "192.168.0.100" (UCS2) + (byte) 0x1c, (byte) 0x00, + + // Client address: "192.168.0.100" (UCS2) (byte) 0x31, (byte) 0x00, (byte) 0x39, (byte) 0x00, (byte) 0x32, (byte) 0x00, (byte) 0x2e, (byte) 0x00, (byte) 0x31, (byte) 0x00, (byte) 0x36, (byte) 0x00, (byte) 0x38, (byte) 0x00, (byte) 0x2e, (byte) 0x00, - (byte) 0x30, (byte) 0x00, (byte) 0x2e, (byte) 0x00, (byte) 0x31, (byte) 0x00, (byte) 0x30, (byte) 0x00, + (byte) 0x30, (byte) 0x00, (byte) 0x2e, (byte) 0x00, (byte) 0x31, (byte) 0x00, (byte) 0x30, (byte) 0x00, (byte) 0x30, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + // cbClientDir: 64 bytes (0x40, LE) (including the size of the mandatory NULL terminator) (byte) 0x40, (byte) 0x00, - + // Client directory: "C:\Windows\System32\mstscax.dll" (UCS2) - (byte) 0x43, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x5c, (byte) 0x00, (byte) 0x57, (byte) 0x00, - (byte) 0x69, (byte) 0x00, (byte) 0x6e, (byte) 0x00, (byte) 0x64, (byte) 0x00, (byte) 0x6f, (byte) 0x00, - (byte) 0x77, (byte) 0x00, (byte) 0x73, (byte) 0x00, (byte) 0x5c, (byte) 0x00, (byte) 0x53, (byte) 0x00, - (byte) 0x79, (byte) 0x00, (byte) 0x73, (byte) 0x00, (byte) 0x74, (byte) 0x00, (byte) 0x65, (byte) 0x00, - (byte) 0x6d, (byte) 0x00, (byte) 0x33, (byte) 0x00, (byte) 0x32, (byte) 0x00, (byte) 0x5c, (byte) 0x00, - (byte) 0x6d, (byte) 0x00, (byte) 0x73, (byte) 0x00, (byte) 0x74, (byte) 0x00, (byte) 0x73, (byte) 0x00, - (byte) 0x63, (byte) 0x00, (byte) 0x61, (byte) 0x00, (byte) 0x78, (byte) 0x00, (byte) 0x2e, (byte) 0x00, + (byte) 0x43, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x5c, (byte) 0x00, (byte) 0x57, (byte) 0x00, + (byte) 0x69, (byte) 0x00, (byte) 0x6e, (byte) 0x00, (byte) 0x64, (byte) 0x00, (byte) 0x6f, (byte) 0x00, + (byte) 0x77, (byte) 0x00, (byte) 0x73, (byte) 0x00, (byte) 0x5c, (byte) 0x00, (byte) 0x53, (byte) 0x00, + (byte) 0x79, (byte) 0x00, (byte) 0x73, (byte) 0x00, (byte) 0x74, (byte) 0x00, (byte) 0x65, (byte) 0x00, + (byte) 0x6d, (byte) 0x00, (byte) 0x33, (byte) 0x00, (byte) 0x32, (byte) 0x00, (byte) 0x5c, (byte) 0x00, + (byte) 0x6d, (byte) 0x00, (byte) 0x73, (byte) 0x00, (byte) 0x74, (byte) 0x00, (byte) 0x73, (byte) 0x00, + (byte) 0x63, (byte) 0x00, (byte) 0x61, (byte) 0x00, (byte) 0x78, (byte) 0x00, (byte) 0x2e, (byte) 0x00, (byte) 0x64, (byte) 0x00, (byte) 0x6c, (byte) 0x00, (byte) 0x6c, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + // // Client time zone: - + // Bias: 0 minutes (LE) (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + // Standard name: "EET, Standard Time" (fixed string: 64 bytes, UCS2) - (byte) 0x45, (byte) 0x00, (byte) 0x45, (byte) 0x00, (byte) 0x54, (byte) 0x00, (byte) 0x2c, (byte) 0x00, - (byte) 0x20, (byte) 0x00, (byte) 0x53, (byte) 0x00, (byte) 0x74, (byte) 0x00, (byte) 0x61, (byte) 0x00, - (byte) 0x6e, (byte) 0x00, (byte) 0x64, (byte) 0x00, (byte) 0x61, (byte) 0x00, (byte) 0x72, (byte) 0x00, - (byte) 0x64, (byte) 0x00, (byte) 0x20, (byte) 0x00, (byte) 0x54, (byte) 0x00, (byte) 0x69, (byte) 0x00, - (byte) 0x6d, (byte) 0x00, (byte) 0x65, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x45, (byte) 0x00, (byte) 0x45, (byte) 0x00, (byte) 0x54, (byte) 0x00, (byte) 0x2c, (byte) 0x00, + (byte) 0x20, (byte) 0x00, (byte) 0x53, (byte) 0x00, (byte) 0x74, (byte) 0x00, (byte) 0x61, (byte) 0x00, + (byte) 0x6e, (byte) 0x00, (byte) 0x64, (byte) 0x00, (byte) 0x61, (byte) 0x00, (byte) 0x72, (byte) 0x00, + (byte) 0x64, (byte) 0x00, (byte) 0x20, (byte) 0x00, (byte) 0x54, (byte) 0x00, (byte) 0x69, (byte) 0x00, + (byte) 0x6d, (byte) 0x00, (byte) 0x65, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + // // Standard date // wYear: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMonth: unknown (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wDayOfWeek: Sunday (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wDay: unknown (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wHour: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMinute: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wSecond: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMilliseconds: 0 (byte) 0x00, (byte) 0x00, - + // StandardBias: 0 minutes (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + // Daylight name: "EET, Summer Time" (fixed string: 64 bytes, UCS2) - (byte) 0x45, (byte) 0x00, (byte) 0x45, (byte) 0x00, (byte) 0x54, (byte) 0x00, (byte) 0x2c, (byte) 0x00, - (byte) 0x20, (byte) 0x00, (byte) 0x53, (byte) 0x00, (byte) 0x75, (byte) 0x00, (byte) 0x6d, (byte) 0x00, - (byte) 0x6d, (byte) 0x00, (byte) 0x65, (byte) 0x00, (byte) 0x72, (byte) 0x00, (byte) 0x20, (byte) 0x00, - (byte) 0x54, (byte) 0x00, (byte) 0x69, (byte) 0x00, (byte) 0x6d, (byte) 0x00, (byte) 0x65, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + (byte) 0x45, (byte) 0x00, (byte) 0x45, (byte) 0x00, (byte) 0x54, (byte) 0x00, (byte) 0x2c, (byte) 0x00, + (byte) 0x20, (byte) 0x00, (byte) 0x53, (byte) 0x00, (byte) 0x75, (byte) 0x00, (byte) 0x6d, (byte) 0x00, + (byte) 0x6d, (byte) 0x00, (byte) 0x65, (byte) 0x00, (byte) 0x72, (byte) 0x00, (byte) 0x20, (byte) 0x00, + (byte) 0x54, (byte) 0x00, (byte) 0x69, (byte) 0x00, (byte) 0x6d, (byte) 0x00, (byte) 0x65, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + // Daylight date // wYear: 0 (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, // wMonth: unknown (LE) (byte) 0x00, (byte) 0x00, // wDayOfWeek: Sunday (LE) @@ -423,19 +423,19 @@ public class ClientInfoPDU extends OneTimeSwitch { (byte) 0x00, (byte) 0x00, // wMilliseconds: 0 (byte) 0x00, (byte) 0x00, - + // Daylight bias: 60 minutes (LE) (byte) 0x3c, (byte) 0x00, (byte) 0x00, (byte) 0x00, - - + + // Client session ID: 0x00000000 (LE) - (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + // Performance flags: 0x7 (LE) = PERF_DISABLE_WALLPAPER (0x1), PERF_DISABLE_FULLWINDOWDRAG (0x2), PERF_DISABLE_MENUANIMATIONS (0x4) - (byte) 0x07, (byte) 0x00, (byte) 0x00, (byte) 0x00, - + (byte) 0x07, (byte) 0x00, (byte) 0x00, (byte) 0x00, + // cbAutoReconnectCookie: 0 bytes (LE) - (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, }; /* @formatter:on */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java index 10a7eff4bad..edd3f13bf0c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSAttachUserRequest.java @@ -68,14 +68,14 @@ public class ClientMCSAttachUserRequest extends OneTimeSwitch { 0x03, 0x00, 0x00, 0x08, // TPKT Header (length = 8 bytes) 0x02, (byte) 0xf0, (byte) 0x80, // X.224 Data TPDU - + // PER encoded (ALIGNED variant of BASIC-PER) PDU contents: - 0x28, - + 0x28, + // 0x28: // 0 - --\ // 0 - | - // 1 - | CHOICE: From DomainMCSPDU select attachUserRequest (10) + // 1 - | CHOICE: From DomainMCSPDU select attachUserRequest (10) // 0 - | of type AttachUserRequest // 1 - | // 0 - --/ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java index f0825397680..849f4e95df6 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs.java @@ -31,7 +31,7 @@ import streamer.PipelineImpl; * sent after receiving the MCS Channel Join Confirm PDU for the previous * request. Sending of the MCS Channel Join Request PDUs MUST continue until all * channels have been successfully joined. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240686.aspx */ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends OneTimeSwitch { @@ -85,11 +85,11 @@ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends One if (actualChannel != channels[channelRequestsSent - 1]) throw new RuntimeException("Unexpeceted channeld ID returned. Expected channeld ID: " + channels[channelRequestsSent - 1] + ", actual channel ID: " + actualChannel + ", data: " + buf + "."); - + state.channelJoined(actualChannel); - + buf.unref(); - + if (channelRequestsSent < channels.length) sendChannelRequest(channels[channelRequestsSent++]); @@ -119,7 +119,7 @@ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends One /** * Example. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240834.aspx */ public static void main(String args[]) { @@ -131,14 +131,14 @@ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends One byte[] clientRequestPacket = new byte[] { 0x03, 0x00, 0x00, 0x0c, // TPKT Header (length = 12 bytes) 0x02, (byte) 0xf0, (byte) 0x80, // X.224 Data TPDU - + // PER encoded (ALIGNED variant of BASIC-PER) PDU contents: - 0x38, 0x00, 0x03, 0x03, (byte) 0xef, + 0x38, 0x00, 0x03, 0x03, (byte) 0xef, // 0x38: // 0 - --\ // 0 - | - // 1 - | CHOICE: From DomainMCSPDU select channelJoinRequest (14) + // 1 - | CHOICE: From DomainMCSPDU select channelJoinRequest (14) // 1 - | of type ChannelJoinRequest // 1 - | // 0 - --/ @@ -147,22 +147,22 @@ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends One // 0x00: // 0 - --\ - // 0 - | - // 0 - | - // 0 - | - // 0 - | - // 0 - | - // 0 - | - // 0 - | + // 0 - | + // 0 - | + // 0 - | + // 0 - | + // 0 - | + // 0 - | + // 0 - | // | ChannelJoinRequest::initiator = 0x03 + 1001 = 1004 // 0x03: | - // 0 - | - // 0 - | - // 0 - | - // 0 - | - // 0 - | - // 1 - | - // 1 - | + // 0 - | + // 0 - | + // 0 - | + // 0 - | + // 0 - | + // 1 - | + // 1 - | // 0 - --/ // 0x03: @@ -185,20 +185,20 @@ public class ClientMCSChannelJoinRequest_ServerMCSChannelConfirmPDUs extends One // 1 - | // 1 - --/ }; - + byte[] serverResponsePacket = new byte[] { // MCS Channel Confirm - (byte)0x3e, - + (byte)0x3e, + // result: rt-successful (0) - (byte)0x00, - + (byte)0x00, + // Initiator: 1007 (6+1001) - (byte)0x00, (byte)0x06, - + (byte)0x00, (byte)0x06, + // Requested channel (byte)0x03, (byte)0xef, - + // Actual channel (byte)0x03, (byte)0xef, }; diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java index 01899877299..b7cf36cd9aa 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSConnectInitial.java @@ -50,23 +50,23 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { buf.writeBytes(new byte[] { // - T125: MCSConnect Initial // - MCSConnectInitial: Identifier=Generic Conference Control (0.0.20.124.0.1), ConnectPDULength=254 -// - ConnectInitialHeader: - (byte)0x7F, (byte)0x65, +// - ConnectInitialHeader: + (byte)0x7F, (byte)0x65, // - AsnId: Application Constructed Tag (101) -// - HighTag: +// - HighTag: // Class: (01......) Application (1) // Type: (..1.....) Constructed // TagNumber: (...11111) // TagValueEnd: 101 (0x65) - (byte)0x82, (byte)0x01, (byte)0x6C, + (byte)0x82, (byte)0x01, (byte)0x6C, // - AsnLen: Length = 364, LengthOfLength = 2 // LengthType: LengthOfLength = 2 // Length: 364 bytes - (byte)0x04, (byte)0x01, (byte)0x01, + (byte)0x04, (byte)0x01, (byte)0x01, // - CallingDomainSelector: 0x1 -// - AsnOctetStringHeader: +// - AsnOctetStringHeader: // - AsnId: OctetString type (Universal 4) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00100) 4 @@ -75,9 +75,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // OctetStream: 0x1 (byte)0x04, (byte)0x01, (byte)0x01, // - CalledDomainSelector: 0x1 -// - AsnOctetStringHeader: +// - AsnOctetStringHeader: // - AsnId: OctetString type (Universal 4) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00100) 4 @@ -86,9 +86,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // OctetStream: 0x1 (byte)0x01, (byte)0x01, (byte)0xFF, // - UpwardFlag: True -// - AsnBooleanHeader: +// - AsnBooleanHeader: // - AsnId: Boolean type (Universal 1) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00001) 1 @@ -98,20 +98,20 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // // - TargetParameters: Length = 26, LengthOfLength = 0 - (byte)0x30, (byte)0x1A, + (byte)0x30, (byte)0x1A, // - DomainParametersHeader: 0x1 // - AsnId: Sequence and SequenceOf types (Universal 16) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..1.....) Constructed // TagValue: (...10000) 16 // - AsnLen: Length = 26, LengthOfLength = 0 // Length: 26 bytes, LengthOfLength = 0 - (byte)0x02, (byte)0x01, (byte)0x22, + (byte)0x02, (byte)0x01, (byte)0x22, // - ChannelIds: 34 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -120,9 +120,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 34 (0x22) (byte)0x02, (byte)0x01, (byte)0x02, // - UserIDs: 2 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -131,9 +131,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 2 (0x2) (byte)0x02, (byte)0x01, (byte)0x00, // - TokenIds: 0 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -142,9 +142,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 0 (0x0) (byte)0x02, (byte)0x01, (byte)0x01, // - NumPriorities: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -153,9 +153,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 1 (0x1) (byte)0x02, (byte)0x01, (byte)0x00, // - MinThroughput: 0 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -164,9 +164,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 0 (0x0) (byte)0x02, (byte)0x01, (byte)0x01, // - Height: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -175,20 +175,20 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 1 (0x1) (byte)0x02, (byte)0x03, (byte)0x00, (byte)0xFF, (byte)0xFF, // - MCSPDUsize: 65535 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 3, LengthOfLength = 0 // Length: 3 bytes, LengthOfLength = 0 // AsnInt: 65535 (0xFFFF) - (byte)0x02, (byte)0x01, (byte)0x02, + (byte)0x02, (byte)0x01, (byte)0x02, // - protocolVersion: 2 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -196,12 +196,12 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 2 (0x2) -// +// // - MinimumParameters: Length = 25, LengthOfLength = 0 - (byte)0x30, (byte)0x19, + (byte)0x30, (byte)0x19, // - DomainParametersHeader: 0x1 // - AsnId: Sequence and SequenceOf types (Universal 16) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..1.....) Constructed // TagValue: (...10000) 16 @@ -209,9 +209,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // Length: 25 bytes, LengthOfLength = 0 (byte)0x02, (byte)0x01, (byte)0x01, // - ChannelIds: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -220,9 +220,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 1 (0x1) (byte)0x02, (byte)0x01, (byte)0x01, // - UserIDs: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -231,9 +231,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 1 (0x1) (byte)0x02, (byte)0x01, (byte)0x01, // - TokenIds: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -242,9 +242,9 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 1 (0x1) (byte)0x02, (byte)0x01, (byte)0x01, // - NumPriorities: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -253,42 +253,42 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 1 (0x1) (byte)0x02, (byte)0x01, (byte)0x00, // - MinThroughput: 0 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 1, LengthOfLength = 0 // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 0 (0x0) - (byte)0x02, (byte)0x01, (byte)0x01, + (byte)0x02, (byte)0x01, (byte)0x01, // - Height: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 1, LengthOfLength = 0 // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 1 (0x1) - (byte)0x02, (byte)0x02, (byte)0x04, (byte)0x20, + (byte)0x02, (byte)0x02, (byte)0x04, (byte)0x20, // - MCSPDUsize: 1056 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 2, LengthOfLength = 0 // Length: 2 bytes, LengthOfLength = 0 // AsnInt: 1056 (0x420) - (byte)0x02, (byte)0x01, (byte)0x02, + (byte)0x02, (byte)0x01, (byte)0x02, // - protocolVersion: 2 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -299,28 +299,28 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // - DomainParametersHeader: 0x1 (byte)0x30, (byte)0x1F, // - AsnId: Sequence and SequenceOf types (Universal 16) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..1.....) Constructed // TagValue: (...10000) 16 // - AsnLen: Length = 31, LengthOfLength = 0 // Length: 31 bytes, LengthOfLength = 0 - (byte)0x02, (byte)0x03, (byte)0x00, (byte)0xFF, (byte)0xFF, + (byte)0x02, (byte)0x03, (byte)0x00, (byte)0xFF, (byte)0xFF, // - ChannelIds: 65535 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 3, LengthOfLength = 0 // Length: 3 bytes, LengthOfLength = 0 // AsnInt: 65535 (0xFFFF) - (byte)0x02, (byte)0x02, (byte)0xFC, (byte)0x17, + (byte)0x02, (byte)0x02, (byte)0xFC, (byte)0x17, // - UserIDs: 64535 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -329,64 +329,64 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // AsnInt: 64535 (0xFC17) (byte)0x02, (byte)0x03, (byte)0x00, (byte)0xFF, (byte)0xFF, // - TokenIds: 65535 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 3, LengthOfLength = 0 // Length: 3 bytes, LengthOfLength = 0 // AsnInt: 65535 (0xFFFF) - (byte)0x02, (byte)0x01, (byte)0x01, + (byte)0x02, (byte)0x01, (byte)0x01, // - NumPriorities: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 1, LengthOfLength = 0 // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 1 (0x1) - (byte)0x02, (byte)0x01, (byte)0x00, + (byte)0x02, (byte)0x01, (byte)0x00, // - MinThroughput: 0 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 1, LengthOfLength = 0 // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 0 (0x0) - (byte)0x02, (byte)0x01, (byte)0x01, + (byte)0x02, (byte)0x01, (byte)0x01, // - Height: 1 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 1, LengthOfLength = 0 // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 1 (0x1) - (byte)0x02, (byte)0x03, (byte)0x00, (byte)0xFF, (byte)0xFF, + (byte)0x02, (byte)0x03, (byte)0x00, (byte)0xFF, (byte)0xFF, // - MCSPDUsize: 65535 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 // - AsnLen: Length = 3, LengthOfLength = 0 // Length: 3 bytes, LengthOfLength = 0 // AsnInt: 65535 (0xFFFF) - (byte)0x02, (byte)0x01, (byte)0x02, + (byte)0x02, (byte)0x01, (byte)0x02, // - protocolVersion: 2 -// - AsnIntegerHeader: +// - AsnIntegerHeader: // - AsnId: Integer type (Universal 2) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00010) 2 @@ -394,21 +394,21 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // Length: 1 bytes, LengthOfLength = 0 // AsnInt: 2 (0x2) // - UserData: Identifier=Generic Conference Contro (0.0.20.124.0.1), ConnectPDULength=254 -// - UserDataHeader: - (byte)0x04, (byte)0x82, (byte)0x01, (byte)0x07, +// - UserDataHeader: + (byte)0x04, (byte)0x82, (byte)0x01, (byte)0x07, // - AsnId: OctetString type (Universal 4) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00100) 4 // - AsnLen: Length = 263, LengthOfLength = 2 // LengthType: LengthOfLength = 2 // Length: 263 bytes - (byte)0x00, (byte)0x05, (byte)0x00, (byte)0x14, (byte)0x7C, (byte)0x00, (byte)0x01, + (byte)0x00, (byte)0x05, (byte)0x00, (byte)0x14, (byte)0x7C, (byte)0x00, (byte)0x01, // - AsnBerObjectIdentifier: Generic Conference Contro (0.0.20.124.0.1) -// - AsnObjectIdentifierHeader: +// - AsnObjectIdentifierHeader: // - AsnId: Reserved for use by the encoding rules (Universal 0) -// - LowTag: +// - LowTag: // Class: (00......) Universal (0) // Type: (..0.....) Primitive // TagValue: (...00000) 0 @@ -419,7 +419,7 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // Final: 124 (0x7C) // Final: 0 (0x0) // Final: 1 (0x1) - (byte)0x80, (byte)0xFE, + (byte)0x80, (byte)0xFE, // - ConnectPDULength: 254 // Align: No Padding // Length: 254 @@ -428,7 +428,7 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // ExtensionBit: 0 (0x0) // - ChoiceValue: conferenceCreateRequest // Value: (000.....) 0x0 -// - conferenceCreateRequest: +// - conferenceCreateRequest: // ExtensionBit: 0 (0x0) // convenerPasswordPresent: 0 (0x0) // passwordPresent: 0 (0x0) @@ -438,7 +438,7 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // conferenceDescriptionPresent: 0 (0x0) // callerIdentifierPresent: 0 (0x0) // userDataPresent: 1 (0x1) -// - conferenceName: +// - conferenceName: // ExtensionBit: 0 (0x0) // textPresent: 0 (0x0) // - numeric: 1 @@ -460,76 +460,76 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // ExtensionBit: 0 (0x0) // - RootIndex: 0 // Value: (0.......) 0x0 -// - userData: - (byte)0x00, (byte)0x01, +// - userData: + (byte)0x00, (byte)0x01, // - Size: 1 // - Align: No Padding // Padding7: (0000000.) 0x0 // Length: 1 // - UserData: 0x44756361 - (byte)0xC0, (byte)0x00, (byte)0x44, (byte)0x75, (byte)0x63, (byte)0x61, + (byte)0xC0, (byte)0x00, (byte)0x44, (byte)0x75, (byte)0x63, (byte)0x61, // valuePresent: 1 (0x1) // - key: h221NonStandard "Duca" // - ChoiceValue: h221NonStandard // Value: (1.......) 0x1 -// - h221NonStandard: +// - h221NonStandard: // - H221NonStandardIdentifier: length: 4 // - ConstrainedLength: 4 // Value: (00000000) 0x0 // - Align: No Padding // Padding6: (000000..) 0x0 // Value: Binary Large Object (4 Bytes) "Duca" -// - ClientMcsConnectInitialPdu: - (byte)0x80, (byte)0xF0, +// - ClientMcsConnectInitialPdu: + (byte)0x80, (byte)0xF0, // - RDPGCCUserDataRequestLength: 240 // Align: No Padding // Length: 240 // - TsUd: CS_CORE - (byte)0x01, (byte)0xC0, (byte)0xD8, (byte)0x00, + (byte)0x01, (byte)0xC0, (byte)0xD8, (byte)0x00, // - TsUdHeader: Type = CS_CORE, Length = 216 // Type: CS_CORE // Length: 216 (0xD8) -// - TsUdCsCore: - (byte)0x04, (byte)0x00, (byte)0x08, (byte)0x00, -// Version: RDP 5.0, 5.1, 5.2, 6.0, 6.1, and 7.0 - (byte)0x00, (byte)0x04, +// - TsUdCsCore: + (byte)0x04, (byte)0x00, (byte)0x08, (byte)0x00, +// Version: RDP 5.0, 5.1, 5.2, 6.0, 6.1, and 7.0 + (byte)0x00, (byte)0x04, // DesktopWidth: 1024 (0x400) - (byte)0x00, (byte)0x03, + (byte)0x00, (byte)0x03, // DesktopHeight: 768 (0x300) - (byte)0x01, (byte)0xCA, + (byte)0x01, (byte)0xCA, // ColorDepth: 8 bpp - (byte)0x03, (byte)0xAA, + (byte)0x03, (byte)0xAA, // SASSequence: 0xaa03, SHOULD be set to RNS_UD_SAS_DEL(0xAA03) - (byte)0x09, (byte)0x04, (byte)0x00, (byte)0x00, + (byte)0x09, (byte)0x04, (byte)0x00, (byte)0x00, // KeyboardLayout: Language: English, Location: United States - (byte)0x28, (byte)0x0A, (byte)0x00, (byte)0x00, + (byte)0x28, (byte)0x0A, (byte)0x00, (byte)0x00, // ClientBuild: 2600 (0xA28) - (byte)0x61, (byte)0x00, (byte)0x70, (byte)0x00, (byte)0x6F, (byte)0x00, (byte)0x6C, (byte)0x00, (byte)0x6C, (byte)0x00, (byte)0x6F, (byte)0x00, (byte)0x33, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x61, (byte)0x00, (byte)0x70, (byte)0x00, (byte)0x6F, (byte)0x00, (byte)0x6C, (byte)0x00, (byte)0x6C, (byte)0x00, (byte)0x6F, (byte)0x00, (byte)0x33, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // ClientName: apollo3 - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // KeyboardType: Undefined value: 0 - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // KeyboardSubType: 0 (0x0) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // KeyboardFunctionKey: 0 (0x0) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, -// ImeFileName: - (byte)0x01, (byte)0xCA, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, +// ImeFileName: + (byte)0x01, (byte)0xCA, // PostBeta2ColorDepth: 8 bpp - (byte)0x01, (byte)0x00, + (byte)0x01, (byte)0x00, // ClientProductId: 0x1, SHOULD be set to initialized to 1 - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, // SerialNumber: 0x0, SHOULD be set to 0 - (byte)0x10, (byte)0x00, + (byte)0x10, (byte)0x00, // HighColorDepth: 16-bit 565 RGB - (byte)0x07, (byte)0x00, + (byte)0x07, (byte)0x00, // - SupportedColorDepth: 7 (0x7) // Support24BPP: (...............1) Support 24BPP // Support16BPP: (..............1.) Support 16BPP // Support15BPP: (.............1..) Support 15BPP // Support32BPP: (............0...) Not Support 32BPP // Reserved: (000000000000....) - (byte)0x01, (byte)0x00, + (byte)0x01, (byte)0x00, // - EarlyCapabilityFlags: 1 (0x1) // SupportSetErrorPdu: (...............1) Indicates that the client supports the Set Error Info PDU // Want32BppSession: (..............0.) Client is not requesting 32BPP session @@ -539,23 +539,23 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // ValidConnection: (..........0.....) Not Indicates ConnectionType field contains valid data // SupportMonitorLayoutPdu: (.........0......) Not Indicates that the client supports the Monitor Layout PDU // Unused2: (000000000.......) - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, -// ClientDigProductId: -(byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, +// ClientDigProductId: +(byte)0x00, // connectionType: invalid connection type -(byte)0x00, +(byte)0x00, // pad1octet: 0 (0x0) -(byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00, +(byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00, // ServerSelectedProtocols: TLS 1.0 // // - TsUd: CS_CLUSTER // - TsUdHeader: Type = CS_CLUSTER, Length = 12 -(byte)0x04, (byte)0xC0, +(byte)0x04, (byte)0xC0, // Type: CS_CLUSTER -(byte)0x0C, (byte)0x00, +(byte)0x0C, (byte)0x00, // Length: 12 (0xC) (byte)0x0D, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, -// - TsUdCsCluster: +// - TsUdCsCluster: // - Flags: 13 (0xD) // RedirectedSupported: (...............................1) Support Redirected // SessionIDFieldValid: (..............................0.) SessionID Field not Valid @@ -566,23 +566,23 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { // // - TsUd: CS_SECURITY // - TsUdHeader: Type = CS_SECURITY, Length = 12 -(byte)0x02, (byte)0xC0, +(byte)0x02, (byte)0xC0, // Type: CS_SECURITY -(byte)0x0C, (byte)0x00, +(byte)0x0C, (byte)0x00, // Length: 12 (0xC) -// -// - TsUdCsSec: -(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, -// - EncryptionMethod: -// Support40Bit: (...............................0) Not Support +// +// - TsUdCsSec: +(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, +// - EncryptionMethod: +// Support40Bit: (...............................0) Not Support // Support128Bit: (..............................0.) Not Support 128-bit // Reserved1: (.............................0..) // Support56Bit: (............................0...) Not Support 56-bit // SupportFIPS: (...........................0....) Not Support FIPS Compliant // Reserved2: (000000000000000000000000000.....) -(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, -// - ExtEncryptionMethod: -// Support40Bit: (...............................0) Not Support +(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, +// - ExtEncryptionMethod: +// Support40Bit: (...............................0) Not Support // Support128Bit: (..............................0.) Not Support 128-bit // Reserved1: (.............................0..) // Support56Bit: (............................0...) Not Support 56-bit @@ -600,7 +600,7 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { /** * Example. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240836.aspx */ public static void main(String args[]) { @@ -611,17 +611,17 @@ public class ClientMCSConnectInitial extends OneTimeSwitch { /* @formatter:off */ byte[] packet = new byte[] { // TPKT: TPKT version = 3 - (byte) 0x03, (byte) 0x00, + (byte) 0x03, (byte) 0x00, // TPKT: Packet length: 378 bytes - (byte) 0x01, (byte) 0x78, - + (byte) 0x01, (byte) 0x78, + // X.224: Length indicator = 2 - (byte) 0x02, + (byte) 0x02, // X.224: Type: Data TPDU - (byte) 0xf0, + (byte) 0xf0, // X.224: EOT - (byte) 0x80, - + (byte) 0x80, + // Captured packet (byte)0x7f, (byte)0x65, (byte)0x82, (byte)0x01, (byte)0x6c, (byte)0x04, (byte)0x01, (byte)0x01, (byte)0x04, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0xff, (byte)0x30, (byte)0x1a, (byte)0x02, (byte)0x01, (byte)0x22, (byte)0x02, (byte)0x01, (byte)0x02, (byte)0x02, (byte)0x01, (byte)0x00, diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java index 4a0fd0413a9..6b891c02f9a 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientMCSErectDomainRequest.java @@ -50,16 +50,16 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { ByteBuffer buf = new ByteBuffer(length, true); buf.writeByte(0x04); // Erect Domain Request - + // Client SHOULD initialize both the subHeight and subinterval fields of the MCS Erect Domain Request PDU to zero. - + buf.writeByte(1); // ErectDomainRequest::subHeight length = 1 byte buf.writeByte(0); // ErectDomainRequest::subHeight - + buf.writeByte(1); // ErectDomainRequest::subInterval length = 1 byte buf.writeByte(0); // ErectDomainRequest::subInterval - - + + pushDataToOTOut(buf); switchOff(); @@ -79,20 +79,20 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { 0x03, 0x00, 0x00, 0x0c, // TPKT Header (length = 12 bytes) 0x02, (byte) 0xf0, (byte) 0x80, // X.224 Data TPDU - + // PER encoded (ALIGNED variant of BASIC-PER) PDU contents: 0x04, 0x01, 0x00, 0x01, 0x00, - + // 0x04: // 0 - --\ // 0 - | - // 0 - | CHOICE: From DomainMCSPDU select erectDomainRequest (1) + // 0 - | CHOICE: From DomainMCSPDU select erectDomainRequest (1) // 0 - | of type ErectDomainRequest // 0 - | // 1 - --/ // 0 - padding // 0 - padding - + // 0x01: // 0 - --\ // 0 - | @@ -102,7 +102,7 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { // 0 - | // 0 - | // 1 - --/ - + // 0x00: // 0 - --\ // 0 - | @@ -112,7 +112,7 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { // 0 - | // 0 - | // 0 - --/ - + // 0x01: // 0 - --\ // 0 - | @@ -122,7 +122,7 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { // 0 - | // 0 - | // 1 - --/ - + // 0x00: // 0 - --\ // 0 - | @@ -133,7 +133,7 @@ public class ClientMCSErectDomainRequest extends OneTimeSwitch { // 0 - | // 0 - --/ - + }; /* @formatter:on */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java index 651d002af7e..fbf4d46bf54 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientPacketSniffer.java @@ -36,7 +36,7 @@ public class ClientPacketSniffer extends PacketSniffer { new Pair("Client SynchronizePDU", "03 00 XX XX 02 F0 80 64 00 03 03 EB 70 XX XX XX XX 17 00 EC 03 EA 03 XX 00 XX XX XX XX 1F"), new Pair("Client ControlPDU", "03 00 XX XX 02 F0 80 64 00 03 03 EB 70 XX XX XX XX 17 00 EC 03 EA 03 XX 00 XX XX XX XX 14"), new Pair("Client FontListPDU", "03 00 XX XX 02 F0 80 64 00 03 03 EB 70 XX XX XX XX 17 00 EC 03 EA 03 XX 00 XX XX XX XX 27"), - new Pair("Client BitmapCachePersistentList","03 00 XX XX 02 F0 80 64 00 03 03 EB 70 XX XX XX XX 17 00 EC 03 EA 03 XX XX XX XX XX XX 2b"), + new Pair("Client BitmapCachePersistentList","03 00 XX XX 02 F0 80 64 00 03 03 EB 70 XX XX XX XX 17 00 EC 03 EA 03 XX XX XX XX XX XX 2b"), // new Pair("Client TPKT Unknown packet", "03"), // new Pair("Client UNKNOWN PACKET (ERROR)", ".*"), // @formatter:on diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java index 9631976c848..b6a42479418 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientSynchronizePDU.java @@ -58,16 +58,16 @@ public class ClientSynchronizePDU extends OneTimeSwitch { // Channel ID: 1003 (I/O Channel) (byte)0x03, (byte)0xeb, // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - (byte)0x70, + (byte)0x70, // Data length: 22 bytes (0x16, variable length field) - (byte)0x80, (byte)0x16, - + (byte)0x80, (byte)0x16, + // RDP: total length: 22 bytes (LE) - (byte)0x16, (byte)0x00, - + (byte)0x16, (byte)0x00, + // PDU type: PDUTYPE_DATAPDU (0x7), TS_PROTOCOL_VERSION (0x10) (LE) (byte)0x17, (byte)0x00, - + // PDU source: 1007 (LE) (byte)0xec, (byte)0x03, // Share ID: 0x000103ea (LE) @@ -75,17 +75,17 @@ public class ClientSynchronizePDU extends OneTimeSwitch { // Padding: 1 byte (byte)0x00, // Stream ID: STREAM_LOW (1) - (byte)0x01, + (byte)0x01, // uncompressedLength : 8 bytes (LE) (byte)0x08, (byte)0x00, // pduType2 = PDUTYPE2_SYNCHRONIZE (31) - (byte)0x1f, + (byte)0x1f, // generalCompressedType: 0 (byte)0x00, // generalCompressedLength: 0 (LE?) (byte)0x00, (byte)0x00, // messageType: SYNCMSGTYPE_SYNC (1) (LE) - (byte)0x01, (byte)0x00, + (byte)0x01, (byte)0x00, // targetUser: 0x03ea (byte)0xea, (byte)0x03, }); @@ -101,7 +101,7 @@ public class ClientSynchronizePDU extends OneTimeSwitch { /** * Example. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240841.aspx */ public static void main(String args[]) { @@ -115,9 +115,9 @@ public class ClientSynchronizePDU extends OneTimeSwitch { (byte)0x03, (byte)0x00, // TPKT length: 37 bytes (byte)0x00, (byte)0x25, - // X224 Data PDU + // X224 Data PDU (byte)0x02, (byte)0xf0, (byte)0x80, - + // MCS send data request (byte)0x64, // Initiator: 1004 (1001+3) @@ -125,12 +125,12 @@ public class ClientSynchronizePDU extends OneTimeSwitch { // Channel ID: 1003 (I/O Channel) (byte)0x03, (byte)0xeb, // Data priority: high (0x40), segmentation: begin (0x20) | end (0x10) - (byte)0x70, + (byte)0x70, // Data length: 22 bytes (0x16, variable length field) - (byte)0x80, (byte)0x16, - + (byte)0x80, (byte)0x16, + // RDP: total length: 22 bytes (LE) - (byte)0x16, (byte)0x00, + (byte)0x16, (byte)0x00, // PDU type: PDUTYPE_DATAPDU (0x7), TS_PROTOCOL_VERSION (0x10) (LE) (byte)0x17, (byte)0x00, // PDU source: 1007 (LE) @@ -140,20 +140,20 @@ public class ClientSynchronizePDU extends OneTimeSwitch { // Padding: 1 byte (byte)0x00, // Stream ID: STREAM_LOW (1) - (byte)0x01, + (byte)0x01, // uncompressedLength : 8 bytes (LE) (byte)0x08, (byte)0x00, // pduType2 = PDUTYPE2_SYNCHRONIZE (31) - (byte)0x1f, + (byte)0x1f, // generalCompressedType: 0 (byte)0x00, // generalCompressedLength: 0 (LE?) (byte)0x00, (byte)0x00, // messageType: SYNCMSGTYPE_SYNC (1) (LE) - (byte)0x01, (byte)0x00, + (byte)0x01, (byte)0x00, // targetUser: 0x03ea (byte)0xea, (byte)0x03, - + }; /* @formatter:on */ @@ -176,7 +176,7 @@ public class ClientSynchronizePDU extends OneTimeSwitch { /* * @formatting:off - * 03 00 00 25 02 F0 80 64 00 03 03 EB 70 80 16 16 00 17 00 EC 03 EA 03 01 00 00 01 08 00 1F 00 00 00 01 00 EA 03 + * 03 00 00 25 02 F0 80 64 00 03 03 EB 70 80 16 16 00 17 00 EC 03 EA 03 01 00 00 01 08 00 1F 00 00 00 01 00 EA 03 Frame: Number = 40, Captured Frame Length = 94, MediaType = DecryptedPayloadHeader + DecryptedPayloadHeader: FrameCount = 1, ErrorStatus = SUCCESS @@ -219,7 +219,7 @@ public class ClientSynchronizePDU extends OneTimeSwitch { Length: 22 RDP: RDPBCGR - RDPBCGR: SynchronizePDU - - SlowPathPacket: SynchronizePDU + - SlowPathPacket: SynchronizePDU - SlowPath: Type = TS_PDUTYPE_DATAPDU - TsShareControlHeader: Type = TS_PDUTYPE_DATAPDU TotalLength: 22 (0x16) diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java index 48ac08933e6..641ed02aa65 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224ConnectionRequestPDU.java @@ -106,7 +106,7 @@ public class ClientX224ConnectionRequestPDU extends OneTimeSwitch { /** * Example. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240842.aspx * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java index 2cf9b72612c..d792ccd8fe2 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ClientX224DataPdu.java @@ -28,7 +28,7 @@ public class ClientX224DataPdu extends BaseElement { public ClientX224DataPdu(String id) { super(id); } - + @Override public void handleData(ByteBuffer buf, Link link) { if (buf == null) diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java index 9fe2499ebc5..516c1fd137c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/PacketSniffer.java @@ -64,7 +64,7 @@ public class PacketSniffer extends BaseElement { } private static String replaceShortcuts(String regexp) { - String result = regexp; + String result = regexp; result = result.replaceAll("XX\\*", "([0-9a-fA-F]{2} )*?"); result = result.replaceAll("XX\\?", "([0-9a-fA-F]{2} )?"); result = result.replaceAll("XX", "[0-9a-fA-F]{2}"); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java index 53e6d2f3bb0..60060fbe96b 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RLEBitmapDecompression.java @@ -58,7 +58,7 @@ public class RLEBitmapDecompression { /** * Writes a pixel to the specified buffer and advance cursor by bpp. - * + * * @param bpp * bytes per pixel */ @@ -85,7 +85,7 @@ public class RLEBitmapDecompression { /** * Reads a pixel from the specified buffer at given offset without changing of * cursor. - * + * * @param bpp * bytes per pixel * @param offset @@ -123,7 +123,7 @@ public class RLEBitmapDecompression { /** * Reads a pixel from the specified buffer and advance cursor by bpp value. - * + * * @param bpp * bytes per pixel */ @@ -315,7 +315,7 @@ public class RLEBitmapDecompression { /** * Decompress a RLE compressed bitmap and flip decompressed image. - * + * * @param srcBuf * source buffer containing compressed bitmap * @param imageWidth @@ -339,7 +339,7 @@ public class RLEBitmapDecompression { /** * Decompress a RLE compressed bitmap. - * + * * @param srcBuf * source buffer containing compressed bitmap * @param destBuf diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java index 1e3646a9ac4..d0eef73942e 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpConstants.java @@ -24,26 +24,26 @@ public interface RdpConstants { * Default charset to use when communicating with server using 8 bit strings. */ public static final Charset CHARSET_8 = Charset.availableCharsets().get("US-ASCII"); - + /** * Default charset to use when communicating with server using 16 bit strings. */ public static final Charset CHARSET_16 = Charset.availableCharsets().get("UTF-16LE"); - + /** * Negotiate SSL protocol to use to protect RDP connection. - * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx + * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx */ public static final int RDP_NEG_REQ_PROTOCOL_SSL = 1; - + /** * Negotiate CredSSP protocol to use to protect RDP connection. - * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx + * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx * When used, client must set @see RDP_NEG_REQ_PROTOCOL_SSL too. */ public static final int RDP_NEG_REQ_PROTOCOL_HYBRID = 2; - + /** * RDP negotiation: flags (not used, always 0). */ @@ -53,20 +53,20 @@ public interface RdpConstants { * RDP Negotiation: request. */ public static final int RDP_NEG_REQ_TYPE_NEG_REQ = 1; - + /** * RDP Negotiation: response. */ public static final int RDP_NEG_REQ_TYPE_NEG_RSP = 2; - + /** * RDP Negotiation: failure. */ public static final int RDP_NEG_REQ_TYPE_NEG_FAILURE = 3; - + public static final int CHANNEL_IO = 1003; - + public static final int CHANNEL_RDPRDR = 1004; diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java index c85972de7da..aa9d62a6d37 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpState.java @@ -20,12 +20,12 @@ import java.util.HashSet; import java.util.Set; public class RdpState { - + public long serverShareId; public int serverUserChannelId; public Set channels=new HashSet(); - + public void channelJoined(int actualChannel) { channels.add(actualChannel); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java index fdad522a269..3e72d4c65f5 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerChannel1003Router.java @@ -458,7 +458,7 @@ public class ServerChannel1003Router extends BaseElement { /** * Example. - * + * */ public static void main(String args[]) { // System.setProperty("streamer.Link.debug", "true"); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java index f2d3d368f00..2bfedc7f701 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUCooperate.java @@ -33,7 +33,7 @@ public class ServerControlPDUCooperate extends OneTimeSwitch { if (verbose) System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - + // Ignore packet buf.unref(); switchOff(); @@ -43,7 +43,7 @@ public class ServerControlPDUCooperate extends OneTimeSwitch { /* @formatter:off */ /* -03 00 00 28 02 F0 80 68 00 01 03 EB 70 1A 1A 00 17 00 EA 03 EA 03 01 00 9A 02 1A 00 14 00 00 00 04 00 00 00 00 00 00 00 +03 00 00 28 02 F0 80 68 00 01 03 EB 70 1A 1A 00 17 00 EA 03 EA 03 01 00 9A 02 1A 00 14 00 00 00 04 00 00 00 00 00 00 00 Frame: Number = 38, Captured Frame Length = 97, MediaType = DecryptedPayloadHeader @@ -87,7 +87,7 @@ public class ServerControlPDUCooperate extends OneTimeSwitch { Length: 26 RDP: RDPBCGR - RDPBCGR: TsControlPDU - - SlowPathPacket: TsControlPDU + - SlowPathPacket: TsControlPDU - SlowPath: Type = TS_PDUTYPE_DATAPDU - TsShareControlHeader: Type = TS_PDUTYPE_DATAPDU TotalLength: 26 (0x1A) diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java index e050e8a8ae8..eee6f688d75 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerControlPDUGrantedControl.java @@ -33,7 +33,7 @@ public class ServerControlPDUGrantedControl extends OneTimeSwitch { if (verbose) System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - + // Ignore packet buf.unref(); switchOff(); @@ -42,7 +42,7 @@ public class ServerControlPDUGrantedControl extends OneTimeSwitch { } /* @formatter:off */ /* -03 00 00 28 02 F0 80 68 00 01 03 EB 70 1A 1A 00 17 00 EA 03 EA 03 01 00 50 02 1A 00 14 00 00 00 02 00 EC 03 EA 03 00 00 +03 00 00 28 02 F0 80 68 00 01 03 EB 70 1A 1A 00 17 00 EA 03 EA 03 01 00 50 02 1A 00 14 00 00 00 02 00 EC 03 EA 03 00 00 Frame: Number = 45, Captured Frame Length = 97, MediaType = DecryptedPayloadHeader + DecryptedPayloadHeader: FrameCount = 1, ErrorStatus = SUCCESS @@ -85,7 +85,7 @@ public class ServerControlPDUGrantedControl extends OneTimeSwitch { Length: 26 RDP: RDPBCGR - RDPBCGR: TsControlPDU - - SlowPathPacket: TsControlPDU + - SlowPathPacket: TsControlPDU - SlowPath: Type = TS_PDUTYPE_DATAPDU - TsShareControlHeader: Type = TS_PDUTYPE_DATAPDU TotalLength: 26 (0x1A) diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java index 9ce87d31881..298f03c7f05 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerDemandActivePDU.java @@ -386,7 +386,7 @@ public class ServerDemandActivePDU extends BaseElement { /** * Example. - * + * */ public static void main(String args[]) { // System.setProperty("streamer.Link.debug", "true"); @@ -411,16 +411,16 @@ public class ServerDemandActivePDU extends BaseElement { // Share Capability Set (8 bytes) // 0x09, 0x00, 0x08, 0x00, (byte) 0xea, 0x03, (byte) 0xdc, (byte) 0xe2, - // + // 0x09, 0x00, // TS_SHARE_CAPABILITYSET::capabilitySetType = CAPSTYPE_SHARE (9) 0x08, 0x00, // TS_SHARE_CAPABILITYSET::lengthCapability = 8 bytes (byte) 0xea, 0x03, // TS_SHARE_CAPABILITYSET::nodeID = 0x03ea (1002) (byte) 0xdc, (byte) 0xe2, // TS_SHARE_CAPABILITYSET::pad2octets // General Capability Set (24 bytes) - // 0x01, 0x00, 0x18, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x04, - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, - // + // 0x01, 0x00, 0x18, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x04, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, + // 0x01, 0x00, // TS_GENERAL_CAPABILITYSET::capabilitySetType = CAPSTYPE_GENERAL (1) 0x18, 0x00, // TS_GENERAL_CAPABILITYSET::lengthCapability = 24 bytes @@ -438,18 +438,18 @@ public class ServerDemandActivePDU extends BaseElement { 0x01, // TS_GENERAL_CAPABILITYSET::suppressOutputSupport = TRUE // Virtual Channel Capability Set (8 bytes) - // 0x14, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, - // + // 0x14, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, + // 0x14, 0x00, // TS_VIRTUALCHANNEL_CAPABILITYSET::capabilitySetType = CAPSTYPE_VIRTUALCHANNEL (20) 0x08, 0x00, // TS_VIRTUALCHANNEL_CAPABILITYSET::lengthCapability = 8 bytes 0x02, 0x00, 0x00, 0x00, // TS_VIRTUALCHANNEL_CAPABILITYSET::vccaps1 = 0x00000002 = VCCAPS_COMPR_CS_8K // DrawGdiPlus Capability Set (40 bytes) - // 0x16, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, (byte) 0xf6, 0x13, (byte) 0xf3, 0x01, 0x00, 0x00, 0x00, - // 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, (byte) 0x9c, (byte) 0xf6, 0x13, (byte) 0xf3, 0x61, (byte) 0xa6, (byte) 0x82, (byte) 0x80, - // 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, (byte) 0x91, (byte) 0xbf, - // + // 0x16, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, (byte) 0xf6, 0x13, (byte) 0xf3, 0x01, 0x00, 0x00, 0x00, + // 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, (byte) 0x9c, (byte) 0xf6, 0x13, (byte) 0xf3, 0x61, (byte) 0xa6, (byte) 0x82, (byte) 0x80, + // 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, (byte) 0x91, (byte) 0xbf, + // 0x16, 0x00, // TS_DRAW_GDIPLUS_CAPABILITYSET::capabilitySetType = CAPSTYPE_DRAWGDIPLUS (22) 0x28, 0x00, // TS_DRAW_GDIPLUS_CAPABILITYSET::lengthCapability = 40 bytes @@ -481,9 +481,9 @@ public class ServerDemandActivePDU extends BaseElement { // Bitmap Capability Set (28 bytes) - // 0x02, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, - // 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - // + // 0x02, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, + // 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + // 0x02, 0x00, // TS_BITMAP_CAPABILITYSET::capabilitySetType = CAPSTYPE_BITMAP (2) 0x1c, 0x00, // TS_BITMAP_CAPABILITYSET::lengthCapability = 28 bytes @@ -502,13 +502,13 @@ public class ServerDemandActivePDU extends BaseElement { 0x00, 0x00, // TS_BITMAP_CAPABILITYSET::pad2octetsB // Order Capability Set (88 bytes) - // 0x03, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - // 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x01, 0x00, - // 0x00, 0x00, 0x22, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, - // 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, - // 0x00, 0x00, 0x00, 0x00, (byte) 0xa1, 0x06, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x40, 0x42, 0x0f, 0x00, - // 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - // + // 0x03, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x01, 0x00, + // 0x00, 0x00, 0x22, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, + // 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, + // 0x00, 0x00, 0x00, 0x00, (byte) 0xa1, 0x06, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x40, 0x42, 0x0f, 0x00, + // 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x03, 0x00, // TS_ORDER_CAPABILITYSET::capabilitySetType = CAPSTYPE_ORDER (3) 0x58, 0x00, // TS_ORDER_CAPABILITYSET::lengthCapability = 88 bytes @@ -521,7 +521,7 @@ public class ServerDemandActivePDU extends BaseElement { 0x01, 0x00, // TS_ORDER_CAPABILITYSET::maximumOrderLevel = ORD_LEVEL_1_ORDERS (1) 0x00, 0x00, // TS_ORDER_CAPABILITYSET::numberFonts = 0 - 0x22, 0x00, // TS_ORDER_CAPABILITYSET::orderFlags = 0x0022 = 0x0020 | 0x0002 = COLORINDEXSUPPORT | NEGOTIATEORDERSUPPORT + 0x22, 0x00, // TS_ORDER_CAPABILITYSET::orderFlags = 0x0022 = 0x0020 | 0x0002 = COLORINDEXSUPPORT | NEGOTIATEORDERSUPPORT 0x01, // TS_ORDER_CAPABILITYSET::orderSupport[TS_NEG_DSTBLT_INDEX] = TRUE 0x01, // TS_ORDER_CAPABILITYSET::orderSupport[TS_NEG_PATBLT_INDEX] = TRUE @@ -568,8 +568,8 @@ public class ServerDemandActivePDU extends BaseElement { 0x00, 0x00, // TS_ORDER_CAPABILITYSET::pad2octetsE // Color Table Cache Capability Set (8 bytes) - // 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00, 0x00, - // + // 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00, 0x00, + // 0x0a, 0x00, // TS_COLORTABLECACHE_CAPABILITYSET::capabilitySetType = CAPSTYPE_COLORCACHE (10) 0x08, 0x00, // TS_COLORTABLECACHE_CAPABILITYSET::lengthCapability = 8 bytes @@ -577,8 +577,8 @@ public class ServerDemandActivePDU extends BaseElement { 0x00, 0x00, // TS_COLORTABLECACHE_CAPABILITYSET::pad2octets // Bitmap Cache Host Support Capability Set (8 bytes) - // 0x12, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, - // + // 0x12, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + // 0x12, 0x00, // TS_BITMAPCACHE_CAPABILITYSET_HOSTSUPPORT::capabilitySetType = CAPSTYPE_BITMAPCACHE_HOSTSUPPORT (18) 0x08, 0x00, // TS_BITMAPCACHE_CAPABILITYSET_HOSTSUPPORT::lengthCapability = 8 bytes @@ -587,8 +587,8 @@ public class ServerDemandActivePDU extends BaseElement { 0x00, 0x00, // TS_BITMAPCACHE_CAPABILITYSET_HOSTSUPPORT::Pad2 // Pointer Capability Set (10 bytes) - // 0x08, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, 0x19, 0x00, - // + // 0x08, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, 0x19, 0x00, + // 0x08, 0x00, // TS_POINTER_CAPABILITYSET::capabilitySetType = CAPSTYPE_POINTER (8) 0x0a, 0x00, // TS_POINTER_CAPABILITYSET::lengthCapability = 10 bytes @@ -597,13 +597,13 @@ public class ServerDemandActivePDU extends BaseElement { 0x19, 0x00, // TS_POINTER_CAPABILITYSET::pointerCacheSize = 25 // Input Capability Set (88 bytes) - // 0x0d, 0x00, 0x58, 0x00, 0x35, 0x00, 0x00, 0x00, (byte) 0xa1, 0x06, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, - // 0x0c, (byte) 0xf6, 0x13, (byte) 0xf3, (byte) 0x93, 0x5a, 0x37, (byte) 0xf3, 0x00, (byte) 0x90, 0x30, (byte) 0xe1, 0x34, 0x1c, 0x38, (byte) 0xf3, - // 0x40, (byte) 0xf6, 0x13, (byte) 0xf3, 0x04, 0x00, 0x00, 0x00, 0x4c, 0x54, (byte) 0xdc, (byte) 0xe2, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, - // 0x01, 0x00, 0x00, 0x00, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, 0x00, 0x00, 0x00, 0x00, 0x38, (byte) 0xf6, 0x13, (byte) 0xf3, - // 0x2e, 0x05, 0x38, (byte) 0xf3, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, 0x2c, (byte) 0xf6, 0x13, (byte) 0xf3, 0x00, 0x00, 0x00, 0x00, + // 0x0d, 0x00, 0x58, 0x00, 0x35, 0x00, 0x00, 0x00, (byte) 0xa1, 0x06, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, + // 0x0c, (byte) 0xf6, 0x13, (byte) 0xf3, (byte) 0x93, 0x5a, 0x37, (byte) 0xf3, 0x00, (byte) 0x90, 0x30, (byte) 0xe1, 0x34, 0x1c, 0x38, (byte) 0xf3, + // 0x40, (byte) 0xf6, 0x13, (byte) 0xf3, 0x04, 0x00, 0x00, 0x00, 0x4c, 0x54, (byte) 0xdc, (byte) 0xe2, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, + // 0x01, 0x00, 0x00, 0x00, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, 0x00, 0x00, 0x00, 0x00, 0x38, (byte) 0xf6, 0x13, (byte) 0xf3, + // 0x2e, 0x05, 0x38, (byte) 0xf3, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, 0x2c, (byte) 0xf6, 0x13, (byte) 0xf3, 0x00, 0x00, 0x00, 0x00, // 0x08, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, - // + // 0x0d, 0x00, // TS_INPUT_CAPABILITYSET::capabilitySetType = CAPSTYPE_INPUT (13) 0x58, 0x00, // TS_INPUT_CAPABILITYSET::lengthCapability = 88 bytes @@ -616,21 +616,21 @@ public class ServerDemandActivePDU extends BaseElement { (byte) 0x93, 0x5a, 0x37, (byte) 0xf3, // TS_INPUT_CAPABILITYSET::keyboardFunctionKey (not initialized by server) // TS_INPUT_CAPABILITYSET::imeFileName (not initialized by server) - 0x00, (byte) 0x90, 0x30, (byte) 0xe1, 0x34, 0x1c, 0x38, (byte) 0xf3, 0x40, (byte) 0xf6, 0x13, (byte) 0xf3, 0x04, 0x00, 0x00, 0x00, - 0x4c, 0x54, (byte) 0xdc, (byte) 0xe2, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, 0x01, 0x00, 0x00, 0x00, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, - 0x00, 0x00, 0x00, 0x00, 0x38, (byte) 0xf6, 0x13, (byte) 0xf3, 0x2e, 0x05, 0x38, (byte) 0xf3, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, - 0x2c, (byte) 0xf6, 0x13, (byte) 0xf3, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, + 0x00, (byte) 0x90, 0x30, (byte) 0xe1, 0x34, 0x1c, 0x38, (byte) 0xf3, 0x40, (byte) 0xf6, 0x13, (byte) 0xf3, 0x04, 0x00, 0x00, 0x00, + 0x4c, 0x54, (byte) 0xdc, (byte) 0xe2, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, 0x01, 0x00, 0x00, 0x00, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, + 0x00, 0x00, 0x00, 0x00, 0x38, (byte) 0xf6, 0x13, (byte) 0xf3, 0x2e, 0x05, 0x38, (byte) 0xf3, 0x08, 0x50, (byte) 0xdc, (byte) 0xe2, + 0x2c, (byte) 0xf6, 0x13, (byte) 0xf3, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, // RAIL Capability Set (8 bytes) - // 0x17, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, - // + // 0x17, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x17, 0x00, // TS_RAIL_CAPABILITYSET::capabilitySetType = CAPSTYPE_RAIL (23) 0x08, 0x00, // TS_RAIL_CAPABILITYSET::lengthCapability = 8 bytes 0x00, 0x00, 0x00, 0x00, // TS_RAIL_CAPABILITYSET::railSupportLevel = TS_RAIL_LEVEL_DEFAULT (0) // Windowing Capability Set (11 bytes) - // 0x18, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + // 0x18, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x18, 0x00, // TS_WINDOW_CAPABILITYSET::capabilitySetType = CAPSTYPE_WINDOW (24) 0x0b, 0x00, // TS_WINDOW_CAPABILITYSET::lengthCapability = 11 bytes @@ -641,7 +641,7 @@ public class ServerDemandActivePDU extends BaseElement { // Remainder of Demand Active PDU: - 0x00, 0x00, 0x00, 0x00, // TS_DEMAND_ACTIVE_PDU::sessionId = 0 + 0x00, 0x00, 0x00, 0x00, // TS_DEMAND_ACTIVE_PDU::sessionId = 0 }; /* @formatter:on */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java index fbec1cea7aa..dac7e598684 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerFastPath.java @@ -29,13 +29,13 @@ public class ServerFastPath extends BaseElement { * TPKT protocol version (first byte). */ public static final int PROTOCOL_TPKT = 3; - + /** * Fast path protocol version (first two bits of first byte). */ public static final int PROTOCOL_FASTPATH = 0; - - + + /** * TPKT packets will be pushed to that pad. */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java index 8373b83c725..671b34a6c8a 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSAttachUserConfirmPDU.java @@ -27,10 +27,10 @@ import streamer.PipelineImpl; /** * Server response to MCS Attach User request. - * + * * Once the User Channel ID has been extracted, the client MUST send an MCS * Channel Join Request PDU for the user channel. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240685.aspx */ public class ServerMCSAttachUserConfirmPDU extends OneTimeSwitch { @@ -54,7 +54,7 @@ public class ServerMCSAttachUserConfirmPDU extends OneTimeSwitch { int typeAndFlags = buf.readUnsignedByte(); int type = typeAndFlags >> 2; int flags = typeAndFlags & 0x3; - + if (type != MCS_ATTACH_USER_CONFIRM_PDU) throw new RuntimeException("["+this+"] ERROR: Incorrect type of MCS AttachUserConfirm PDU. Expected value: 11, actual value: " + type + ", data: " + buf + "."); @@ -81,7 +81,7 @@ public class ServerMCSAttachUserConfirmPDU extends OneTimeSwitch { */ /** * Example. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240842.aspx * @see http://msdn.microsoft.com/en-us/library/cc240500.aspx */ @@ -117,7 +117,7 @@ public class ServerMCSAttachUserConfirmPDU extends OneTimeSwitch { /* * 03 00 00 0B 02 F0 80 2E 00 00 03. - * + * * Frame: Number = 18, Captured Frame Length = 68, MediaType = * DecryptedPayloadHeader + DecryptedPayloadHeader: FrameCount = 1, ErrorStatus * = SUCCESS TLSSSLData: Transport Layer Security (TLS) Payload Data + TLS: TLS diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java index d0a8e81380e..6560e78bb01 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSChannelJoinConfirmPDU.java @@ -36,7 +36,7 @@ public class ServerMCSChannelJoinConfirmPDU extends OneTimeSwitch { if (verbose) System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - + // Ignore packet buf.unref(); switchOff(); @@ -45,7 +45,7 @@ public class ServerMCSChannelJoinConfirmPDU extends OneTimeSwitch { } /* - * 03 00 00 0F 02 F0 80 3E 00 00 03 03 EC 03 EC + * 03 00 00 0F 02 F0 80 3E 00 00 03 03 EC 03 EC Frame: Number = 22, Captured Frame Length = 72, MediaType = DecryptedPayloadHeader + DecryptedPayloadHeader: FrameCount = 1, ErrorStatus = SUCCESS @@ -85,5 +85,5 @@ public class ServerMCSChannelJoinConfirmPDU extends OneTimeSwitch { - ChannelId: 1004 Align: No Padding Value: 1004 (0x3EC) - + */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java index 30b196b94ee..a1a41630f15 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSConnectResponse.java @@ -22,7 +22,7 @@ import streamer.OneTimeSwitch; /** * Once the basic server settings data blocks have been processed successfully, the client MUST send the MCS Attach User Request PDU to the server. - * + * * @see http://msdn.microsoft.com/en-us/library/cc240682.aspx */ public class ServerMCSConnectResponse extends OneTimeSwitch { @@ -38,7 +38,7 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { if (verbose) System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - + // Ignore packet buf.unref(); switchOff(); @@ -48,7 +48,7 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { /* * @formatter:off - * 03 00 00 64 02 F0 80 7F 66 5A 0A 01 00 02 01 00 30 1A 02 01 22 02 01 03 02 01 00 02 01 01 02 01 00 02 01 01 02 03 00 FF F8 02 01 02 04 36 00 05 00 14 7C 00 01 2A 14 76 0A 01 01 00 01 C0 00 4D 63 44 6E 20 01 0C 0C 00 04 00 08 00 01 00 00 00 03 0C 08 00 EB 03 00 00 02 0C 0C 00 00 00 00 00 00 00 00 00 + * 03 00 00 64 02 F0 80 7F 66 5A 0A 01 00 02 01 00 30 1A 02 01 22 02 01 03 02 01 00 02 01 01 02 01 00 02 01 01 02 03 00 FF F8 02 01 02 04 36 00 05 00 14 7C 00 01 2A 14 76 0A 01 01 00 01 C0 00 4D 63 44 6E 20 01 0C 0C 00 04 00 08 00 01 00 00 00 03 0C 08 00 EB 03 00 00 02 0C 0C 00 00 00 00 00 00 00 00 00 Frame: Number = 12, Captured Frame Length = 157, MediaType = DecryptedPayloadHeader + DecryptedPayloadHeader: FrameCount = 1, ErrorStatus = SUCCESS @@ -65,9 +65,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { EOT: 128 (0x80) - T125: MCSConnect Response - MCSConnectResponse: Result = rt-successful - - ConnectResponseHeader: + - ConnectResponseHeader: - AsnId: Application Constructed Tag (102) - - HighTag: + - HighTag: Class: (01......) Application (1) Type: (..1.....) Constructed TagNumber: (...11111) @@ -76,9 +76,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 90 bytes, LengthOfLength = 0 - Result: rt-successful - Value: 0 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Enumerated type (Universal 10) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...01010) 10 @@ -86,9 +86,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 0 (0x0) - CalledConnectId: 0 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -98,16 +98,16 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { - DomainParameters: Length = 26, LengthOfLength = 0 - DomainParametersHeader: 0x1 - AsnId: Sequence and SequenceOf types (Universal 16) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..1.....) Constructed TagValue: (...10000) 16 - AsnLen: Length = 26, LengthOfLength = 0 Length: 26 bytes, LengthOfLength = 0 - ChannelIds: 34 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -115,9 +115,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 34 (0x22) - UserIDs: 3 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -125,9 +125,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 3 (0x3) - TokenIds: 0 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -135,9 +135,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 0 (0x0) - NumPriorities: 1 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -145,9 +145,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 1 (0x1) - MinThroughput: 0 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -155,9 +155,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 0 (0x0) - Height: 1 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -165,9 +165,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 1 (0x1) - MCSPDUsize: 65528 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -175,9 +175,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 3 bytes, LengthOfLength = 0 AsnInt: 65528 (0xFFF8) - protocolVersion: 2 - - AsnIntegerHeader: + - AsnIntegerHeader: - AsnId: Integer type (Universal 2) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00010) 2 @@ -185,18 +185,18 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { Length: 1 bytes, LengthOfLength = 0 AsnInt: 2 (0x2) - UserData: Identifier = Generic Conference Contro (0.0.20.124.0.1) - - UserDataHeader: + - UserDataHeader: - AsnId: OctetString type (Universal 4) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00100) 4 - AsnLen: Length = 54, LengthOfLength = 0 Length: 54 bytes, LengthOfLength = 0 - AsnBerObjectIdentifier: Generic Conference Contro (0.0.20.124.0.1) - - AsnObjectIdentifierHeader: + - AsnObjectIdentifierHeader: - AsnId: Reserved for use by the encoding rules (Universal 0) - - LowTag: + - LowTag: Class: (00......) Universal (0) Type: (..0.....) Primitive TagValue: (...00000) 0 @@ -214,7 +214,7 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { ExtensionBit: 0 (0x0) - ChoiceValue: conferenceCreateResponse Value: (001.....) 0x1 - - conferenceCreateResponse: + - conferenceCreateResponse: ExtensionBit: 0 (0x0) userDataPresent: 1 (0x1) - nodeID: 0x79f3 @@ -231,7 +231,7 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { ExtensionBit: 0 (0x0) - RootIndex: 0 Value: (000.....) 0x0 - - userData: + - userData: - Size: 1 - Align: No Padding Padding4: (0000....) 0x0 @@ -241,14 +241,14 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { - key: h221NonStandard - ChoiceValue: h221NonStandard Value: (1.......) 0x1 - - h221NonStandard: + - h221NonStandard: - H221NonStandardIdentifier: length: 4 - ConstrainedLength: 4 Value: (00000000) 0x0 - Align: No Padding Padding6: (000000..) 0x0 Value: Binary Large Object (4 Bytes) - - ServerMcsConnectResponsePdu: + - ServerMcsConnectResponsePdu: - RDPGCCUserDataResponseLength: 32 Align: No Padding Length: 32 @@ -256,14 +256,14 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { - TsUdHeader: Type = SC_CORE, Length = 12 Type: SC_CORE Length: 12 (0xC) - - TsUdScCore: - Version: RDP 5.0, 5.1, 5.2, 6.0, 6.1, and 7.0 + - TsUdScCore: + Version: RDP 5.0, 5.1, 5.2, 6.0, 6.1, and 7.0 ClientRequestedProtocols: TLS 1.0 - TsUd: SC_NET - TsUdHeader: Type = SC_NET, Length = 8 Type: SC_NET Length: 8 (0x8) - - TsUdScNet: + - TsUdScNet: MCSChannelID: 1003 (0x3EB) ChannelCount: 0 (0x0) Pad: 0 Bytes @@ -271,9 +271,9 @@ public class ServerMCSConnectResponse extends OneTimeSwitch { - TsUdHeader: Type = SC_SECURITY, Length = 12 Type: SC_SECURITY Length: 12 (0xC) - - TsUdSCSec1: - - EncryptionMethod: - Support40Bit: (...............................0) Not Support + - TsUdSCSec1: + - EncryptionMethod: + Support40Bit: (...............................0) Not Support Support128Bit: (..............................0.) Not Support 128-bit Reserved1: (.............................0..) Support56Bit: (............................0...) Not Support 56-bit diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java index 5862e196b5c..5041b0b143a 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerMCSPDU.java @@ -75,7 +75,7 @@ public class ServerMCSPDU extends BaseElement { /** * Example. - * + * */ public static void main(String args[]) { // System.setProperty("streamer.Link.debug", "true"); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java index 8c39a021414..ec68dcaed8c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerPacketSniffer.java @@ -25,8 +25,8 @@ public class ServerPacketSniffer extends PacketSniffer { private static final Pair[] serverRegexps = new Pair[] { // @formatter:off new Pair("Server FastPath update", "04"), - new Pair("Server X224ConnectionRequest", "03 00 XX XX 0E D0"), - new Pair("Server MCSConnectResponse", "03 00 XX XX 02 F0 80 7F 66 5A"), + new Pair("Server X224ConnectionRequest", "03 00 XX XX 0E D0"), + new Pair("Server MCSConnectResponse", "03 00 XX XX 02 F0 80 7F 66 5A"), new Pair("Server AttachUserConfirm", "03 00 XX XX 02 F0 80 2E"), new Pair("Server ChannelJoinConfirm", "03 00 XX XX 02 F0 80 3E"), new Pair("Server ErrorAlert", "03 00 XX XX 02 F0 80 68 00 01 03 EB 70 14 80 00"), @@ -37,7 +37,7 @@ public class ServerPacketSniffer extends PacketSniffer { new Pair("Server SET_ERROR_INFO_PDU", "03 00 XX XX 02 F0 80 68 00 01 03 EB 30 XX XX XX 17 00 00 00 EA 03 XX 00 XX XX XX XX 2F"), new Pair("Server DeactivateAllPDU", "03 00 XX XX 02 F0 80 68 00 01 03 EB 70 XX XX XX 16 00"), new Pair("Server CloseConnection", "03 00 00 09 02 F0 80 21 80"), - + // new Pair("Server TPKT unknown packet", "03"), // new Pair("Server FastPath update with flags or continuation", ".*"), // @formatter:on diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java index 315fbfed00a..2dc6f960d71 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerSynchronizePDU.java @@ -33,7 +33,7 @@ public class ServerSynchronizePDU extends OneTimeSwitch { if (verbose) System.out.println("[" + this + "] INFO: Data received: " + buf + "."); - + // Ignore packet buf.unref(); switchOff(); @@ -44,7 +44,7 @@ public class ServerSynchronizePDU extends OneTimeSwitch { /* @formatter:off */ /* - * 03 00 00 24 02 F0 80 68 00 01 03 EB 70 16 16 00 17 00 EA 03 EA 03 01 00 08 00 16 00 1F 00 00 00 01 00 86 A4 + * 03 00 00 24 02 F0 80 68 00 01 03 EB 70 16 16 00 17 00 EA 03 EA 03 01 00 08 00 16 00 1F 00 00 00 01 00 86 A4 Frame: Number = 36, Captured Frame Length = 93, MediaType = DecryptedPayloadHeader + DecryptedPayloadHeader: FrameCount = 1, ErrorStatus = SUCCESS @@ -87,7 +87,7 @@ public class ServerSynchronizePDU extends OneTimeSwitch { Length: 22 RDP: RDPBCGR - RDPBCGR: SynchronizePDU - - SlowPathPacket: SynchronizePDU + - SlowPathPacket: SynchronizePDU - SlowPath: Type = TS_PDUTYPE_DATAPDU - TsShareControlHeader: Type = TS_PDUTYPE_DATAPDU TotalLength: 22 (0x16) diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java index 0d19fa4926c..0813dfa327e 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerTpkt.java @@ -26,7 +26,7 @@ public class ServerTpkt extends BaseElement { * TPKT protocol version (first byte). */ public static final int PROTOCOL_TPKT = 3; - + public ServerTpkt(String id) { super(id); } @@ -59,7 +59,7 @@ public class ServerTpkt extends BaseElement { // Extract payload ByteBuffer outBuf = buf.slice(buf.cursor, payloadLength, true); buf.unref(); - + if(verbose) { outBuf.putMetadata("source", this); } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java index a33527773f3..a7c8cdd88f7 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ServerX224ConnectionConfirmPDU.java @@ -29,8 +29,8 @@ import streamer.PipelineImpl; * Once the External Security Protocol handshake has run to completion, the * client MUST continue with the connection sequence by sending the MCS Connect * Initial PDU to the server over the newly established secure channel. - * - * + * + * * @see http://msdn.microsoft.com/en-us/library/cc240663.aspx */ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { @@ -163,7 +163,7 @@ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { } - + if (protocol != RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL) throw new RuntimeException("Unexpected protocol type. Expected protocol type: " + RdpConstants.RDP_NEG_REQ_PROTOCOL_SSL + " (SSL), actual response type: " + protocol + ", RDP NEG buf: " + buf + "."); @@ -177,15 +177,15 @@ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { /** * Example. - * + * */ public static void main(String args[]) { // System.setProperty("streamer.Link.debug", "true"); System.setProperty("streamer.Element.debug", "true"); // System.setProperty("streamer.Pipeline.debug", "true"); -// byte[] packet = new byte[] { -// +// byte[] packet = new byte[] { +// // 0x03, // -> TPKT Header: TPKT version = 3 // 0x00, // TPKT Header: Reserved = 0 // 0x00, 0x13, // TPKT Header: Packet length - (total = 19 bytes) @@ -205,7 +205,7 @@ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { // Connection failure // 03 00 00 13 0e d0 00 00 12 34 00 03 00 08 00 05 00 00 00 byte[] packet = new byte[] { - + 0x03, // -> TPKT Header: TPKT version = 3 0x00, // TPKT Header: Reserved = 0 0x00, 0x13, // TPKT Header: Packet length - (total = 19 bytes) @@ -215,11 +215,11 @@ public class ServerX224ConnectionConfirmPDU extends OneTimeSwitch { 0x00, 0x00, // X.224: Destination reference = 0 0x12, 0x34, // X.224: Source reference = 0x1234 (bogus value) 0x00, // X.224: Class and options = 0 - (byte) 0x03, // Failure + (byte) 0x03, // Failure (byte) 0x00, // RDP_NEG_RSP::flags (0) - (byte) 0x08, (byte) 0x00, // RDP_NEG_RSP::length (8 bytes) + (byte) 0x08, (byte) 0x00, // RDP_NEG_RSP::length (8 bytes) (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x00, // Code: HYBRID_REQUIRED_BY_SERVER - + }; MockSource source = new MockSource("source", ByteBuffer.convertByteArraysToByteBuffers(packet)); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java index 86f9be35ba2..99b628ca137 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java @@ -141,7 +141,7 @@ public class BaseElement implements Element { /** * By default, try to pull data from input links. - * + * * Override this method in data source elements. */ @Override @@ -249,7 +249,7 @@ public class BaseElement implements Element { /** * Send event to all outputs. - * + * * @param event * a event * @param direction @@ -279,7 +279,7 @@ public class BaseElement implements Element { /** * Ensure that packet has required minimum and maximum length, cuts tail when * necessary. - * + * * @param buf * a buffer * @param minLength diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java index 832c731257f..cd6c8e42f4b 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java @@ -101,7 +101,7 @@ public class ByteBuffer { /** * Return string representation of this byte buffer. - * + * * @param maxLength * number of bytes to show in string */ @@ -113,7 +113,7 @@ public class ByteBuffer { /** * Return string representation of this byte buffer as hexadecimal numbers, * e.g. "[0x01, 0x02]". - * + * * @param maxLength * number of bytes to show in string */ @@ -133,7 +133,7 @@ public class ByteBuffer { /** * Return string representation of this byte buffer as hexadecimal numbers, * e.g. "01 02". - * + * * @param maxLength * number of bytes to show in string */ @@ -215,7 +215,7 @@ public class ByteBuffer { /** * Create new buffer, which holds data from both buffers. Expensive operation. - * + * * @TODO if only one reference to this ByteBuffer exists, then extend this * buffer instead of creating new buffer * @TODO support list of buffers to avoid expensive joins until absolute @@ -368,10 +368,10 @@ public class ByteBuffer { /** * Read unsigned int in network order in variable length format. Cursor is * advanced by 1 to 4 bytes. - * + * * Two most significant bits of first byte indicates length of field: 0x00 - 1 * byte, 0x40 - 2 bytes, 0x80 - 3 bytes, 0xc0 - 4 bytes. - * + * * @see http://msdn.microsoft.com/en-us/library/cc241614.aspx */ public int readEncodedUnsignedInt() { @@ -447,7 +447,7 @@ public class ByteBuffer { /** * Read unsigned short in network order in variable length format. Cursor is * advanced by 1 or 2 bytes. - * + * * Most significant bit of first byte indicates length of field: 0 - 1 byte, 1 * - 2 bytes. */ @@ -480,10 +480,10 @@ public class ByteBuffer { /** * Read unsigned short in network order in variable length format. Cursor is * advanced by 1 or 2 bytes. - * + * * Most significant bit of first byte indicates length of field: 0x00 - 1 * byte, 0x80 - 2 bytes. - * + * * @see http://msdn.microsoft.com/en-us/library/cc241612.aspx */ public int readEncodedUnsignedShort() { @@ -503,11 +503,11 @@ public class ByteBuffer { /** * Read signed short in network order in variable length format. Cursor is * advanced by 1 or 2 bytes. - * + * * Most significant bit of first byte indicates length of field: 0x00 - 1 * byte, 0x80 - 2 bytes. Second most significant bit indicates is value * positive or negative. - * + * * @see http://msdn.microsoft.com/en-us/library/cc241613.aspx */ public int readEncodedSignedShort() { @@ -631,7 +631,7 @@ public class ByteBuffer { /** * Write int in variable length format. Cursor is advanced by number of bytes * written (1-5). - * + * * Topmost bit of each byte is set to 1 to indicate that next byte has data. */ public void writeVariableIntLE(int i) { @@ -652,7 +652,7 @@ public class ByteBuffer { /** * Write short in variable length format. Cursor is advanced by number of * bytes written (1-2). - * + * * Topmost bit of first byte is set to 1 to indicate that next byte has data. */ public void writeVariableShort(int length) { @@ -778,7 +778,7 @@ public class ByteBuffer { /** * Read RGB color in LE order. Cursor is advanced by 3. - * + * * @return color as int, with red in lowest octet. */ public int readRGBColor() { diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java index 152be2e960c..1ce15a02e35 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java @@ -20,7 +20,7 @@ public interface DataSource { /** * Get data from source. - * + * * @param block * if false, then return immediately when no data is available, * otherwise wait for data @@ -30,7 +30,7 @@ public interface DataSource { /** * Hold data temporary to use at next pull or push. - * + * * @param buf * a data */ @@ -40,7 +40,7 @@ public interface DataSource { * Hold data temporary to use at next pull. Don't return abything untill given * amount of data will be read from source, because data will be pushed back * anyway. - * + * * @param buf * a data * @param lengthOfFullPacket @@ -50,7 +50,7 @@ public interface DataSource { /** * Send event to pads. - * + * * @param event * a event * @param direction diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java index c927deafe4d..d5f10b1313d 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java @@ -38,7 +38,7 @@ public interface Element { /** * Get link connected to given pad. - * + * * @param padName * Standard pads are "stdin" and "stdout". */ @@ -51,7 +51,7 @@ public interface Element { /** * Connect link to given pad. - * + * * @param padName * a pad name. Standard pads are "stdin" and "stdout". */ @@ -59,7 +59,7 @@ public interface Element { /** * Disconnect link from given pad. - * + * * @param padName * Standard pads are "stdin" and "stdout". */ @@ -68,7 +68,7 @@ public interface Element { /** * Pull data from element and handle it. Element should ask one of it input * pads for data, handle data and push result to it sink(s), if any. - * + * * @param block * block until data will be available, or do a slight delay at least, * when data is not available @@ -77,7 +77,7 @@ public interface Element { /** * Handle incoming data. - * + * * @param buf * a data * @param link @@ -87,7 +87,7 @@ public interface Element { /** * Handle event. - * + * * @param event * an event * @param direction @@ -108,7 +108,7 @@ public interface Element { /** * Drop link. - * + * * @param link a link to drop */ void dropLink(Link link); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java index 5e1a3893c52..9256f1bebb5 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java @@ -17,14 +17,14 @@ package streamer; public enum Event { - STREAM_START, + STREAM_START, STREAM_CLOSE, - + /** * Upgrade socket to SSL. */ SOCKET_UPGRADE_TO_SSL, - + /** * Switch links to input mode. */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java index bd970f08afd..8bd05a10488 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java @@ -24,7 +24,7 @@ public interface Link extends DataSource, DataSink, Runnable { /** * Wire this link with given sink. - * + * * @param sink * an Element * @return same sink element, for chaining @@ -33,7 +33,7 @@ public interface Link extends DataSource, DataSink, Runnable { /** * Wire this link with given source. - * + * * @param source * an Element * @return same source element, for chaining @@ -53,12 +53,12 @@ public interface Link extends DataSource, DataSink, Runnable { * Resume transfer. */ void resume(); - + /** * Change mode of operation of this link from push mode to pull mode. */ void setPullMode(); - + /** * Drop this link. */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java index a7d48482621..1bc9240dbac 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java @@ -18,11 +18,11 @@ package streamer; /** * One time switch for handshake and initialization stages. - * + * * At beginning, element handles data internally, sending output to "otout" pad. * After switchOff() method is called, element drops its links, so packets from * "stdin" pad are forwarded directly to "stdout" pad, without processing. - * + * * Event STREAM_START is captured by this element and not propagated further. * When switchOff() method is called, event STREAM_START is generated and sent * to "stdout". diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java index c369350cf38..2f9f9943ea0 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java @@ -26,14 +26,14 @@ public interface Pipeline extends Element { /** * Add elements to pipeline. - * + * * @param elements */ void add(Element... elements); /** * Add elements to pipeline and link them in given order. - * + * * @param elements */ void addAndLink(Element... elements); @@ -43,19 +43,19 @@ public interface Pipeline extends Element { * "PADNAME< " or/and suffix " >PADNAME" to use given named pads instead of * "stdin" and "stdout". I.e. link("foo", "bar", "baz"); is equal * to link("foo >stdin", "stdout< bar >stdin", "stdout< baz"); . - * + * * Special elements "IN" and "OUT" are pointing to pipeline outer interfaces, * so when pipeline will be connected with other elements, outside of this * pipeline, they will be connected to IN and OUT elements. - * + * * Example: - * + * * 
    * pipeline.link("IN", "foo", "bar", "OUT");
    * // Make additional branch from foo to baz, and then to OUT
    * pipeline.link("foo >baz_out", "baz", "baz_in< OUT");
    *
- * + * * @param elements * elements to link */ @@ -63,7 +63,7 @@ public interface Pipeline extends Element { /** * Get element by name. - * + * * @return an element */ Element get(String elementName); diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java index abf132f6aef..20312ebaada 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java @@ -148,7 +148,7 @@ public class PipelineImpl implements Pipeline { this.elements.put(id, element); } } - + @Override public void link(String... elementNames) { diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java index c23edd8f42f..25dffb75cd1 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java @@ -73,7 +73,7 @@ public class SocketWrapper extends PipelineImpl { * Connect this socket wrapper to remote server and start main loop on * IputStreamSource stdout link, to watch for incoming data, and * OutputStreamSink stdin link, to pull for outgoing data. - * + * * @param address * @throws IOException */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java index 32c14bb947f..32e0fe0716c 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java @@ -78,7 +78,7 @@ public class SyncLink implements Link { /** * When in loop, indicates that loop must be stopped. - * + * * @see run() */ private boolean shutdown = false; @@ -336,7 +336,7 @@ public class SyncLink implements Link { /** * Run pull loop to actively pull data from source and push it to sink. It * must be only one pull loop per thread. - * + * * Pull loop will start after event STREAM_START. This link and source element * incomming links will be switched to pull mode before pull loop will be * started using event LINK_SWITCH_TO_PULL_MODE. diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java index dd933947503..210333dc528 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/AwtMouseEventToVncAdapter.java @@ -46,7 +46,7 @@ public class AwtMouseEventToVncAdapter extends BaseElement { outBuf.writeByte(buttonMask); outBuf.writeShort(order.event.getX()); outBuf.writeShort(order.event.getY()); - + pushDataToAllOuts(outBuf); } @@ -57,7 +57,7 @@ public class AwtMouseEventToVncAdapter extends BaseElement { * right buttons on the mouse. On a wheel mouse, each step of the wheel * upwards is represented by a press and release of button 4, and each step * downwards is represented by a press and release of button 5. - * + * * @param modifiers * extended modifiers from AWT mouse event * @return VNC mouse button mask diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java index c2d63bb7761..86b40376516 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/RfbConstants.java @@ -77,7 +77,7 @@ public interface RfbConstants { * Default 8 bit charset to use when communicating with server. */ public static final Charset US_ASCII_CHARSET = Charset.availableCharsets().get("US-ASCII"); - + /** * Default 16 bit charset to use when communicating with server. */ diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java index 758000dd323..fc20213c1e1 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncMessageHandler.java @@ -304,7 +304,7 @@ public class VncMessageHandler extends BaseElement { BitmapOrder order = new BitmapOrder(); order.rectangles = new BitmapRectangle[] { rectangle }; - + pushDataToPad(PIXEL_ADAPTER_PAD, new ByteBuffer(order)); return true; } diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java index 52d9976eece..18abbc5bef8 100644 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/Vnc_3_3_Authentication.java @@ -155,7 +155,7 @@ public class Vnc_3_3_Authentication extends OneTimeSwitch { /** * Encode password using DES encryption with given challenge. - * + * * @param challenge * a random set of bytes. * @param password @@ -194,10 +194,10 @@ public class Vnc_3_3_Authentication extends OneTimeSwitch { /** * Reverse bits in byte, so least significant bit will be most significant * bit. E.g. 01001100 will become 00110010. - * + * * See also: http://www.vidarholen.net/contents/junk/vnc.html , * http://bytecrafter .blogspot.com/2010/09/des-encryption-as-used-in-vnc.html - * + * * @param b * a byte * @return byte in reverse order diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java index 311234fbfc1..c73a384adf4 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java @@ -41,7 +41,7 @@ import com.google.gson.Gson; import com.sun.net.httpserver.HttpServer; /** - * + * * ConsoleProxy, singleton class that manages overall activities in console proxy process. To make legacy code work, we still */ public class ConsoleProxy { diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClient.java index 1c6d604e22e..6429de4ad2f 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClient.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClient.java @@ -21,9 +21,9 @@ import java.util.List; /** * ConsoleProxyClient defines an standard interface that a console client should implement, - * + * * ConsoleProxyClient maintains a session towards the target host, it glues the session - * to a AJAX front-end viewer + * to a AJAX front-end viewer */ public interface ConsoleProxyClient { int getClientId(); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java index 1545dd1fe25..9a69416466a 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java @@ -27,11 +27,11 @@ import com.cloud.consoleproxy.util.TileTracker; import com.cloud.consoleproxy.vnc.FrameBufferCanvas; /** - * + * * an instance of specialized console protocol implementation, such as VNC or RDP - * + * * It mainly implements the features needed by front-end AJAX viewer - * + * */ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, ConsoleProxyClientListener { private static final Logger s_logger = Logger.getLogger(ConsoleProxyClientBase.class); @@ -159,7 +159,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons } // - // AJAX Image manipulation + // AJAX Image manipulation // public byte[] getFrameBufferJpeg() { FrameBufferCanvas canvas = getFrameBufferCavas(); @@ -255,7 +255,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons if (s_logger.isTraceEnabled()) s_logger.trace("Ajax client start, frame buffer w: " + width + ", " + height); - /* + /* int retry = 0; tracker.initCoverageTest(); while(!tracker.hasFullCoverage() && retry < 10) { diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientParam.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientParam.java index 7e54da5f75b..d13ae0eb046 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientParam.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientParam.java @@ -17,7 +17,7 @@ package com.cloud.consoleproxy; /** - * + * * Data object to store parameter info needed by client to connect to its host */ public class ConsoleProxyClientParam { diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java index cd846d6f117..5251b9386d8 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientStatsCollector.java @@ -25,7 +25,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; /** - * + * * ConsoleProxyClientStatsCollector collects client stats for console proxy agent to report */ public class ConsoleProxyClientStatsCollector { diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java index ffb09dab12c..7b22d4b74de 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java @@ -23,10 +23,10 @@ import java.util.Hashtable; import org.apache.log4j.Logger; /** - * + * * ConsoleProxyGCThread does house-keeping work for the process, it helps cleanup log files, * recycle idle client sessions without front-end activities and report client stats to external - * management software + * management software */ public class ConsoleProxyGCThread extends Thread { private static final Logger s_logger = Logger.getLogger(ConsoleProxyGCThread.class); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java index 8126e70a19c..6b6db549ea1 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java @@ -70,7 +70,7 @@ public class ConsoleProxyHttpHandlerHelper { map.put("ticket", param.getTicket()); } } else { - // we no longer accept information from parameter other than token + // we no longer accept information from parameter other than token guardUserInput(map); } diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java index 1fea310159a..4ec2a726b5c 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java @@ -35,11 +35,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; /** - * + * * @author Kelven Yang * A simple password based encyrptor based on AES/CBC. It can serialize simple POJO object into URL safe string * and deserialize it back. - * + * */ public class ConsoleProxyPasswordBasedEncryptor { private static final Logger s_logger = Logger.getLogger(ConsoleProxyPasswordBasedEncryptor.class); @@ -176,7 +176,7 @@ public class ConsoleProxyPasswordBasedEncryptor { random.nextBytes(ivBytes); KeyIVPair keyIvPair = new KeyIVPair("8x/xUBgX0Up+3UEo39dSeG277JhVj31+ElHkN5+EC0Q=", "Y2SUiIN6JXTdKNK/ZMDyVtLB7gAM9MCCiyrP1xd3bSQ="); - //keyIvPair.setKeyBytes(keyBytes); + //keyIvPair.setKeyBytes(keyBytes); //keyIvPair.setIvBytes(ivBytes); Gson gson = new GsonBuilder().create(); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java index 08ed4d4f78a..b8c45b86eac 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java @@ -27,9 +27,9 @@ import com.cloud.consoleproxy.vnc.RfbConstants; import com.cloud.consoleproxy.vnc.VncClient; /** - * + * * ConsoleProxyVncClient bridges a VNC engine with the front-end AJAX viewer - * + * */ public class ConsoleProxyVncClient extends ConsoleProxyClientBase { private static final Logger s_logger = Logger.getLogger(ConsoleProxyVncClient.class); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java b/services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java index 9b4e589124e..0abd46b42d5 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java @@ -37,7 +37,7 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; // -// This file is originally from XenConsole with modifications +// This file is originally from XenConsole with modifications // /** diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java index 1320e831f3b..adb5c83f9b3 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClient.java @@ -320,7 +320,7 @@ public class VncClient { /** * Encode password using DES encryption with given challenge. - * + * * @param challenge * a random set of bytes. * @param password @@ -351,11 +351,11 @@ public class VncClient { /** * Reverse bits in byte, so least significant bit will be most significant * bit. E.g. 01001100 will become 00110010. - * + * * See also: http://www.vidarholen.net/contents/junk/vnc.html , * http://bytecrafter * .blogspot.com/2010/09/des-encryption-as-used-in-vnc.html - * + * * @param b * a byte * @return byte in reverse order diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java index 4c827394aaa..965f09104e9 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java @@ -158,7 +158,7 @@ public class VncClientPacketSender implements Runnable, PaintNotificationListene * right buttons on the mouse. On a wheel mouse, each step of the wheel * upwards is represented by a press and release of button 4, and each step * downwards is represented by a press and release of button 5. - * + * * @param modifiers * extended modifiers from AWT mouse event * @return VNC mouse button mask diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java index d3a6e40e961..c21393ef82c 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/packet/client/FramebufferUpdateRequestPacket.java @@ -23,7 +23,7 @@ import com.cloud.consoleproxy.vnc.RfbConstants; /** * FramebufferUpdateRequestPacket - * + * * @author Volodymyr M. Lisivka */ public class FramebufferUpdateRequestPacket implements ClientPacket { diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index d544736d3f3..0b12f96ca6f 100755 --- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -2198,15 +2198,15 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S * Mount remote device named on local file system on subfolder of _parent * field. *

- * + * * Supported schemes are "nfs" and "cifs". *

- * + * * CIFS parameters are documented with mount.cifs at * http://linux.die.net/man/8/mount.cifs * For simplicity, when a URI is used to specify a CIFS share, * options such as domain,user,password are passed as query parameters. - * + * * @param uri * crresponding to the remote device. Will throw for unsupported * scheme. diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java b/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java index 6af9da4f015..0eef42cf666 100755 --- a/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java @@ -524,7 +524,7 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager { /** * Get notified of change of job status. Executed in context of uploader thread - * + * * @param jobId * the id of the job * @param status diff --git a/test/src/com/cloud/sample/UserCloudAPIExecutor.java b/test/src/com/cloud/sample/UserCloudAPIExecutor.java index 5a00d20ab8a..a548a94d881 100644 --- a/test/src/com/cloud/sample/UserCloudAPIExecutor.java +++ b/test/src/com/cloud/sample/UserCloudAPIExecutor.java @@ -39,19 +39,19 @@ import org.apache.commons.httpclient.methods.GetMethod; * * * - * - * - * - * + * + * + * + * */ /** * Sample CloudStack Management User API Executor. - * + * * Prerequisites: - Edit usercloud.properties to include your host, apiUrl, apiKey, and secretKey - Use ./executeUserAPI.sh to * execute this test class - * - * + * + * */ public class UserCloudAPIExecutor { public static void main(String[] args) { @@ -167,7 +167,7 @@ public class UserCloudAPIExecutor { /** * 1. Signs a string with a secret key using SHA-1 2. Base64 encode the result 3. URL encode the final result - * + * * @param request * @param key * @return diff --git a/test/src/com/cloud/test/longrun/BuildGuestNetwork.java b/test/src/com/cloud/test/longrun/BuildGuestNetwork.java index 1208dc33dfb..202fddea848 100644 --- a/test/src/com/cloud/test/longrun/BuildGuestNetwork.java +++ b/test/src/com/cloud/test/longrun/BuildGuestNetwork.java @@ -32,19 +32,19 @@ public class BuildGuestNetwork { private static final int _developerPort=8080; private static final String _apiUrl = "/client/api"; private static int numVM=1; - private static long zoneId=-1L; + private static long zoneId=-1L; private static long templateId=3; private static long serviceOfferingId=1; - + public static void main (String[] args){ - + List argsList = Arrays.asList(args); Iterator iter = argsList.iterator(); String host = "http://localhost"; int numThreads = 1; - + while (iter.hasNext()){ String arg = iter.next(); if (arg.equals("-h")){ @@ -52,27 +52,27 @@ public class BuildGuestNetwork { } if (arg.equals("-t")){ numThreads=Integer.parseInt(iter.next()); - } + } if (arg.equals("-n")){ numVM=Integer.parseInt(iter.next()); } if (arg.equals("-z")){ zoneId=Integer.parseInt(iter.next()); } - + if (arg.equals("-e")){ templateId=Integer.parseInt(iter.next()); } - + if (arg.equals("-s")){ serviceOfferingId=Integer.parseInt(iter.next()); } } - + final String server = host + ":" + _apiPort + "/"; final String developerServer = host + ":" + _developerPort + _apiUrl; s_logger.info("Starting test in "+numThreads+" thread(s). Each thread is launching "+numVM+" VMs"); - + for (int i=0; i argsList = Arrays.asList(args); Iterator iter = argsList.iterator(); String host = "http://localhost"; int numThreads = 1; - + while (iter.hasNext()){ String arg = iter.next(); if (arg.equals("-h")){ @@ -63,17 +63,17 @@ private static final int _developerPort=8080; } if (arg.equals("-t")){ numThreads=Integer.parseInt(iter.next()); - } + } if (arg.equals("-n")){ numVM=Integer.parseInt(iter.next()); } } - + final String server = host + ":" + _apiPort + "/"; final String developerServer = host + ":" + _developerPort + _apiUrl; - + s_logger.info("Starting test in "+numThreads+" thread(s). Each thread is launching "+numVM+" VMs"); - + for (int i=0; i virtualMachines; private ArrayList publicIp; private String server; @@ -44,7 +44,7 @@ public class User { private String secretKey; private String password; private String encryptedPassword; - + public User(String userName, String password, String server, String developerServer) { @@ -55,7 +55,7 @@ public class User { this.virtualMachines = new ArrayList(); this.publicIp = new ArrayList(); } - + public ArrayList getVirtualMachines() { return virtualMachines; } @@ -74,7 +74,7 @@ public class User { public void setUserId(String userId) { this.userId = userId; } - + public ArrayList getPublicIp() { return publicIp; @@ -125,7 +125,7 @@ public class User { public void setPassword(String password) { this.password = password; } - + public String getSecretKey() { return secretKey; } @@ -133,8 +133,8 @@ public class User { public void setSecretKey(String secretKey) { this.secretKey = secretKey; } - - + + public String getDeveloperServer() { return developerServer; @@ -166,9 +166,9 @@ public class User { } } } - + public void retrievePublicIp(long zoneId) throws IOException{ - + String encodedApiKey = URLEncoder.encode(this.apiKey, "UTF-8"); String encodedZoneId=URLEncoder.encode(""+zoneId,"UTF-8"); String requestToSign = "apiKey=" + encodedApiKey @@ -201,11 +201,11 @@ public class User { s_logger.error("internal error processing request: " + method.getStatusText()); } - + } - + public void registerUser()throws HttpException, IOException{ - + String encodedUsername = URLEncoder.encode(this.userName, "UTF-8"); String encodedPassword = URLEncoder.encode(this.password, "UTF-8"); String url = server + "?command=register&username=" + encodedUsername @@ -232,7 +232,7 @@ public class User { + method.getStatusText()); } } - + } diff --git a/test/src/com/cloud/test/longrun/VirtualMachine.java b/test/src/com/cloud/test/longrun/VirtualMachine.java index 0aaa2897da8..feb874886c1 100644 --- a/test/src/com/cloud/test/longrun/VirtualMachine.java +++ b/test/src/com/cloud/test/longrun/VirtualMachine.java @@ -33,16 +33,16 @@ import java.io.IOException; public class VirtualMachine { public static final Logger s_logger= Logger.getLogger(VirtualMachine.class.getClass()); - + private String privateIp; private String userId; - - + + public VirtualMachine(String userId){ this.userId=userId; } - - + + public String getPrivateIp() { return privateIp; } @@ -75,7 +75,7 @@ public class VirtualMachine { + "&command=deployVirtualMachine&serviceOfferingId=" + encodedServiceOfferingId + "&templateId=" + encodedTemplateId + "&zoneId=" + encodedZoneId; - + requestToSign = requestToSign.toLowerCase(); String signature = TestClientWithAPI.signRequest(requestToSign, secretKey); String encodedSignature = URLEncoder.encode(signature, "UTF-8"); @@ -84,7 +84,7 @@ public class VirtualMachine { + encodedServiceOfferingId + "&templateId=" + encodedTemplateId + "&apiKey=" + encodedApiKey + "&signature=" + encodedSignature; - + s_logger.info("Sending this request to deploy a VM: "+url); HttpClient client = new HttpClient(); HttpMethod method = new GetMethod(url); @@ -110,7 +110,7 @@ public class VirtualMachine { + method.getStatusText()); } } - - + + } diff --git a/test/src/com/cloud/test/longrun/guestNetwork.java b/test/src/com/cloud/test/longrun/guestNetwork.java index 70997081839..72d47ce7324 100644 --- a/test/src/com/cloud/test/longrun/guestNetwork.java +++ b/test/src/com/cloud/test/longrun/guestNetwork.java @@ -25,16 +25,16 @@ import com.trilead.ssh2.Session; public class guestNetwork implements Runnable{ public static final Logger s_logger= Logger.getLogger(guestNetwork.class.getClass()); - + private String publicIp; private ArrayList virtualMachines; private int retryNum; - + public guestNetwork(String publicIp, int retryNum){ this.publicIp=publicIp; - this.retryNum=retryNum; + this.retryNum=retryNum; } - + public ArrayList getVirtualMachines() { return virtualMachines; } @@ -46,7 +46,7 @@ public class guestNetwork implements Runnable{ public void run(){ NDC.push("Following thread has started"+Thread.currentThread().getName()); int retry = 0; - + //Start copying files between machines in the network s_logger.info("The size of the array is " + this.virtualMachines.size()); while (true) { @@ -57,7 +57,7 @@ public class guestNetwork implements Runnable{ Thread.sleep(120000); } for (VirtualMachine vm: this.virtualMachines ){ - + s_logger.info("Attempting to SSH into linux host " + this.publicIp + " with retry attempt: " + retry); Connection conn = new Connection(this.publicIp); @@ -81,7 +81,7 @@ public class guestNetwork implements Runnable{ sess.execCommand(copyCommand); Thread.sleep(120000); sess.close(); - + //execute wget command sess = conn.openSession(); String downloadCommand = new String ("wget http://172.16.0.220/scripts/checkDiskSpace.sh; chmod +x *sh; ./checkDiskSpace.sh; rm -rf checkDiskSpace.sh"); @@ -89,7 +89,7 @@ public class guestNetwork implements Runnable{ sess.execCommand(downloadCommand); Thread.sleep(120000); sess.close(); - + //close the connection conn.close(); } @@ -100,8 +100,8 @@ public class guestNetwork implements Runnable{ s_logger.info("Performance Guest Network test failed with error " + ex.getMessage()) ; } - } + } } - } + } } diff --git a/test/src/com/cloud/test/regression/ConfigTest.java b/test/src/com/cloud/test/regression/ConfigTest.java index 17401ce5470..4cbb5b40152 100644 --- a/test/src/com/cloud/test/regression/ConfigTest.java +++ b/test/src/com/cloud/test/regression/ConfigTest.java @@ -30,29 +30,29 @@ import com.trilead.ssh2.Session; public class ConfigTest extends TestCase{ public static final Logger s_logger = Logger.getLogger(ConfigTest.class.getName()); - + public ConfigTest(){ this.setClient(); this.setParam(new HashMap()); } - + public boolean executeTest(){ - - int error=0; + + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i()); } - + public boolean executeTest(){ int error=0; - + for (Document eachElement: this.getInputFile()) { - + Element rootElement = eachElement.getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i()); } - + public boolean executeTest() { - int error=0; + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i argsList = Arrays.asList(args); Iterator iter = argsList.iterator(); String host = null; String file = null; - + while (iter.hasNext()) { String arg = iter.next(); // management server host @@ -86,9 +86,9 @@ public class Deploy extends TestCase{ file = iter.next(); } } - + Deploy deploy = new Deploy (); - + ArrayList inputFile = new ArrayList(); inputFile.add(file); deploy.setInputFile(inputFile); @@ -96,9 +96,9 @@ public class Deploy extends TestCase{ deploy.getParam().put("hostip", host); deploy.getParam().put("apicommands", "../metadata/func/commands"); deploy.setCommands(); - + s_logger.info("Starting deployment against host " + host); - + boolean result = deploy.executeTest(); if (result == false) { s_logger.error("DEPLOYMENT FAILED"); @@ -107,8 +107,8 @@ public class Deploy extends TestCase{ else { s_logger.info("DEPLOYMENT IS SUCCESSFUL"); } - - } - + + } + } diff --git a/test/src/com/cloud/test/regression/EventsApiTest.java b/test/src/com/cloud/test/regression/EventsApiTest.java index 1eea211991f..68f8611bad6 100644 --- a/test/src/com/cloud/test/regression/EventsApiTest.java +++ b/test/src/com/cloud/test/regression/EventsApiTest.java @@ -30,25 +30,25 @@ import com.trilead.ssh2.Session; public class EventsApiTest extends TestCase{ public static final Logger s_logger = Logger.getLogger(EventsApiTest.class.getName()); - - + + public EventsApiTest(){ this.setClient(); this.setParam(new HashMap()); } - + public boolean executeTest(){ - int error=0; + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - - + + //Analyze each command, send request and build the array list of api commands for (int i=0; i expectedEvents = new HashMap(); expectedEvents.put("VM.START", 1); boolean eventResult = ApiCommand.verifyEvents(expectedEvents, "INFO", "http://" + this.getParam().get("hostip") + ":8096", "userid=" + this.getParam().get("userid1") + "&type=VM.START"); s_logger.info("Test case 97 - listEvent command verification result is " + eventResult); - + //verify error events eventResult = ApiCommand.verifyEvents("../metadata/error_events.properties", "ERROR", "http://" + this.getParam().get("hostip") + ":8096", this.getParam().get("erroruseraccount")); s_logger.info("listEvent command verification result is " + eventResult); - - + + if (error != 0) return false; else diff --git a/test/src/com/cloud/test/regression/HA.java b/test/src/com/cloud/test/regression/HA.java index dde5dcf5ef2..17f3fbf3aac 100644 --- a/test/src/com/cloud/test/regression/HA.java +++ b/test/src/com/cloud/test/regression/HA.java @@ -26,28 +26,28 @@ import com.cloud.test.regression.ApiCommand.ResponseType; public class HA extends TestCase{ public static final Logger s_logger = Logger.getLogger(HA.class.getName()); - + public HA(){ this.setClient(); } - + public boolean executeTest(){ - int error=0; + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i()); } - + public boolean executeTest(){ - - int error=0; + + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i port = new ArrayList(); // for (int i=1; i<65536; i++){ // port.add(Integer.toString(i)); // } -// -// //try all public ports +// +// //try all public ports // for (String portValue : port) { // try { -// String url = this.getHost() + ":8096/?command=createOrUpdateLoadBalancerRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + +// String url = this.getHost() + ":8096/?command=createOrUpdateLoadBalancerRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + // "&privateip=" + this.getParam().get("vmipaddress") + "&privateport=22&protocol=tcp&publicport=" + portValue; // HttpClient client = new HttpClient(); // HttpMethod method = new GetMethod(url); @@ -114,16 +114,16 @@ public class LoadBalancingTest extends TestCase{ // if (responseCode != 200 ) { // error++; // s_logger.error("Can't create LB rule for the public port " + portValue + ". Request was sent with url " + url); -// } +// } // }catch (Exception ex) { // s_logger.error(ex); // } // } -// +// // //try all private ports // for (String portValue : port) { // try { -// String url = this.getHost() + ":8096/?command=createOrUpdateLoadBalancerRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + +// String url = this.getHost() + ":8096/?command=createOrUpdateLoadBalancerRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + // "&privateip=" + this.getParam().get("vmipaddress") + "&publicport=22&protocol=tcp&privateport=" + portValue; // HttpClient client = new HttpClient(); // HttpMethod method = new GetMethod(url); @@ -131,13 +131,13 @@ public class LoadBalancingTest extends TestCase{ // if (responseCode != 200 ) { // error++; // s_logger.error("Can't create LB rule for the private port " + portValue + ". Request was sent with url " + url); -// } +// } // }catch (Exception ex) { // s_logger.error(ex); // } // } - + if (error != 0) return false; else diff --git a/test/src/com/cloud/test/regression/PortForwardingTest.java b/test/src/com/cloud/test/regression/PortForwardingTest.java index 3de3d123f05..34a961c1ffd 100644 --- a/test/src/com/cloud/test/regression/PortForwardingTest.java +++ b/test/src/com/cloud/test/regression/PortForwardingTest.java @@ -27,31 +27,31 @@ import com.cloud.test.regression.ApiCommand.ResponseType; public class PortForwardingTest extends TestCase{ public static final Logger s_logger = Logger.getLogger(PortForwardingTest.class.getName()); - + public PortForwardingTest(){ this.setClient(); this.setParam(new HashMap()); } - + public boolean executeTest(){ - - int error=0; + + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i port = new ArrayList(); // for (int i=1; i<65536; i++){ // port.add(Integer.toString(i)); // } -// -// //try all public ports +// +// //try all public ports // for (String portValue : port) { // try { // s_logger.info("public port is " + portValue); -// String url = this.getHost() + ":8096/?command=createOrUpdateIpForwardingRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + +// String url = this.getHost() + ":8096/?command=createOrUpdateIpForwardingRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + // "&privateip=" + this.getParam().get("vmipaddress") + "&privateport=22&protocol=tcp&publicport=" + portValue; // HttpClient client = new HttpClient(); // HttpMethod method = new GetMethod(url); @@ -113,16 +113,16 @@ public class PortForwardingTest extends TestCase{ // if (responseCode != 200 ) { // error++; // s_logger.error("Can't create portForwarding rule for the public port " + portValue + ". Request was sent with url " + url); -// } +// } // }catch (Exception ex) { // s_logger.error(ex); // } // } -// +// // //try all private ports // for (String portValue : port) { // try { -// String url = this.getHost() + ":8096/?command=createOrUpdateIpForwardingRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + +// String url = this.getHost() + ":8096/?command=createOrUpdateIpForwardingRule&account=" + this.getParam().get("accountname") + "&publicip=" + this.getParam().get("boundaryip") + // "&privateip=" + this.getParam().get("vmipaddress") + "&publicport=22&protocol=tcp&privateport=" + portValue; // HttpClient client = new HttpClient(); // HttpMethod method = new GetMethod(url); @@ -130,13 +130,13 @@ public class PortForwardingTest extends TestCase{ // if (responseCode != 200 ) { // error++; // s_logger.error("Can't create portForwarding rule for the private port " + portValue + ". Request was sent with url " + url); -// } +// } // }catch (Exception ex) { // s_logger.error(ex); // } // } - + if (error != 0) return false; else diff --git a/test/src/com/cloud/test/regression/SanityTest.java b/test/src/com/cloud/test/regression/SanityTest.java index 08fb91ad07b..dbd9cdaca0b 100644 --- a/test/src/com/cloud/test/regression/SanityTest.java +++ b/test/src/com/cloud/test/regression/SanityTest.java @@ -24,26 +24,26 @@ import org.apache.log4j.Logger; public class SanityTest extends TestCase{ public static final Logger s_logger = Logger.getLogger(SanityTest.class.getName()); - + public SanityTest(){ this.setClient(); } - + public boolean executeTest(){ - int error=0; + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); //Analyze each command, send request and build the array list of api commands for (int i=0; i()); } - + public boolean executeTest(){ - - int error=0; + + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i port = new ArrayList(); for (int j=1; j<1000; j++){ port.add(Integer.toString(j)); } - - //try all public ports + + //try all public ports for (String portValue : port) { try { s_logger.info("public port is " + portValue); @@ -71,13 +71,13 @@ public class Test extends TestCase{ if (responseCode != 200 ) { error++; s_logger.error("Can't create portForwarding network rule for the public port " + portValue + ". Request was sent with url " + url); - } + } }catch (Exception ex) { s_logger.error(ex); } } - - + + if (error != 0) return false; else diff --git a/test/src/com/cloud/test/regression/TestCase.java b/test/src/com/cloud/test/regression/TestCase.java index 03957eecc75..a06d47b89d0 100644 --- a/test/src/com/cloud/test/regression/TestCase.java +++ b/test/src/com/cloud/test/regression/TestCase.java @@ -34,7 +34,7 @@ import org.w3c.dom.Document; public abstract class TestCase{ - + public static Logger s_logger = Logger.getLogger(TestCase.class.getName()); private Connection conn; private ArrayList inputFile = new ArrayList (); @@ -42,7 +42,7 @@ public abstract class TestCase{ private String testCaseName; private HashMap param = new HashMap (); private HashMap commands = new HashMap (); - + public HashMap getParam() { return param; } @@ -50,8 +50,8 @@ public abstract class TestCase{ public void setParam(HashMap param) { this.param = param; } - - + + public HashMap getCommands() { return commands; } @@ -72,11 +72,11 @@ public abstract class TestCase{ while (en.hasMoreElements()) { String key = (String) en.nextElement(); commands.put(key, pro.getProperty(key)); - } + } } catch (Exception ex) { s_logger.info("Unable to find the file " + param.get("apicommands") + " due to following exception " + ex); } - + } public Connection getConn() { @@ -91,7 +91,7 @@ public abstract class TestCase{ if (!this.conn.isValid(0)) { s_logger.error("Connection to DB failed to establish"); } - + }catch (Exception ex) { s_logger.error(ex); } @@ -111,16 +111,16 @@ public abstract class TestCase{ } this.inputFile.add(doc); } - } + } public ArrayList getInputFile() { return inputFile; } - + public void setTestCaseName(String testCaseName) { this.testCaseName = testCaseName; } - + public String getTestCaseName(){ return this.testCaseName; } @@ -129,11 +129,11 @@ public abstract class TestCase{ HttpClient client = new HttpClient(); this.client = client; } - + public HttpClient getClient() { return this.client; } - + //abstract methods public abstract boolean executeTest(); diff --git a/test/src/com/cloud/test/regression/TestCaseEngine.java b/test/src/com/cloud/test/regression/TestCaseEngine.java index 68584e0db49..ca08fcf7184 100644 --- a/test/src/com/cloud/test/regression/TestCaseEngine.java +++ b/test/src/com/cloud/test/regression/TestCaseEngine.java @@ -69,21 +69,21 @@ public class TestCaseEngine { if (arg.equals("-p")) { _printUrl = true; } - + //type of the test: sanity, regression, all (default) if (arg.equals("-type")) { type = iter.next(); } - + if (arg.equals("-repeat")) { _repeat = Boolean.valueOf(iter.next()); } - + if (arg.equals("-filename")) { fileName = iter.next(); } } - + if (type.equalsIgnoreCase("sanity")) isSanity = true; else if (type.equalsIgnoreCase("regression")) @@ -193,7 +193,7 @@ public class TestCaseEngine { testCaseName = ((Element) testCaseNameList.item(0)) .getTextContent(); } - + if (isSanity == true && !testCaseName.equals("SANITY TEST")) continue; else if (isRegression == true && !(testCaseName.equals("SANITY TEST") || testCaseName.equals("REGRESSION TEST"))) @@ -221,13 +221,13 @@ public class TestCaseEngine { } } } - + //If sanity test required, make sure that SANITY TEST componennt got loaded if (isSanity == true && _componentMap.size() == 0) { s_logger.error("FAILURE!!! Failed to load SANITY TEST component. Verify that the test is uncommented in adapter.xml"); System.exit(1); } - + if (isRegression == true && _componentMap.size() != 2) { s_logger.error("FAILURE!!! Failed to load SANITY TEST or REGRESSION TEST components. Verify that these tests are uncommented in adapter.xml"); System.exit(1); diff --git a/test/src/com/cloud/test/regression/VMApiTest.java b/test/src/com/cloud/test/regression/VMApiTest.java index 32f22bc9b27..780ec14ab95 100644 --- a/test/src/com/cloud/test/regression/VMApiTest.java +++ b/test/src/com/cloud/test/regression/VMApiTest.java @@ -28,30 +28,30 @@ import com.cloud.test.regression.ApiCommand.ResponseType; public class VMApiTest extends TestCase{ public static final Logger s_logger = Logger.getLogger(VMApiTest.class.getName()); - - + + public VMApiTest(){ this.setClient(); this.setParam(new HashMap()); } - + public boolean executeTest(){ - int error=0; + int error=0; Element rootElement = this.getInputFile().get(0).getDocumentElement(); NodeList commandLst = rootElement.getElementsByTagName("command"); - + //Analyze each command, send request and build the array list of api commands for (int i=0; i argsList = Arrays.asList(args); Iterator iter = argsList.iterator(); @@ -41,21 +41,21 @@ public class SshTest { String arg = iter.next(); if (arg.equals("-h")) { host = iter.next(); - } + } if (arg.equals("-p")) { password = iter.next(); - } - + } + if (arg.equals("-u")) { url = iter.next(); - } + } } - + if (host == null || host.equals("")) { s_logger.info("Did not receive a host back from test, ignoring ssh test"); System.exit(2); } - + if (password == null){ s_logger.info("Did not receive a password back from test, ignoring ssh test"); System.exit(2); @@ -74,13 +74,13 @@ public class SshTest { s_logger.info("Authentication failed for root with password" + password); System.exit(2); } - + String linuxCommand = "wget " + url; Session sess = conn.openSession(); sess.execCommand(linuxCommand); sess.close(); conn.close(); - + } catch (Exception e) { s_logger.error("SSH test fail with error", e); System.exit(2); diff --git a/test/src/com/cloud/test/stress/StressTestDirectAttach.java b/test/src/com/cloud/test/stress/StressTestDirectAttach.java index 0a74fa8a1d9..07fdca1901c 100644 --- a/test/src/com/cloud/test/stress/StressTestDirectAttach.java +++ b/test/src/com/cloud/test/stress/StressTestDirectAttach.java @@ -174,7 +174,7 @@ public class StressTestDirectAttach { username = Math.abs(ran.nextInt())+ "-user"; NDC.push(username); - s_logger.info("Starting test for the user " + username); + s_logger.info("Starting test for the user " + username); int response = executeDeployment(server, developerServer, username); boolean success = false; @@ -228,7 +228,7 @@ public class StressTestDirectAttach { usageIterator = 1; } - else { + else { s_logger.info("Skipping events and usage records for this user: usageIterator " + usageIterator+ " and number of Threads " + numThreads); usageIterator++; } @@ -490,7 +490,7 @@ public class StressTestDirectAttach { returnValue = requestKeyValues.get("secretkey"); } else { s_logger.error("registration failed with error code: " + responseCode); - } + } return returnValue; } @@ -515,7 +515,7 @@ public class StressTestDirectAttach { String url = server + "?command=createUser&username=" + encodedUsername + "&password=" + encodedPassword - + "&firstname=Test&lastname=Test&email=test@vmops.com&domainId=1&accounttype=0"; + + "&firstname=Test&lastname=Test&email=test@vmops.com&domainId=1&accounttype=0"; if (accountName != null ) { url = server + "?command=createUser&username=" + encodedUsername + "&password=" + encodedPassword @@ -544,7 +544,7 @@ public class StressTestDirectAttach { } else { s_logger.error("create user test failed for user " + username + " with error code :" + responseCode); return responseCode; - } + } _secretKey.set(executeRegistration(server, username, username)); @@ -594,7 +594,7 @@ public class StressTestDirectAttach { } else { s_logger.error("Create security group failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } String encodedCidr = URLEncoder.encode("192.168.1.143/32", "UTF-8"); @@ -619,7 +619,7 @@ public class StressTestDirectAttach { } else { s_logger.error("Authorise security group ingress failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } @@ -670,7 +670,7 @@ public class StressTestDirectAttach { } else { s_logger.error("deploy linux vm failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } @@ -701,7 +701,7 @@ public class StressTestDirectAttach { } else { s_logger.error("create volume failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } //attach a new volume to the vm @@ -728,7 +728,7 @@ public class StressTestDirectAttach { } else { s_logger.error("Attach volume failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } //DEPLOY SECOND VM, ADD VOLUME TO IT @@ -778,7 +778,7 @@ public class StressTestDirectAttach { } else { s_logger.error("deploy linux vm failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } @@ -809,7 +809,7 @@ public class StressTestDirectAttach { } else { s_logger.error("create volume failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } //attach a new volume to the vm @@ -836,10 +836,10 @@ public class StressTestDirectAttach { } else { s_logger.error("Attach volume failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } return 200; - } + } @@ -874,7 +874,7 @@ public class StressTestDirectAttach { } else { s_logger.error("get user failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } // ----------------------------- // UPDATE USER @@ -895,7 +895,7 @@ public class StressTestDirectAttach { } else { s_logger.error("update user failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } // ----------------------------- @@ -926,7 +926,7 @@ public class StressTestDirectAttach { } else { s_logger.error(" VM test failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } //Stop centos VM requestToSign = "apikey=" + encodedApiKey + "&command=stopVirtualMachine&id=" + _linuxVmId.get(); @@ -951,7 +951,7 @@ public class StressTestDirectAttach { } else { s_logger.error("Stop VM test failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } //Start centos VM requestToSign = "apikey=" + encodedApiKey + "&command=startVirtualMachine&id=" + _linuxVmId.get(); @@ -986,7 +986,7 @@ public class StressTestDirectAttach { } else { s_logger.error("Start VM test failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } //// // ----------------------------- //// // DISABLE USER @@ -1005,7 +1005,7 @@ public class StressTestDirectAttach { // } else { // s_logger.error("disable user failed with error code: " + responseCode + ". Following URL was sent: " + url); // return responseCode; -// } +// } // } // ----------------------------- @@ -1025,7 +1025,7 @@ public class StressTestDirectAttach { } else { s_logger.error("delete user failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } return responseCode; } @@ -1063,7 +1063,7 @@ public class StressTestDirectAttach { s_logger.error("list events failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } return responseCode; } @@ -1105,7 +1105,7 @@ public class StressTestDirectAttach { } else { s_logger.error("get user failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } { // ---------------------------------- @@ -1152,7 +1152,7 @@ public class StressTestDirectAttach { } else { s_logger.error("list virtual machines test failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } // ---------------------------------- @@ -1182,7 +1182,7 @@ public class StressTestDirectAttach { } else { s_logger.error("Stop virtual machine test failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } } } @@ -1200,7 +1200,7 @@ public class StressTestDirectAttach { // } else { // s_logger.error("delete user failed with error code: " + responseCode + ". Following URL was sent: " + url); // return responseCode; -// } +// } // } @@ -1388,9 +1388,9 @@ public class StressTestDirectAttach { boolean success = false; String linuxCommand = null; - if (i % 10 == 0) + if (i % 10 == 0) linuxCommand = "rm -rf *; wget http://192.168.1.250/dump.bin && ls -al dump.bin"; - else + else linuxCommand = "wget http://192.168.1.250/dump.bin && ls -al dump.bin"; Session sess = conn.openSession(); @@ -1493,7 +1493,7 @@ public class StressTestDirectAttach { return null; } - //s_logger.info("Job id is " + jobId); + //s_logger.info("Job id is " + jobId); String resultUrl = host + "?command=queryAsyncJobResult&jobid=" + jobId; HttpClient client = new HttpClient(); HttpMethod method = new GetMethod(resultUrl); @@ -1523,6 +1523,6 @@ public class StressTestDirectAttach { } } return returnBody; - } + } } diff --git a/test/src/com/cloud/test/stress/TestClientWithAPI.java b/test/src/com/cloud/test/stress/TestClientWithAPI.java index e0fb9e22903..283b7e99f9c 100644 --- a/test/src/com/cloud/test/stress/TestClientWithAPI.java +++ b/test/src/com/cloud/test/stress/TestClientWithAPI.java @@ -472,7 +472,7 @@ public class TestClientWithAPI { for (int j = 0; j < childNodes.getLength(); j++) { Node n = childNodes.item(j); //Id is being used instead of ipaddress. Changes need to done later to ipaddress variable - if ("id".equals(n.getNodeName())) + if ("id".equals(n.getNodeName())) { ipAddressId = n.getTextContent(); } @@ -703,14 +703,14 @@ public class TestClientWithAPI { if ((values.get("ipaddress") == null)|| (values.get("id") == null)) { s_logger.info("associate ip for Windows response code: 401, the command was sent with url " + url); return 401; - } + } else { s_logger.info("Associate IP Address response code: " + responseCode); long publicIpId = Long.parseLong(values.get("id")); s_logger.info("Associate IP's Id: " + publicIpId); - _publicIpId.set(values.get("id")); - } + _publicIpId.set(values.get("id")); + } } else { s_logger.error("associate ip address for windows vm failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; @@ -801,7 +801,7 @@ public class TestClientWithAPI { s_logger.error("Enable Static NAT failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; } - */ + */ // ------------------------------------------------------------- // CREATE IP FORWARDING RULE -- Linux VM // ------------------------------------------------------------- @@ -939,7 +939,7 @@ public class TestClientWithAPI { } else { s_logger.error("Enable Static NAT failed with error code: " + responseCode + ". Following URL was sent: " + url); return responseCode; - } + } // ------------------------------------------------------------- @@ -1895,7 +1895,7 @@ public class TestClientWithAPI { if (responseCode == 200) { InputStream input = method.getResponseBodyAsStream(); Element el = queryAsyncJobResult(server, input); - s_logger.info("IP forwarding rule was successfully deleted"); + s_logger.info("IP forwarding rule was successfully deleted"); } else { s_logger.error("IP forwarding rule creation failed with error code: " + responseCode + ". Following URL was sent: " + url); @@ -1906,7 +1906,7 @@ public class TestClientWithAPI { // Disable Static NAT for the Source NAT Ip //-------------------------------------------- encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8"); - String encodedPublicIpId = URLEncoder.encode(_publicIpId.get(), "UTF-8"); + String encodedPublicIpId = URLEncoder.encode(_publicIpId.get(), "UTF-8"); requestToSign = "apikey=" + encodedApiKey + "&command=disableStaticNat"+"&id=" + encodedPublicIpId; requestToSign = requestToSign.toLowerCase(); signature = signRequest(requestToSign, _secretKey.get()); diff --git a/test/src/com/cloud/test/stress/WgetTest.java b/test/src/com/cloud/test/stress/WgetTest.java index 5d0841c0c79..4c70d53459e 100644 --- a/test/src/com/cloud/test/stress/WgetTest.java +++ b/test/src/com/cloud/test/stress/WgetTest.java @@ -28,16 +28,16 @@ import com.trilead.ssh2.Connection; import com.trilead.ssh2.Session; public class WgetTest { - + public static int MAX_RETRY_LINUX = 1; public static final Logger s_logger = Logger.getLogger(WgetTest.class.getName()); public static String host = ""; public static String password = "rs-ccb35ea5"; - - + + public static void main (String[] args) { - + // Parameters List argsList = Arrays.asList(args); Iterator iter = argsList.iterator(); @@ -46,22 +46,22 @@ public class WgetTest { // host if (arg.equals("-h")) { host = iter.next(); - } + } //password - + if (arg.equals("-p")) { password = iter.next(); - } - + } + } - + int i = 0; if (host == null || host.equals("")) { s_logger .info("Did not receive a host back from test, ignoring ssh test"); System.exit(2); } - + if (password == null){ s_logger.info("Did not receive a password back from test, ignoring ssh test"); System.exit(2); @@ -90,21 +90,21 @@ public class WgetTest { s_logger.info("Authentication failed for root with password" + password); System.exit(2); } - + boolean success = false; String linuxCommand = null; - - if (i % 10 == 0) + + if (i % 10 == 0) linuxCommand = "rm -rf *; wget http://192.168.1.250/dump.bin && ls -al dump.bin"; - else + else linuxCommand = "wget http://192.168.1.250/dump.bin && ls -al dump.bin"; - + Session sess = conn.openSession(); sess.execCommand(linuxCommand); InputStream stdout = sess.getStdout(); InputStream stderr = sess.getStderr(); - + byte[] buffer = new byte[8192]; while (true) { @@ -141,7 +141,7 @@ public class WgetTest { sess.close(); conn.close(); - + if (!success) { retry++; if (retry == MAX_RETRY_LINUX) { diff --git a/test/src/com/cloud/test/ui/AddAndDeleteAISO.java b/test/src/com/cloud/test/ui/AddAndDeleteAISO.java index e4eedf85e26..32c8ada2cc2 100644 --- a/test/src/com/cloud/test/ui/AddAndDeleteAISO.java +++ b/test/src/com/cloud/test/ui/AddAndDeleteAISO.java @@ -39,12 +39,12 @@ public class AddAndDeleteAISO extends AbstractSeleniumTestCase { selenium.click("label"); selenium.type("add_iso_name", "abc"); - selenium.type("add_iso_display_text", "abc"); + selenium.type("add_iso_display_text", "abc"); String iso_url = System.getProperty("add_iso_url", "http://10.91.28.6/ISO/Fedora-11-i386-DVD.iso"); selenium.type("add_iso_url", iso_url); - String iso_zone = System.getProperty("add_iso_zone", "All Zones"); + String iso_zone = System.getProperty("add_iso_zone", "All Zones"); selenium.select("add_iso_zone", "label="+iso_zone); - String iso_os_type = System.getProperty("add_iso_os_type", "Fedora 11"); + String iso_os_type = System.getProperty("add_iso_os_type", "Fedora 11"); selenium.select("add_iso_os_type", "label="+iso_os_type); selenium.click("//div[28]/div[11]/button[1]"); Thread.sleep(3000); @@ -57,7 +57,7 @@ public class AddAndDeleteAISO extends AbstractSeleniumTestCase { selenium.click("//div[" +i+ "]/div/div[2]/span/span"); } } - catch(Exception ex) { + catch(Exception ex) { } for (int second = 0;; second++) { @@ -74,7 +74,7 @@ public class AddAndDeleteAISO extends AbstractSeleniumTestCase { for(int j =1;j<=i;j++) { - if (selenium.isTextPresent("Ready")) + if (selenium.isTextPresent("Ready")) { status=0; break; diff --git a/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java b/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java index ed4b770d85f..e18cb22b742 100644 --- a/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java +++ b/test/src/com/cloud/test/ui/AddAndDeleteATemplate.java @@ -41,9 +41,9 @@ public class AddAndDeleteATemplate extends AbstractSeleniumTestCase { selenium.type("add_template_display_text", "abc"); String template_url = System.getProperty("add_template_url", "http://10.91.28.6/templates/centos53-x86_64/latest/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2"); selenium.type("add_template_url", template_url); - String template_zone = System.getProperty("add_template_zone", "All Zones"); + String template_zone = System.getProperty("add_template_zone", "All Zones"); selenium.select("add_template_zone", "label="+template_zone); - String template_os_type = System.getProperty("add_template_os_type", "CentOS 5.3 (32-bit)"); + String template_os_type = System.getProperty("add_template_os_type", "CentOS 5.3 (32-bit)"); selenium.select("add_template_os_type", "label="+template_os_type); selenium.click("//div[28]/div[11]/button[1]"); Thread.sleep(3000); @@ -56,7 +56,7 @@ public class AddAndDeleteATemplate extends AbstractSeleniumTestCase { selenium.click("//div[" +i+ "]/div/div[2]/span/span"); } } - catch(Exception ex) { + catch(Exception ex) { } for (int second = 0;; second++) { @@ -73,7 +73,7 @@ public class AddAndDeleteATemplate extends AbstractSeleniumTestCase { for(int j =1;j<=i;j++) { - if (selenium.isTextPresent("Ready")) + if (selenium.isTextPresent("Ready")) { status=0; break; diff --git a/test/src/com/cloud/test/utils/ConsoleProxy.java b/test/src/com/cloud/test/utils/ConsoleProxy.java index 2ab78a95a5f..ac9f3b06504 100644 --- a/test/src/com/cloud/test/utils/ConsoleProxy.java +++ b/test/src/com/cloud/test/utils/ConsoleProxy.java @@ -44,14 +44,14 @@ public class ConsoleProxy implements Runnable { public int getConnectionsMade() { return this.connectionsMade; } - + public long getResponseTime() { return this.responseTime; } - + public void run() { while (true){ - + Script myScript = new Script("wget"); myScript.add(command); myScript.execute(); @@ -62,22 +62,22 @@ public class ConsoleProxy implements Runnable { if (response!=null){ s_logger.info("Content lenght is incorrect: "+response); } - + long duration = (end - begin); this.connectionsMade++; this.responseTime=this.responseTime+duration; try{ Thread.sleep(1000); }catch (InterruptedException e){ - + } - + } } public class wgetInt extends OutputInterpreter { private long end; - + public long getEnd() { return end; } @@ -105,7 +105,7 @@ public class ConsoleProxy implements Runnable { else status=line; } - + } return status; } diff --git a/test/src/com/cloud/test/utils/IpSqlGenerator.java b/test/src/com/cloud/test/utils/IpSqlGenerator.java index 9ae22ebad38..45043ac6a42 100644 --- a/test/src/com/cloud/test/utils/IpSqlGenerator.java +++ b/test/src/com/cloud/test/utils/IpSqlGenerator.java @@ -30,24 +30,24 @@ public class IpSqlGenerator { System.out.println(" will generate ips ranging from public ips 192.168.1.1 to 192.168.1.255 for dc 1 and pod 1"); return; } - + String type = args[0]; - + StringTokenizer st = new StringTokenizer(args[1], "."); int ipS1 = Integer.parseInt(st.nextToken()); int ipS2 = Integer.parseInt(st.nextToken()); int ipS3 = Integer.parseInt(st.nextToken()); int ipS4 = Integer.parseInt(st.nextToken()); - + st = new StringTokenizer(args[2], "."); int ipE1 = Integer.parseInt(st.nextToken()); int ipE2 = Integer.parseInt(st.nextToken()); int ipE3 = Integer.parseInt(st.nextToken()); int ipE4 = Integer.parseInt(st.nextToken()); - + String dcId = args[3]; String podId = args[4]; - + if (type.equals("private")) { FileOutputStream fs = new FileOutputStream(new File("private-ips.sql")); DataOutputStream out = new DataOutputStream(fs); @@ -55,7 +55,7 @@ public class IpSqlGenerator { for (int j = ipS2; j <= ipE2; j++) { for (int k = ipS3; k <= ipE3; k++) { for (int l = ipS4; l <= ipE4; l++) { - out.writeBytes("INSERT INTO `vmops`.`dc_ip_address_alloc` (ip_address, data_center_id, pod_id) VALUES ('" + out.writeBytes("INSERT INTO `vmops`.`dc_ip_address_alloc` (ip_address, data_center_id, pod_id) VALUES ('" + i + "." + j + "." + k + "." + l + "'," + dcId + "," + podId + ");\r\n"); } } @@ -71,7 +71,7 @@ public class IpSqlGenerator { for (int j = ipS2; j <= ipE2; j++) { for (int k = ipS3; k <= ipE3; k++) { for (int l = ipS4; l <= ipE4; l++) { - out.writeBytes("INSERT INTO `vmops`.`user_ip_address` (ip_address, data_center_id) VALUES ('" + out.writeBytes("INSERT INTO `vmops`.`user_ip_address` (ip_address, data_center_id) VALUES ('" + i + "." + j + "." + k + "." + l + "'," + dcId + ");\r\n"); } } @@ -82,7 +82,7 @@ public class IpSqlGenerator { out.close(); } } catch (Exception e) { - + } } } diff --git a/test/src/com/cloud/test/utils/ProxyLoadTemp.java b/test/src/com/cloud/test/utils/ProxyLoadTemp.java index 638818d60e3..dc5ed8479da 100644 --- a/test/src/com/cloud/test/utils/ProxyLoadTemp.java +++ b/test/src/com/cloud/test/utils/ProxyLoadTemp.java @@ -32,16 +32,16 @@ public class ProxyLoadTemp { public static long begin; public static long end; public static long sum=0; - - public ProxyLoadTemp(){ + + public ProxyLoadTemp(){ } - + public static void main (String[] args){ begin= System.currentTimeMillis(); Runtime.getRuntime().addShutdownHook(new ShutdownThread(new ProxyLoadTemp())); ConsoleProxy.proxyIp="172-16-1-101"; - - try + + try { BufferedReader consoleInput = new BufferedReader(new FileReader("console.input")); boolean eof = false; @@ -55,7 +55,7 @@ public class ProxyLoadTemp { } else{ String[] result=null; - try + try { s_logger.info("Starting parsing line "+line); result= parseLine(line, "[,]"); @@ -63,21 +63,21 @@ public class ProxyLoadTemp { ConsoleProxy proxy = new ConsoleProxy(result[0], result[1], result[2]); proxyList.add(proxy); new Thread(proxy).start(); - numThreads++; - + numThreads++; + } catch (Exception ex){ s_logger.warn(ex); } } - + } }catch(Exception e){ s_logger.warn(e); } - + } - + public static class ShutdownThread extends Thread { ProxyLoadTemp temp; public ShutdownThread(ProxyLoadTemp temp) { @@ -85,7 +85,7 @@ public class ProxyLoadTemp { } public void run() { s_logger.info("Program was running in "+numThreads+" threads"); - + for (int j=0; j argsList = Arrays.asList(args); @@ -52,7 +52,7 @@ public class SignEC2 { url = iter.next(); } } - + Properties prop = new Properties(); try { prop.load(new FileInputStream("../conf/tool.properties")); @@ -60,46 +60,46 @@ public class SignEC2 { s_logger.error("Error reading from ../conf/tool.properties", ex); System.exit(2); } - + host = prop.getProperty("host"); secretkey = prop.getProperty("secretkey"); port = prop.getProperty("port"); - - + + if (host == null) { s_logger.info("Please set host in tool.properties file"); System.exit(1); } - + if (port == null) { s_logger.info("Please set port in tool.properties file"); System.exit(1); } - + if (url == null) { s_logger.info("Please specify url with -u option"); System.exit(1); } - + if (secretkey == null) { s_logger.info("Please set secretkey in tool.properties file"); System.exit(1); } - + if (prop.get("apikey") == null) { s_logger.info("Please set apikey in tool.properties file"); System.exit(1); } - + if (prop.get("accesspoint") == null) { s_logger.info("Please set apikey in tool.properties file"); System.exit(1); } - - - + + + TreeMap param = new TreeMap(); - + String req = "GET\n" + host + ":" + prop.getProperty("port") + "\n/" + prop.getProperty("accesspoint") + "\n"; String temp = ""; param.put("AWSAccessKeyId", prop.getProperty("apikey")); @@ -108,7 +108,7 @@ public class SignEC2 { param.put("SignatureVersion", "2"); param.put("Version", prop.getProperty("version")); param.put("id", "1"); - + StringTokenizer str1 = new StringTokenizer (url, "&"); while(str1.hasMoreTokens()) { String newEl = str1.nextToken(); @@ -117,7 +117,7 @@ public class SignEC2 { String value= str2.nextToken(); param.put(name, value); } - + //sort url hash map by key Set c = param.entrySet(); Iterator it = c.iterator(); @@ -130,7 +130,7 @@ public class SignEC2 { } catch (Exception ex) { s_logger.error("Unable to set parameter " + value + " for the command " + param.get("command")); } - + } temp = temp.substring(0, temp.length()-1 ); String requestToSign = req + temp; @@ -143,6 +143,6 @@ public class SignEC2 { } String url = "http://" + host + ":" + prop.getProperty("port") + "/" + prop.getProperty("accesspoint") + "?" + temp + "&Signature=" + encodedSignature; s_logger.info("Url is " + url); - + } } diff --git a/test/src/com/cloud/test/utils/SignRequest.java b/test/src/com/cloud/test/utils/SignRequest.java index 7f18d92c2e2..10258a3efe7 100644 --- a/test/src/com/cloud/test/utils/SignRequest.java +++ b/test/src/com/cloud/test/utils/SignRequest.java @@ -30,8 +30,8 @@ public class SignRequest { public static String apikey; public static String secretkey; public static String command; - - + + public static void main (String[] args) { // Parameters List argsList = Arrays.asList(args); @@ -40,38 +40,38 @@ public class SignRequest { String arg = iter.next(); if (arg.equals("-a")) { apikey = iter.next(); - + } if (arg.equals("-u")) { url = iter.next(); } - + if (arg.equals("-s")) { secretkey = iter.next(); } } - - + + if (url == null) { System.out.println("Please specify url with -u option. Example: -u \"command=listZones&id=1\""); System.exit(1); } - + if (apikey == null) { System.out.println("Please specify apikey with -a option"); System.exit(1); } - + if (secretkey == null) { System.out.println("Please specify secretkey with -s option"); System.exit(1); } - + TreeMap param = new TreeMap(); - + String temp = ""; param.put("apikey", apikey); - + StringTokenizer str1 = new StringTokenizer (url, "&"); while(str1.hasMoreTokens()) { String newEl = str1.nextToken(); @@ -80,7 +80,7 @@ public class SignRequest { String value= str2.nextToken(); param.put(name, value); } - + //sort url hash map by key Set c = param.entrySet(); Iterator it = c.iterator(); @@ -93,10 +93,10 @@ public class SignRequest { } catch (Exception ex) { System.out.println("Unable to set parameter " + value + " for the command " + param.get("command")); } - + } temp = temp.substring(0, temp.length()-1 ); - String requestToSign = temp.toLowerCase(); + String requestToSign = temp.toLowerCase(); System.out.println("After sorting: " + requestToSign); String signature = UtilsForTest.signRequest(requestToSign, secretkey); System.out.println("After Base64 encoding: " + signature); @@ -109,6 +109,6 @@ public class SignRequest { System.out.println("After UTF8 encoding: " + encodedSignature); String url = temp + "&signature=" + encodedSignature; System.out.println("After sort and add signature: " + url); - + } } diff --git a/test/src/com/cloud/test/utils/SqlDataGenerator.java b/test/src/com/cloud/test/utils/SqlDataGenerator.java index bd83eddd50f..1602b8fb84b 100644 --- a/test/src/com/cloud/test/utils/SqlDataGenerator.java +++ b/test/src/com/cloud/test/utils/SqlDataGenerator.java @@ -25,9 +25,9 @@ public class SqlDataGenerator { public static void main (String[] args) { try { FileOutputStream fs = new FileOutputStream(new File("out.txt")); - + DataOutputStream out = new DataOutputStream(fs); - + for (int i = 20; i < 171; i++) { out.writeBytes("INSERT INTO `vmops`.`dc_ip_address_alloc` (ip_address, data_center_id, pod_id) VALUES ('192.168.2."+i+"',1,1);\r\n"); } @@ -38,11 +38,11 @@ public class SqlDataGenerator { formatter.format("%04x", i); out.writeBytes("INSERT INTO `vmops`.`dc_vnet_alloc` (vnet, data_center_id) VALUES ('"+imagePath.toString()+"',1);\r\n"); } - + out.flush(); out.close(); } catch (Exception e) { - + } } } diff --git a/test/src/com/cloud/test/utils/SubmitCert.java b/test/src/com/cloud/test/utils/SubmitCert.java index a57afd0663c..005bc9cd636 100644 --- a/test/src/com/cloud/test/utils/SubmitCert.java +++ b/test/src/com/cloud/test/utils/SubmitCert.java @@ -50,8 +50,8 @@ public class SubmitCert { public static String cert; public static final Logger s_logger = Logger .getLogger(SubmitCert.class.getName()); - - + + public static void main (String[] args) { // Parameters List argsList = Arrays.asList(args); @@ -62,20 +62,20 @@ public class SubmitCert { if (arg.equals("-c")) { certFileName = iter.next(); } - + if (arg.equals("-s")) { secretKey = iter.next(); } - + if (arg.equals("-a")) { apiKey = iter.next(); - } - + } + if (arg.equals("-action")) { url = "Action=" + iter.next(); - } + } } - + Properties prop = new Properties(); try { prop.load(new FileInputStream("conf/tool.properties")); @@ -83,7 +83,7 @@ public class SubmitCert { s_logger.error("Error reading from conf/tool.properties", ex); System.exit(2); } - + host = prop.getProperty("host"); port = prop.getProperty("port"); @@ -91,44 +91,44 @@ public class SubmitCert { s_logger.error("Please set path to certificate (including file name) with -c option"); System.exit(1); } - + if (secretKey == null) { s_logger.error("Please set secretkey with -s option"); System.exit(1); } - + if (apiKey == null) { s_logger.error("Please set apikey with -a option"); System.exit(1); } - + if (host == null) { s_logger.error("Please set host in tool.properties file"); System.exit(1); } - + if (port == null) { s_logger.error("Please set port in tool.properties file"); System.exit(1); } - - + + TreeMap param = new TreeMap(); - + String req = "GET\n" + host + ":" + prop.getProperty("port") + "\n/" + prop.getProperty("accesspoint") + "\n"; String temp = ""; - + if (certFileName != null) { cert = readCert(certFileName); param.put("cert", cert); } - + param.put("AWSAccessKeyId", apiKey); param.put("Expires",prop.getProperty("expires")); param.put("SignatureMethod", prop.getProperty("signaturemethod")); param.put("SignatureVersion", "2"); param.put("Version", prop.getProperty("version")); - + StringTokenizer str1 = new StringTokenizer (url, "&"); while(str1.hasMoreTokens()) { String newEl = str1.nextToken(); @@ -137,7 +137,7 @@ public class SubmitCert { String value= str2.nextToken(); param.put(name, value); } - + //sort url hash map by key Set c = param.entrySet(); Iterator it = c.iterator(); @@ -150,7 +150,7 @@ public class SubmitCert { } catch (Exception ex) { s_logger.error("Unable to set parameter " + value + " for the command " + param.get("command"), ex); } - + } temp = temp.substring(0, temp.length()-1 ); String requestToSign = req + temp; @@ -161,12 +161,12 @@ public class SubmitCert { } catch (Exception ex) { ex.printStackTrace(); } - + String url = "http://" + host + ":" + prop.getProperty("port") + "/" + prop.getProperty("accesspoint") + "?" + temp + "&Signature=" + encodedSignature; s_logger.info("Sending request with url: " + url + "\n"); sendRequest(url); } - + public static String readCert(String filePath) { try { StringBuffer fileData = new StringBuffer(1000); @@ -186,7 +186,7 @@ public class SubmitCert { return null; } } - + public static void sendRequest(String url) { try { HttpClient client = new HttpClient(); @@ -197,7 +197,7 @@ public class SubmitCert { } catch (Exception ex) { ex.printStackTrace(); } - + } - + } diff --git a/test/src/com/cloud/test/utils/TestClient.java b/test/src/com/cloud/test/utils/TestClient.java index dbd6d14f884..ba9e14c5862 100644 --- a/test/src/com/cloud/test/utils/TestClient.java +++ b/test/src/com/cloud/test/utils/TestClient.java @@ -41,16 +41,16 @@ public class TestClient { private static int numOfUsers = 0; private static String[] users = null; private static boolean internet = true; - + private static final int MAX_RETRY_LINUX = 5; private static final int MAX_RETRY_WIN = 10; - + public static void main (String[] args) { String host = "http://localhost"; String port = "8080"; String testUrl = "/client/test"; int numThreads = 1; - + try { // Parameters List argsList = Arrays.asList(args); @@ -61,41 +61,41 @@ public class TestClient { if (arg.equals("-h")) { host = "http://" + iter.next(); } - + if (arg.equals("-p")) { port = iter.next(); } - + if (arg.equals("-t")) { numThreads = Integer.parseInt(iter.next()); } - + if (arg.equals("-s")) { sleepTime = Long.parseLong(iter.next()); } - + if (arg.equals("-c")) { cleanUp = Boolean.parseBoolean(iter.next()); if (!cleanUp) sleepTime = 0L; // no need to wait if we don't ever cleanup } - + if (arg.equals("-r")) { repeat = Boolean.parseBoolean(iter.next()); } - + if (arg.equals("-u")) { numOfUsers = Integer.parseInt(iter.next()); } - + if (arg.equals("-i")) { internet = Boolean.parseBoolean(iter.next()); } } - + final String server = host+":"+port+testUrl; s_logger.info("Starting test against server: " + server + " with " + numThreads + " thread(s)"); if (cleanUp) s_logger.info("Clean up is enabled, each test will wait " + sleepTime + " ms before cleaning up"); - + if (numOfUsers > 0) { s_logger.info("Pre-generating users for test of size : " + numOfUsers); users = new String[numOfUsers]; @@ -104,7 +104,7 @@ public class TestClient { users[i] = Math.abs(ran.nextInt()) + "-user"; } } - + for (int i = 0; i < numThreads; i++) { new Thread(new Runnable() { public void run() { @@ -131,10 +131,10 @@ public class TestClient { if (internet) { s_logger.info("Deploy successful...waiting 5 minute before SSH tests"); Thread.sleep(300000L); // Wait 60 seconds so the linux VM can boot up. - + s_logger.info("Begin Linux SSH test"); reason = sshTest(method.getResponseHeader("linuxIP").getValue()); - + if (reason == null) { s_logger.info("Linux SSH test successful"); s_logger.info("Begin Windows SSH test"); @@ -205,13 +205,13 @@ public class TestClient { s_logger.error(e); } } - + private static String sshWinTest(String host) { if (host == null) { s_logger.info("Did not receive a host back from test, ignoring win ssh test"); return null; } - + // We will retry 5 times before quitting int retry = 0; @@ -221,12 +221,12 @@ public class TestClient { s_logger.info("Retry attempt : " + retry + " ...sleeping 300 seconds before next attempt"); Thread.sleep(300000); } - + s_logger.info("Attempting to SSH into windows host " + host + " with retry attempt: " + retry); - + Connection conn = new Connection(host); conn.connect(null, 60000, 60000); - + s_logger.info("SSHed successfully into windows host " + host); boolean success = false; boolean isAuthenticated = conn.authenticateWithPassword("vmops", "vmops"); @@ -234,48 +234,48 @@ public class TestClient { return "Authentication failed"; } SCPClient scp = new SCPClient(conn); - + scp.put("wget.exe", ""); - + Session sess = conn.openSession(); s_logger.info("Executing : wget http://172.16.0.220/dump.bin"); sess.execCommand("wget http://172.16.0.220/dump.bin && dir dump.bin"); - + InputStream stdout = sess.getStdout(); InputStream stderr = sess.getStderr(); - + byte[] buffer = new byte[8192]; while (true) { if ((stdout.available() == 0) && (stderr.available() == 0)) { int conditions = sess.waitForCondition(ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA | ChannelCondition.EOF, 120000); - + if ((conditions & ChannelCondition.TIMEOUT) != 0) { s_logger.info("Timeout while waiting for data from peer."); return null; } - + if ((conditions & ChannelCondition.EOF) != 0) { if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) { break; } } } - + while (stdout.available() > 0) { success = true; int len = stdout.read(buffer); if (len > 0) // this check is somewhat paranoid s_logger.info(new String(buffer, 0, len)); } - + while (stderr.available() > 0) { int len = stderr.read(buffer); } } sess.close(); conn.close(); - + if (success) { return null; } else { @@ -292,13 +292,13 @@ public class TestClient { } } } - + private static String sshTest(String host) { if (host == null) { s_logger.info("Did not receive a host back from test, ignoring ssh test"); return null; } - + // We will retry 5 times before quitting int retry = 0; @@ -308,16 +308,16 @@ public class TestClient { s_logger.info("Retry attempt : " + retry + " ...sleeping 120 seconds before next attempt"); Thread.sleep(120000); } - + s_logger.info("Attempting to SSH into linux host " + host + " with retry attempt: " + retry); - + Connection conn = new Connection(host); conn.connect(null, 60000, 60000); - + s_logger.info("SSHed successfully into linux host " + host); - + boolean isAuthenticated = conn.authenticateWithPassword("root", "password"); - + if (isAuthenticated == false) { return "Authentication failed"; } @@ -325,43 +325,43 @@ public class TestClient { Session sess = conn.openSession(); s_logger.info("Executing : wget http://172.16.0.220/dump.bin"); sess.execCommand("wget http://172.16.0.220/dump.bin && ls -al dump.bin"); - + InputStream stdout = sess.getStdout(); InputStream stderr = sess.getStderr(); - + byte[] buffer = new byte[8192]; while (true) { if ((stdout.available() == 0) && (stderr.available() == 0)) { int conditions = sess.waitForCondition(ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA | ChannelCondition.EOF, 120000); - + if ((conditions & ChannelCondition.TIMEOUT) != 0) { s_logger.info("Timeout while waiting for data from peer."); return null; } - + if ((conditions & ChannelCondition.EOF) != 0) { if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) { break; } } } - + while (stdout.available() > 0) { success = true; int len = stdout.read(buffer); if (len > 0) // this check is somewhat paranoid s_logger.info(new String(buffer, 0, len)); } - + while (stderr.available() > 0) { int len = stderr.read(buffer); } } - + sess.close(); conn.close(); - + if (success) { return null; } else { diff --git a/tools/apidoc/XmlToHtmlConverter.java b/tools/apidoc/XmlToHtmlConverter.java index 92f82474909..2c88b9ae2a2 100644 --- a/tools/apidoc/XmlToHtmlConverter.java +++ b/tools/apidoc/XmlToHtmlConverter.java @@ -57,34 +57,34 @@ public class XmlToHtmlConverter extends XmlToHtmlConverterData { tFactory.newTransformer (new javax.xml.transform.stream.StreamSource ("generatetocfordomainadmin.xsl")); - + // The XML to be transformed must be at the location below. - // Modify this path to match your own setup. + // Modify this path to match your own setup. transformer2.transform (new javax.xml.transform.stream.StreamSource ("domain_admin/domainAdminSummary.xml"), // Modify this path to your own desired output location. new javax.xml.transform.stream.StreamResult ( new FileOutputStream("html/TOC_Domain_Admin.html"))); - + } catch (Exception e) { e.printStackTrace( ); } } - + // Create man pages public void generateIndividualCommandPages() { for(String commandName : rootAdminCommandNames) { - + try { - + TransformerFactory tFactory = TransformerFactory.newInstance(); Transformer transformer = tFactory.newTransformer (new javax.xml.transform.stream.StreamSource ("generateadmincommands.xsl")); - + transformer.transform // Modify this path to the location of the input files on your system. (new javax.xml.transform.stream.StreamSource @@ -96,17 +96,17 @@ public class XmlToHtmlConverter extends XmlToHtmlConverterData { e.printStackTrace( ); } } - + for(String commandName : domainAdminCommandNames) { - + try { - + TransformerFactory tFactory = TransformerFactory.newInstance(); Transformer transformer = tFactory.newTransformer (new javax.xml.transform.stream.StreamSource ("generatedomainadmincommands.xsl")); - + transformer.transform // Modify this path with the location of the input files on your system. (new javax.xml.transform.stream.StreamSource @@ -118,18 +118,18 @@ public class XmlToHtmlConverter extends XmlToHtmlConverterData { e.printStackTrace( ); } } - + for(String commandName : userCommandNames) { - + try { - + TransformerFactory tFactory = TransformerFactory.newInstance(); - + Transformer transformer = tFactory.newTransformer (new javax.xml.transform.stream.StreamSource ("generateusercommands.xsl")); - + transformer.transform (new javax.xml.transform.stream.StreamSource ("regular_user/"+commandName+".xml"), diff --git a/usage/src/com/cloud/usage/UsageSanityChecker.java b/usage/src/com/cloud/usage/UsageSanityChecker.java index c7b5c754a80..8ea25530c89 100644 --- a/usage/src/com/cloud/usage/UsageSanityChecker.java +++ b/usage/src/com/cloud/usage/UsageSanityChecker.java @@ -64,7 +64,7 @@ public class UsageSanityChecker { private boolean checkVmUsage(Connection conn) throws SQLException { boolean success = true; /* - * Check for Vm usage records which are created after the vm is destroyed + * Check for Vm usage records which are created after the vm is destroyed */ PreparedStatement pstmt = conn.prepareStatement("select count(*) from cloud_usage.cloud_usage cu inner join cloud.vm_instance vm where vm.type = 'User' " + "and cu.usage_type in (1 , 2) and cu.usage_id = vm.id and cu.start_date > vm.removed" + lastCheckId); @@ -76,7 +76,7 @@ public class UsageSanityChecker { } /* - * Check for Vms which have multiple running vm records in helper table + * Check for Vms which have multiple running vm records in helper table */ pstmt = conn.prepareStatement("select sum(cnt) from (select count(*) as cnt from cloud_usage.usage_vm_instance where usage_type =1 " + "and end_date is null group by vm_instance_id having count(vm_instance_id) > 1) c ;"); @@ -88,7 +88,7 @@ public class UsageSanityChecker { } /* - * Check for Vms which have multiple allocated vm records in helper table + * Check for Vms which have multiple allocated vm records in helper table */ pstmt = conn.prepareStatement("select sum(cnt) from (select count(*) as cnt from cloud_usage.usage_vm_instance where usage_type =2 " + "and end_date is null group by vm_instance_id having count(vm_instance_id) > 1) c ;"); @@ -100,7 +100,7 @@ public class UsageSanityChecker { } /* - * Check for Vms which have running vm entry without allocated vm entry in helper table + * Check for Vms which have running vm entry without allocated vm entry in helper table */ pstmt = conn.prepareStatement("select count(vm_instance_id) from cloud_usage.usage_vm_instance o where o.end_date is null and o.usage_type=1 and not exists " + "(select 1 from cloud_usage.usage_vm_instance i where i.vm_instance_id=o.vm_instance_id and usage_type=2 and i.end_date is null)"); @@ -116,7 +116,7 @@ public class UsageSanityChecker { private boolean checkVolumeUsage(Connection conn) throws SQLException { boolean success = true; /* - * Check for Volume usage records which are created after the volume is removed + * Check for Volume usage records which are created after the volume is removed */ PreparedStatement pstmt = conn.prepareStatement("select count(*) from cloud_usage.cloud_usage cu inner join cloud.volumes v " + "where cu.usage_type = 6 and cu.usage_id = v.id and cu.start_date > v.removed" + lastCheckId); @@ -142,7 +142,7 @@ public class UsageSanityChecker { private boolean checkTemplateISOUsage(Connection conn) throws SQLException { /* - * Check for Template/ISO usage records which are created after it is removed + * Check for Template/ISO usage records which are created after it is removed */ PreparedStatement pstmt = conn.prepareStatement("select count(*) from cloud_usage.cloud_usage cu inner join cloud.template_zone_ref tzr " + "where cu.usage_id = tzr.template_id and cu.zone_id = tzr.zone_id and cu.usage_type in (7,8) and cu.start_date > tzr.removed" + @@ -158,7 +158,7 @@ public class UsageSanityChecker { private boolean checkSnapshotUsage(Connection conn) throws SQLException { /* - * Check for snapshot usage records which are created after snapshot is removed + * Check for snapshot usage records which are created after snapshot is removed */ PreparedStatement pstmt = conn.prepareStatement("select count(*) from cloud_usage.cloud_usage cu inner join cloud.snapshots s " + "where cu.usage_id = s.id and cu.usage_type = 9 and cu.start_date > s.removed" + lastCheckId); @@ -183,7 +183,7 @@ public class UsageSanityChecker { } reader.close(); } catch (Exception e) { - // Error while reading last check id + // Error while reading last check id } Connection conn = TransactionLegacy.getStandaloneConnection(); diff --git a/utils/src/com/cloud/utils/DateUtil.java b/utils/src/com/cloud/utils/DateUtil.java index 5f373080abb..510afd28fbd 100644 --- a/utils/src/com/cloud/utils/DateUtil.java +++ b/utils/src/com/cloud/utils/DateUtil.java @@ -115,12 +115,12 @@ public class DateUtil { * @param intervalType hourly/daily/weekly/monthly * @param schedule MM[:HH][:DD] format. DD is day of week for weekly and day of month for monthly * @param timezone The timezone in which the schedule string is specified - * @param startDate if specified, returns next run time after the specified startDate + * @param startDate if specified, returns next run time after the specified startDate * @return */ public static Date getNextRunTime(IntervalType type, String schedule, String timezone, Date startDate) { - String[] scheduleParts = schedule.split(":"); //MM:HH:DAY + String[] scheduleParts = schedule.split(":"); //MM:HH:DAY final Calendar scheduleTime = Calendar.getInstance(); scheduleTime.setTimeZone(TimeZone.getTimeZone(timezone)); @@ -152,7 +152,7 @@ public class DateUtil { execDate = scheduleTime.getTime(); scheduleTime.setLenient(false); } - // XXX: !execDate.after(startDate) is strictly for testing. + // XXX: !execDate.after(startDate) is strictly for testing. // During testing we use a test clock which runs much faster than the real clock // So startDate and execDate will always be ahead in the future // and we will never increase the time here @@ -178,7 +178,7 @@ public class DateUtil { execDate = scheduleTime.getTime(); scheduleTime.setLenient(false); } - // XXX: !execDate.after(startDate) is strictly for testing. + // XXX: !execDate.after(startDate) is strictly for testing. // During testing we use a test clock which runs much faster than the real clock // So startDate and execDate will always be ahead in the future // and we will never increase the time here @@ -205,7 +205,7 @@ public class DateUtil { execDate = scheduleTime.getTime(); scheduleTime.setLenient(false); } - // XXX: !execDate.after(startDate) is strictly for testing. + // XXX: !execDate.after(startDate) is strictly for testing. // During testing we use a test clock which runs much faster than the real clock // So startDate and execDate will always be ahead in the future // and we will never increase the time here @@ -236,7 +236,7 @@ public class DateUtil { execDate = scheduleTime.getTime(); scheduleTime.setLenient(false); } - // XXX: !execDate.after(startDate) is strictly for testing. + // XXX: !execDate.after(startDate) is strictly for testing. // During testing we use a test clock which runs much faster than the real clock // So startDate and execDate will always be ahead in the future // and we will never increase the time here diff --git a/utils/src/com/cloud/utils/Journal.java b/utils/src/com/cloud/utils/Journal.java index bc966090860..2222b06489d 100644 --- a/utils/src/com/cloud/utils/Journal.java +++ b/utils/src/com/cloud/utils/Journal.java @@ -22,7 +22,7 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; /** - * Journal is used to kept what has happened during a process so someone can track + * Journal is used to kept what has happened during a process so someone can track * what happens during a process. * */ diff --git a/utils/src/com/cloud/utils/MethodCapturer.java b/utils/src/com/cloud/utils/MethodCapturer.java index c9e7786f941..bdd3762ceef 100644 --- a/utils/src/com/cloud/utils/MethodCapturer.java +++ b/utils/src/com/cloud/utils/MethodCapturer.java @@ -26,9 +26,9 @@ import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; /* - * This helper class provides a way to retrieve Method in a strong-type way. It takes advantage of power of + * This helper class provides a way to retrieve Method in a strong-type way. It takes advantage of power of * Intelligent IDE(Eclipse) in code-editing - * + * * DummyImpl dummy = new DummyImpl(); * MethodCapturer capturer = MethodCapturer.capture(dummy); * Method method = capturer.get(capturer.instance().foo2()); diff --git a/utils/src/com/cloud/utils/NumbersUtil.java b/utils/src/com/cloud/utils/NumbersUtil.java index 6c7961e1841..88d4c15096a 100755 --- a/utils/src/com/cloud/utils/NumbersUtil.java +++ b/utils/src/com/cloud/utils/NumbersUtil.java @@ -92,7 +92,7 @@ public class NumbersUtil { /** * Converts a string of the format 'yy-MM-dd'T'HH:mm:ss.SSS" into ms. - * + * * @param str containing the interval. * @param defaultValue value to return if str doesn't parse. If -1, throws VmopsRuntimeException * @return interval in ms diff --git a/utils/src/com/cloud/utils/PropertiesUtil.java b/utils/src/com/cloud/utils/PropertiesUtil.java index 4f856dfe873..bea6cc8f620 100755 --- a/utils/src/com/cloud/utils/PropertiesUtil.java +++ b/utils/src/com/cloud/utils/PropertiesUtil.java @@ -105,7 +105,7 @@ public class PropertiesUtil { } /* - * Returns an InputStream for the given resource + * Returns an InputStream for the given resource * This is needed to read the files within a jar in classpath. */ public static InputStream openStreamFromURL(String path) { @@ -163,7 +163,7 @@ public class PropertiesUtil { * Load a Properties object with contents from a File. * @param properties the properties object to be loaded * @param file the file to load from - * @throws IOException + * @throws IOException */ public static void loadFromFile(Properties properties, File file) throws IOException { InputStream stream = new FileInputStream(file); diff --git a/utils/src/com/cloud/utils/backoff/BackoffAlgorithm.java b/utils/src/com/cloud/utils/backoff/BackoffAlgorithm.java index 5471947b5cf..dbe934c96cd 100755 --- a/utils/src/com/cloud/utils/backoff/BackoffAlgorithm.java +++ b/utils/src/com/cloud/utils/backoff/BackoffAlgorithm.java @@ -19,7 +19,7 @@ package com.cloud.utils.backoff; import com.cloud.utils.component.Adapter; /** - * BackoffAlgorithm implements multiple BackoffAlgorithm. + * BackoffAlgorithm implements multiple BackoffAlgorithm. */ public interface BackoffAlgorithm extends Adapter { diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java index 32c8e86df5b..24bae470512 100755 --- a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java +++ b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java @@ -32,9 +32,9 @@ import com.cloud.utils.component.AdapterBase; /** * An implementation of BackoffAlgorithm that waits for some seconds. * After the time the client can try to perform the operation again. - * + * * @config - * {@table + * {@table * || Param Name | Description | Values | Default || * || seconds | seconds to sleep | integer | 5 || * } diff --git a/utils/src/com/cloud/utils/component/ComponentContext.java b/utils/src/com/cloud/utils/component/ComponentContext.java index 9470bef52da..08e835afd0b 100644 --- a/utils/src/com/cloud/utils/component/ComponentContext.java +++ b/utils/src/com/cloud/utils/component/ComponentContext.java @@ -39,7 +39,7 @@ import com.cloud.utils.mgmt.JmxUtil; import com.cloud.utils.mgmt.ManagementBean; /** - * + * * ComponentContext.setApplication() and ComponentContext.getApplication() * are not recommended to be used outside, they exist to help wire Spring Framework * diff --git a/utils/src/com/cloud/utils/component/ComponentLifecycle.java b/utils/src/com/cloud/utils/component/ComponentLifecycle.java index bb06feea817..96d95a7710a 100644 --- a/utils/src/com/cloud/utils/component/ComponentLifecycle.java +++ b/utils/src/com/cloud/utils/component/ComponentLifecycle.java @@ -47,14 +47,14 @@ public interface ComponentLifecycle extends Named { /** * Start any background tasks. - * + * * @return true if the tasks were started, false otherwise. */ public boolean start(); /** * Stop any background tasks. - * + * * @return true background tasks were stopped, false otherwise. */ public boolean stop(); diff --git a/utils/src/com/cloud/utils/component/Manager.java b/utils/src/com/cloud/utils/component/Manager.java index d53d5aea778..079443cb655 100755 --- a/utils/src/com/cloud/utils/component/Manager.java +++ b/utils/src/com/cloud/utils/component/Manager.java @@ -17,7 +17,7 @@ package com.cloud.utils.component; /** - * + * * For now we only expose some simple methods. In the future, we can use this **/ public interface Manager extends ComponentLifecycle { diff --git a/utils/src/com/cloud/utils/component/SystemIntegrityChecker.java b/utils/src/com/cloud/utils/component/SystemIntegrityChecker.java index aea7024fdd1..91b2a54f3c0 100755 --- a/utils/src/com/cloud/utils/component/SystemIntegrityChecker.java +++ b/utils/src/com/cloud/utils/component/SystemIntegrityChecker.java @@ -17,8 +17,8 @@ package com.cloud.utils.component; /** - * before any other components are loaded. Within ComponentLocator - * database upgrades and other verification to make sure it works. + * before any other components are loaded. Within ComponentLocator + * database upgrades and other verification to make sure it works. */ public interface SystemIntegrityChecker { public static final String Name = "system-integrity-checker"; diff --git a/utils/src/com/cloud/utils/concurrency/Scheduler.java b/utils/src/com/cloud/utils/concurrency/Scheduler.java index f7ff32cdeac..943f55c52c4 100644 --- a/utils/src/com/cloud/utils/concurrency/Scheduler.java +++ b/utils/src/com/cloud/utils/concurrency/Scheduler.java @@ -22,7 +22,7 @@ public interface Scheduler { /** * This is called from the TimerTask thread periodically about every one minute. - * + * */ public void poll(Date currentTimestamp); } diff --git a/utils/src/com/cloud/utils/concurrency/TestClock.java b/utils/src/com/cloud/utils/concurrency/TestClock.java index 32f59da8f80..ae52d23689c 100644 --- a/utils/src/com/cloud/utils/concurrency/TestClock.java +++ b/utils/src/com/cloud/utils/concurrency/TestClock.java @@ -22,7 +22,7 @@ import java.util.TimerTask; /** * A test clock which is also a TimerTask. The task calls a Scheduler's poll method - * + * */ public class TestClock extends TimerTask { private int _minute = 0; @@ -134,7 +134,7 @@ public class TestClock extends TimerTask { _year++; } if (_scheduler != null) { - // XXX: Creating new date is hugely inefficient for every minute. + // XXX: Creating new date is hugely inefficient for every minute. // Later the time in the database will be changed to currentTimeInMillis. // Then we can use System.getCurrentTimeInMillis() which is damn cheap. _cal.set(_year, _month, _day, _hour, _minute); diff --git a/utils/src/com/cloud/utils/encoding/URLEncoder.java b/utils/src/com/cloud/utils/encoding/URLEncoder.java index 73c1872a816..fdf177269cf 100644 --- a/utils/src/com/cloud/utils/encoding/URLEncoder.java +++ b/utils/src/com/cloud/utils/encoding/URLEncoder.java @@ -1,11 +1,11 @@ /* - * + * * Licensed 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. @@ -25,7 +25,7 @@ import java.util.BitSet; * * This class is very similar to the java.net.URLEncoder class. * - * Unfortunately, with java.net.URLEncoder there is no way to specify to the + * Unfortunately, with java.net.URLEncoder there is no way to specify to the * java.net.URLEncoder which characters should NOT be encoded. * * This code was moved from DefaultServlet.java diff --git a/utils/src/com/cloud/utils/exception/ExecutionException.java b/utils/src/com/cloud/utils/exception/ExecutionException.java index 7d70e5c0129..48388bfb7dc 100755 --- a/utils/src/com/cloud/utils/exception/ExecutionException.java +++ b/utils/src/com/cloud/utils/exception/ExecutionException.java @@ -20,7 +20,7 @@ import com.cloud.utils.SerialVersionUID; import com.cloud.utils.exception.CSExceptionErrorCode; /** - * a public method. + * a public method. * */ public class ExecutionException extends Exception { diff --git a/utils/src/com/cloud/utils/fsm/StateListener.java b/utils/src/com/cloud/utils/fsm/StateListener.java index ade0df392df..8c6b96e9a6b 100644 --- a/utils/src/com/cloud/utils/fsm/StateListener.java +++ b/utils/src/com/cloud/utils/fsm/StateListener.java @@ -18,7 +18,7 @@ package com.cloud.utils.fsm; public interface StateListener { /** - * Event is triggered before state machine transition finished. + * Event is triggered before state machine transition finished. * If you want to get the state of vm before state machine changed, you need to listen on this event * @param oldState VM's old state * @param event that triggered this VM state change diff --git a/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java b/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java index 83c1dce4a52..522c0300ba5 100644 --- a/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java +++ b/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java @@ -23,15 +23,15 @@ import org.apache.log4j.spi.ThrowableRenderer; /** * This renderer removes all the Cglib generated methods from the call - * + * * Unfortunately, I had to copy out the EnhancedThrowableRenderer from * the apach libraries because EnhancedThrowableRenderer is a final class. * simply override doRender. Not sure what the developers are thinking there * making it final. - * + * * * into log4j.xml. - * + * */ public class CglibThrowableRenderer implements ThrowableRenderer { /** diff --git a/utils/src/com/cloud/utils/net/Ip4Address.java b/utils/src/com/cloud/utils/net/Ip4Address.java index 01fc17e8177..37b5f47b0b7 100644 --- a/utils/src/com/cloud/utils/net/Ip4Address.java +++ b/utils/src/com/cloud/utils/net/Ip4Address.java @@ -52,7 +52,7 @@ public class Ip4Address { @Override public boolean equals(Object that) { - if (that instanceof String) { // Assume that is an ip4 address in String form + if (that instanceof String) { // Assume that is an ip4 address in String form return _addr.equals(that); } else if (that instanceof Ip4Address) { Ip4Address ip4 = (Ip4Address)that; diff --git a/utils/src/com/cloud/utils/net/MacAddress.java b/utils/src/com/cloud/utils/net/MacAddress.java index 452e5b51b2e..d42be4a8ae7 100755 --- a/utils/src/com/cloud/utils/net/MacAddress.java +++ b/utils/src/com/cloud/utils/net/MacAddress.java @@ -206,7 +206,7 @@ public class MacAddress { * * This is copied from the author below. The author encouraged copying * it. - * + * */ static String parse(String in) { @@ -261,7 +261,7 @@ public class MacAddress { * Parses a long from a hex encoded number. This method will skip * all characters that are not 0-9 and a-f (the String is lower cased first). * Returns 0 if the String does not contain any interesting characters. - * + * * @param s the String to extract a long from, may not be null * @return a long * @throws NullPointerException if the String is null @@ -290,7 +290,7 @@ public class MacAddress { * Parses an int from a hex encoded number. This method will skip * all characters that are not 0-9 and a-f (the String is lower cased first). * Returns 0 if the String does not contain any interesting characters. - * + * * @param s the String to extract an int from, may not be null * @return an int * @throws NullPointerException if the String is null @@ -319,7 +319,7 @@ public class MacAddress { * Parses a short from a hex encoded number. This method will skip * all characters that are not 0-9 and a-f (the String is lower cased first). * Returns 0 if the String does not contain any interesting characters. - * + * * @param s the String to extract a short from, may not be null * @return a short * @throws NullPointerException if the String is null @@ -348,7 +348,7 @@ public class MacAddress { * Parses a byte from a hex encoded number. This method will skip * all characters that are not 0-9 and a-f (the String is lower cased first). * Returns 0 if the String does not contain any interesting characters. - * + * * @param s the String to extract a byte from, may not be null * @return a byte * @throws NullPointerException if the String is null diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java index 705be985404..1a81cc6f4e6 100755 --- a/utils/src/com/cloud/utils/net/NetUtils.java +++ b/utils/src/com/cloud/utils/net/NetUtils.java @@ -665,7 +665,7 @@ public class NetUtils { /** * Given a cidr, this method returns an ip address within the range but * is not in the avoid list. - * + * * @param startIp ip that the cidr starts with * @param size size of the cidr * @param avoid set of ips to avoid @@ -678,9 +678,9 @@ public class NetUtils { /** * Given a cidr, this method returns an ip address within the range but - * is not in the avoid list. + * is not in the avoid list. * Note: the gateway address has to be specified in the avoid list - * + * * @param cidr ip that the cidr starts with * @param size size of the cidr * @param avoid set of ips to avoid diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java index e3cbd5a03ba..3b300531d50 100755 --- a/utils/src/com/cloud/utils/nio/Link.java +++ b/utils/src/com/cloud/utils/nio/Link.java @@ -91,7 +91,7 @@ public class Link { /** * No user, so comment it out. - * + * * Static methods for reading from a channel in case * you need to add a client that doesn't require nio. * @param ch channel to read from. @@ -190,7 +190,7 @@ public class Link { * write method to write to a socket. This method writes to completion so * it doesn't follow the nio standard. We use this to make sure we write * our own protocol. - * + * * @param ch channel to write to. * @param buffers buffers to write. * @throws IOException if unable to write to completion. diff --git a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java index d87d78c6af5..ee885a855dd 100644 --- a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java +++ b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java @@ -2,7 +2,7 @@ * $HeadURL$ * $Revision$ * $Date$ - * + * * ==================================================================== * * Licensed to the Apache Software Foundation (ASF) under one or more @@ -50,13 +50,13 @@ import org.apache.commons.logging.LogFactory; /** *

- * EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s - * that accept self-signed certificates. + * EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s + * that accept self-signed certificates. *

*

- * This socket factory SHOULD NOT be used for productive systems - * due to security reasons, unless it is a concious decision and - * you are perfectly aware of security implications of accepting + * This socket factory SHOULD NOT be used for productive systems + * due to security reasons, unless it is a concious decision and + * you are perfectly aware of security implications of accepting * self-signed certificates *

* @@ -85,9 +85,9 @@ import org.apache.commons.logging.LogFactory; * client.executeMethod(httpget); * *

- * + * * @author Oleg Kalnichevski - * + * *

* DISCLAIMER: HttpClient developers DO NOT actively support this component. * The component is provided as a reference material, which may be inappropriate @@ -138,20 +138,20 @@ public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory /** * Attempts to get a new socket connection to the given host within the given time limit. *

- * To circumvent the limitations of older JREs that do not support connect timeout a - * controller thread is executed. The controller thread attempts to create a new socket - * within the given limit of time. If socket constructor does not return until the + * To circumvent the limitations of older JREs that do not support connect timeout a + * controller thread is executed. The controller thread attempts to create a new socket + * within the given limit of time. If socket constructor does not return until the * timeout expires, the controller terminates and throws an {@link ConnectTimeoutException} *

- * + * * @param host the host name/IP * @param port the port on the host * @param clientHost the local host name/IP to bind the socket to * @param clientPort the port on the local machine * @param params {@link HttpConnectionParams Http connection parameters} - * + * * @return Socket a new socket - * + * * @throws IOException if an I/O error occurs while creating the socket * @throws UnknownHostException if the IP address of the host cannot be * determined diff --git a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java index 5d9e374f7ec..a5cc48a6155 100644 --- a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java +++ b/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java @@ -50,10 +50,10 @@ import org.apache.commons.logging.LogFactory; * you are perfectly aware of security implications of accepting * self-signed certificates *

- * + * * @author Adrian Sutton * @author Oleg Kalnichevski - * + * *

* DISCLAIMER: HttpClient developers DO NOT actively support this component. * The component is provided as a reference material, which may be inappropriate diff --git a/utils/test/com/cloud/utils/testcase/NioTest.java b/utils/test/com/cloud/utils/testcase/NioTest.java index 432d5b56853..46307e3f3e1 100644 --- a/utils/test/com/cloud/utils/testcase/NioTest.java +++ b/utils/test/com/cloud/utils/testcase/NioTest.java @@ -30,10 +30,10 @@ import java.nio.channels.ClosedChannelException; import java.util.Random; /** - * - * - * - * + * + * + * + * */ public class NioTest extends TestCase { diff --git a/vmware-base/test/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java b/vmware-base/test/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java index 9e8550f1e33..aa894159704 100644 --- a/vmware-base/test/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java +++ b/vmware-base/test/com/cloud/hypervisor/vmware/mo/VmwareMOTest.java @@ -23,16 +23,16 @@ public class VmwareMOTest { public static void main(String args[]) { try { - /* + /* VmwareContext context = TestVmwareContextFactory.create("10.223.80.29", "Administrator", "Suite219"); - + DatacenterMO dcMo = new DatacenterMO(context, "vsphere5"); HostMO hostMo = new HostMO(context, dcMo.findHost("10.223.80.27")); DatastoreMO dsMo = new DatastoreMO(context, dcMo.findDatastore("Storage1")); hostMo.importVmFromOVF("/tmp/ubuntu-12.04.1-desktop-i386-nest-13.02.04.ovf", "Test123", dsMo, "thin"); - + VirtualMachineMO vmMo = dcMo.findVm("i-2-3-VM"); Thread.sleep(10*60000); vmMo.removeAllSnapshots();