You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/01/19 21:49:36 UTC

[cloudstack] branch master updated: CLOUDSTACK-10105: Use maven standard project structure in all projects (#2283)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 893a88d  CLOUDSTACK-10105: Use maven standard project structure in all projects (#2283)
893a88d is described below

commit 893a88d225276e45f12f9490e6af2c94a81c2965
Author: Marc-Aurèle Brothier <m...@brothier.org>
AuthorDate: Fri Jan 19 22:49:27 2018 +0100

    CLOUDSTACK-10105: Use maven standard project structure in all projects (#2283)
    
    Remove maven standard module (which only a few were using) and get ride of maven customization for the projects structure.
    
    - moved all directories to src/main/java, src/main/resources, src/main/scripts, src/test/java, src/test/resources
    - grep scan to search for src/com and src/org left over
    - grep for <project>/scripts to fix pom.xml configuration
    - remove custom <build> configuration in pom.xml
    
    Signed-off-by: Marc-Aurèle Brothier <m...@brothier.org>
---
 LICENSE                                            |   4 +-
 .../src/{ => main/java}/com/cloud/agent/Agent.java |   0
 .../java}/com/cloud/agent/AgentShell.java          |   0
 .../java}/com/cloud/agent/IAgentShell.java         |   0
 .../direct/download/DirectTemplateDownloader.java  |   0
 .../download/DirectTemplateDownloaderImpl.java     |   0
 .../download/HttpDirectTemplateDownloader.java     |   0
 .../download/HttpsDirectTemplateDownloader.java    |   0
 .../download/MetalinkDirectTemplateDownloader.java |   0
 .../download/NfsDirectTemplateDownloader.java      |   0
 .../com/cloud/agent/dao/StorageComponent.java      |   0
 .../cloud/agent/dao/impl/PropertiesStorage.java    |   0
 .../cloud/agent/dhcp/DhcpProtocolParserServer.java |   0
 .../java}/com/cloud/agent/dhcp/DhcpSnooper.java    |   0
 .../com/cloud/agent/dhcp/FakeDhcpSnooper.java      |   0
 .../java}/com/cloud/agent/mockvm/MockVm.java       |   0
 .../java}/com/cloud/agent/mockvm/MockVmMgr.java    |   0
 .../java}/com/cloud/agent/mockvm/VmMgr.java        |   0
 .../com/cloud/agent/resource/DummyResource.java    |   0
 .../ConsoleProxyAuthenticationResult.java          |   0
 .../consoleproxy/ConsoleProxyResource.java         |   0
 .../java}/com/cloud/agent/vmdata/VmDataServer.java |   0
 .../test/java}/com/cloud/agent/AgentShellTest.java |   0
 .../download/DirectTemplateDownloaderImplTest.java |   0
 .../agent/dao/impl/PropertiesStorageTest.java      |   0
 .../java}/com/cloud/agent/api/Answer.java          |   0
 .../java}/com/cloud/agent/api/BadCommand.java      |   0
 .../java}/com/cloud/agent/api/Command.java         |   0
 .../cloud/agent/api/HostVmStateReportEntry.java    |   0
 .../java}/com/cloud/agent/api/LogLevel.java        |   0
 .../com/cloud/agent/api/PvlanSetupCommand.java     |   0
 .../java}/com/cloud/agent/api/StoragePoolInfo.java |   0
 .../com/cloud/agent/api/UnsupportedAnswer.java     |   0
 .../java}/com/cloud/agent/api/VgpuTypesInfo.java   |   0
 .../cloud/agent/api}/api/storage/OVFHelper.java    |   0
 .../com/cloud/agent/api}/api/to/DatadiskTO.java    |   0
 .../CopyTemplateToPrimaryStorageAnswer.java        |   0
 .../agent/api/storage/CreateVolumeOVACommand.java  |   0
 .../com/cloud/agent/api/storage/PasswordAuth.java  |   0
 .../api/storage/PrepareOVAPackingCommand.java      |   0
 .../com/cloud/agent/api/to/DataObjectType.java     |   0
 .../java}/com/cloud/agent/api/to/DataStoreTO.java  |   0
 .../java}/com/cloud/agent/api/to/DataTO.java       |   0
 .../java}/com/cloud/agent/api/to/DhcpTO.java       |   0
 .../java}/com/cloud/agent/api/to/DiskTO.java       |   0
 .../com/cloud/agent/api/to/FirewallRuleTO.java     |   0
 .../java}/com/cloud/agent/api/to/GPUDeviceTO.java  |   0
 .../java}/com/cloud/agent/api/to/HostTO.java       |   0
 .../java}/com/cloud/agent/api/to/IpAddressTO.java  |   0
 .../com/cloud/agent/api/to/LoadBalancerTO.java     |   0
 .../com/cloud/agent/api/to/MonitorServiceTO.java   |   0
 .../java}/com/cloud/agent/api/to/NetworkACLTO.java |   0
 .../java}/com/cloud/agent/api/to/NetworkTO.java    |   0
 .../java}/com/cloud/agent/api/to/NfsTO.java        |   0
 .../java}/com/cloud/agent/api/to/NicTO.java        |   0
 .../cloud/agent/api/to/PortForwardingRuleTO.java   |   0
 .../java}/com/cloud/agent/api/to/S3TO.java         |   0
 .../com/cloud/agent/api/to/StaticNatRuleTO.java    |   0
 .../com/cloud/agent/api/to/StorageFilerTO.java     |   0
 .../java}/com/cloud/agent/api/to/SwiftTO.java      |   0
 .../java}/com/cloud/agent/api/to/TemplateTO.java   |   0
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   0
 .../java}/com/cloud/agent/api/to/VolumeTO.java     |   0
 .../agent/manager/allocator/HostAllocator.java     |   0
 .../agent/manager/allocator/PodAllocator.java      |   0
 api/src/{ => main/java}/com/cloud/alert/Alert.java |   0
 .../java}/com/cloud/alert/AlertAdapter.java        |   0
 .../java}/com/cloud/api/commands/.gitignore        |   0
 .../commands/ListRecurringSnapshotScheduleCmd.java |   0
 .../java}/com/cloud/capacity/Capacity.java         |   0
 .../java}/com/cloud/capacity/CapacityState.java    |   0
 .../cloud/configuration/ConfigurationService.java  |   0
 .../java}/com/cloud/configuration/Resource.java    |   0
 .../com/cloud/configuration/ResourceCount.java     |   0
 .../com/cloud/configuration/ResourceLimit.java     |   0
 .../cloud/consoleproxy/ConsoleProxyAllocator.java  |   0
 .../{ => main/java}/com/cloud/dc/DataCenter.java   |   0
 .../java}/com/cloud/dc/DedicatedResources.java     |   0
 api/src/{ => main/java}/com/cloud/dc/Pod.java      |   0
 .../java}/com/cloud/dc/StorageNetworkIpRange.java  |   0
 api/src/{ => main/java}/com/cloud/dc/Vlan.java     |   0
 .../com/cloud/deploy/DataCenterDeployment.java     |   0
 .../java}/com/cloud/deploy/DeployDestination.java  |   0
 .../com/cloud/deploy/DeploymentClusterPlanner.java |   0
 .../java}/com/cloud/deploy/DeploymentPlan.java     |   0
 .../java}/com/cloud/deploy/DeploymentPlanner.java  |   0
 .../java}/com/cloud/deploy/HAPlanner.java          |   0
 .../{ => main/java}/com/cloud/domain/Domain.java   |   0
 .../{ => main/java}/com/cloud/domain/PartOf.java   |   0
 .../java}/com/cloud/event/ActionEvent.java         |   0
 .../java}/com/cloud/event/ActionEvents.java        |   0
 api/src/{ => main/java}/com/cloud/event/Event.java |   0
 .../java}/com/cloud/event/EventCategory.java       |   0
 .../java}/com/cloud/event/EventTypes.java          |   0
 .../java}/com/cloud/event/UsageEvent.java          |   0
 .../com/cloud/exception/AccountLimitException.java |   0
 .../cloud/exception/AffinityConflictException.java |   0
 .../exception/AgentControlChannelException.java    |   0
 .../cloud/exception/AgentUnavailableException.java |   0
 .../exception/CloudAuthenticationException.java    |   0
 .../java}/com/cloud/exception/CloudException.java  |   0
 .../exception/ConcurrentOperationException.java    |   0
 .../ConflictingNetworkSettingsException.java       |   0
 .../com/cloud/exception/ConnectionException.java   |   0
 .../exception/DiscoveredWithErrorException.java    |   0
 .../com/cloud/exception/DiscoveryException.java    |   0
 .../com/cloud/exception/HAStateException.java      |   0
 .../InsufficientAddressCapacityException.java      |   0
 .../exception/InsufficientCapacityException.java   |   0
 .../InsufficientNetworkCapacityException.java      |   0
 .../InsufficientServerCapacityException.java       |   0
 .../InsufficientStorageCapacityException.java      |   0
 ...nsufficientVirtualNetworkCapacityException.java |   0
 .../cloud/exception/InternalErrorException.java    |   0
 .../exception/InvalidParameterValueException.java  |   0
 .../cloud/exception/ManagementServerException.java |   0
 .../exception/NetworkRuleConflictException.java    |   0
 .../exception/OperationTimedoutException.java      |   0
 .../cloud/exception/PermissionDeniedException.java |   0
 .../com/cloud/exception/RequestLimitException.java |   0
 .../exception/ResourceAllocationException.java     |   0
 .../cloud/exception/ResourceInUseException.java    |   0
 .../exception/ResourceUnavailableException.java    |   0
 .../cloud/exception/StorageConflictException.java  |   0
 .../exception/StorageUnavailableException.java     |   0
 .../exception/UnsupportedServiceException.java     |   0
 .../VirtualMachineMigrationException.java          |   0
 api/src/{ => main/java}/com/cloud/gpu/GPU.java     |   0
 .../{ => main/java}/com/cloud/ha/FenceBuilder.java |   0
 .../{ => main/java}/com/cloud/ha/Investigator.java |   0
 api/src/{ => main/java}/com/cloud/host/Host.java   |   0
 .../java}/com/cloud/host/HostEnvironment.java      |   0
 .../{ => main/java}/com/cloud/host/HostStats.java  |   0
 api/src/{ => main/java}/com/cloud/host/Status.java |   0
 .../java}/com/cloud/hypervisor/Hypervisor.java     |   0
 .../cloud/hypervisor/HypervisorCapabilities.java   |   0
 .../java}/com/cloud/hypervisor/HypervisorGuru.java |   0
 .../java}/com/cloud/info/ConsoleProxyLoadInfo.java |   0
 .../java}/com/cloud/info/RunningHostCountInfo.java |   0
 .../java}/com/cloud/network/GuestVlan.java         |   0
 .../java}/com/cloud/network/IpAddress.java         |   0
 .../java}/com/cloud/network/MonitoringService.java |   0
 .../{ => main/java}/com/cloud/network/Network.java |   0
 .../cloud/network/NetworkMigrationResponder.java   |   0
 .../java}/com/cloud/network/NetworkModel.java      |   0
 .../java}/com/cloud/network/NetworkProfile.java    |   0
 .../com/cloud/network/NetworkRuleApplier.java      |   0
 .../java}/com/cloud/network/NetworkService.java    |   0
 .../com/cloud/network/NetworkUsageService.java     |   0
 .../java}/com/cloud/network/Networks.java          |   0
 .../java}/com/cloud/network/OvsProvider.java       |   0
 .../java}/com/cloud/network/PhysicalNetwork.java   |   0
 .../network/PhysicalNetworkServiceProvider.java    |   0
 .../cloud/network/PhysicalNetworkSetupInfo.java    |   0
 .../cloud/network/PhysicalNetworkTrafficType.java  |   0
 .../java}/com/cloud/network/PublicIpAddress.java   |   0
 .../java}/com/cloud/network/RemoteAccessVpn.java   |   0
 .../cloud/network/Site2SiteCustomerGateway.java    |   0
 .../com/cloud/network/Site2SiteVpnConnection.java  |   0
 .../com/cloud/network/Site2SiteVpnGateway.java     |   0
 .../com/cloud/network/StorageNetworkService.java   |   0
 .../java}/com/cloud/network/TrafficLabel.java      |   0
 .../java}/com/cloud/network/UserIpv6Address.java   |   0
 .../network/VirtualNetworkApplianceService.java    |   0
 .../com/cloud/network/VirtualRouterProvider.java   |   0
 .../network/VpcVirtualNetworkApplianceService.java |   0
 .../{ => main/java}/com/cloud/network/VpnUser.java |   0
 .../com/cloud/network/as/AutoScaleCounter.java     |   0
 .../com/cloud/network/as/AutoScalePolicy.java      |   0
 .../com/cloud/network/as/AutoScaleService.java     |   0
 .../com/cloud/network/as/AutoScaleVmGroup.java     |   0
 .../com/cloud/network/as/AutoScaleVmProfile.java   |   0
 .../java}/com/cloud/network/as/Condition.java      |   0
 .../java}/com/cloud/network/as/Counter.java        |   0
 .../network/element/AggregatedCommandExecutor.java |   0
 .../network/element/ConnectivityProvider.java      |   0
 .../cloud/network/element/DhcpServiceProvider.java |   0
 .../cloud/network/element/DnsServiceProvider.java  |   0
 .../network/element/FirewallServiceProvider.java   |   0
 .../com/cloud/network/element/IpDeployer.java      |   0
 .../network/element/IpDeployingRequester.java      |   0
 .../element/LoadBalancingServiceProvider.java      |   0
 .../network/element/NetworkACLServiceProvider.java |   0
 .../com/cloud/network/element/NetworkElement.java  |   0
 .../element/PortForwardingServiceProvider.java     |   0
 .../cloud/network/element/RedundantResource.java   |   0
 .../element/RemoteAccessVPNServiceProvider.java    |   0
 .../element/Site2SiteVpnServiceProvider.java       |   0
 .../network/element/SourceNatServiceProvider.java  |   0
 .../network/element/StaticNatServiceProvider.java  |   0
 .../network/element/UserDataServiceProvider.java   |   0
 .../element/VirtualRouterElementService.java       |   0
 .../com/cloud/network/element/VpcProvider.java     |   0
 .../cloud/network/firewall/FirewallService.java    |   0
 .../java}/com/cloud/network/guru/NetworkGuru.java  |   0
 .../guru/NetworkGuruAdditionalFunctions.java       |   0
 .../com/cloud/network/lb/LoadBalancingRule.java    |   0
 .../network/lb/LoadBalancingRulesService.java      |   0
 .../com/cloud/network/router/VirtualRouter.java    |   0
 .../com/cloud/network/rules/FirewallRule.java      |   0
 .../com/cloud/network/rules/HealthCheckPolicy.java |   0
 .../cloud/network/rules/LbStickinessMethod.java    |   0
 .../com/cloud/network/rules/LoadBalancer.java      |   0
 .../cloud/network/rules/LoadBalancerContainer.java |   0
 .../cloud/network/rules/PortForwardingRule.java    |   0
 .../com/cloud/network/rules/RulesService.java      |   0
 .../java}/com/cloud/network/rules/StaticNat.java   |   0
 .../com/cloud/network/rules/StaticNatRule.java     |   0
 .../com/cloud/network/rules/StickinessPolicy.java  |   0
 .../com/cloud/network/security/SecurityGroup.java  |   0
 .../cloud/network/security/SecurityGroupRules.java |   0
 .../network/security/SecurityGroupService.java     |   0
 .../com/cloud/network/security/SecurityRule.java   |   0
 .../java}/com/cloud/network/vpc/NetworkACL.java    |   0
 .../com/cloud/network/vpc/NetworkACLItem.java      |   0
 .../com/cloud/network/vpc/NetworkACLService.java   |   0
 .../com/cloud/network/vpc/PrivateGateway.java      |   0
 .../java}/com/cloud/network/vpc/PrivateIp.java     |   0
 .../java}/com/cloud/network/vpc/StaticRoute.java   |   0
 .../com/cloud/network/vpc/StaticRouteProfile.java  |   0
 .../{ => main/java}/com/cloud/network/vpc/Vpc.java |   0
 .../java}/com/cloud/network/vpc/VpcGateway.java    |   0
 .../java}/com/cloud/network/vpc/VpcOffering.java   |   0
 .../cloud/network/vpc/VpcProvisioningService.java  |   0
 .../java}/com/cloud/network/vpc/VpcService.java    |   0
 .../cloud/network/vpn/RemoteAccessVpnService.java  |   0
 .../com/cloud/network/vpn/Site2SiteVpnService.java |   0
 .../java}/com/cloud/offering/DiskOffering.java     |   0
 .../java}/com/cloud/offering/DiskOfferingInfo.java |   0
 .../java}/com/cloud/offering/NetworkOffering.java  |   0
 .../java}/com/cloud/offering/OfferingManager.java  |   0
 .../java}/com/cloud/offering/ServiceOffering.java  |   0
 api/src/{ => main/java}/com/cloud/org/Cluster.java |   0
 .../{ => main/java}/com/cloud/org/Grouping.java    |   0
 api/src/{ => main/java}/com/cloud/org/Managed.java |   0
 .../{ => main/java}/com/cloud/org/RunningIn.java   |   0
 .../java}/com/cloud/projects/Project.java          |   0
 .../java}/com/cloud/projects/ProjectAccount.java   |   0
 .../com/cloud/projects/ProjectInvitation.java      |   0
 .../java}/com/cloud/projects/ProjectService.java   |   0
 .../cloud/region/ha/GlobalLoadBalancerRule.java    |   0
 .../region/ha/GlobalLoadBalancingRulesService.java |   0
 .../java}/com/cloud/resource/ResourceService.java  |   0
 .../java}/com/cloud/resource/ResourceState.java    |   0
 .../cloud/resource/UnableDeleteHostException.java  |   0
 .../java}/com/cloud/serializer/Param.java          |   0
 .../java}/com/cloud/server/ManagementService.java  |   0
 .../com/cloud/server/ResourceMetaDataService.java  |   0
 .../java}/com/cloud/server/ResourceTag.java        |   0
 .../com/cloud/server/TaggedResourceService.java    |   0
 .../cloud/storage/DataStoreProviderApiService.java |   0
 .../java}/com/cloud/storage/DataStoreRole.java     |   0
 .../{ => main/java}/com/cloud/storage/GuestOS.java |   0
 .../java}/com/cloud/storage/GuestOSHypervisor.java |   0
 .../java}/com/cloud/storage/GuestOsCategory.java   |   0
 .../java}/com/cloud/storage/ImageStore.java        |   0
 .../java}/com/cloud/storage/ScopeType.java         |   0
 .../java}/com/cloud/storage/Snapshot.java          |   0
 .../{ => main/java}/com/cloud/storage/Storage.java |   0
 .../java}/com/cloud/storage/StorageGuru.java       |   0
 .../java}/com/cloud/storage/StoragePool.java       |   0
 .../com/cloud/storage/StoragePoolDiscoverer.java   |   0
 .../java}/com/cloud/storage/StoragePoolStatus.java |   0
 .../java}/com/cloud/storage/StorageService.java    |   0
 .../java}/com/cloud/storage/StorageStats.java      |   0
 .../{ => main/java}/com/cloud/storage/Upload.java  |   0
 .../storage/VMTemplateStorageResourceAssoc.java    |   0
 .../{ => main/java}/com/cloud/storage/Volume.java  |   0
 .../java}/com/cloud/storage/VolumeApiService.java  |   0
 .../java}/com/cloud/storage/VolumeStats.java       |   0
 .../cloud/storage/snapshot/SnapshotApiService.java |   0
 .../com/cloud/storage/snapshot/SnapshotPolicy.java |   0
 .../cloud/storage/snapshot/SnapshotSchedule.java   |   0
 .../com/cloud/storage/template/TemplateProp.java   |   0
 .../java}/com/cloud/template/BasedOn.java          |   0
 .../com/cloud/template/TemplateApiService.java     |   0
 .../com/cloud/template/VirtualMachineTemplate.java |   0
 .../{ => main/java}/com/cloud/user/Account.java    |   0
 .../java}/com/cloud/user/AccountService.java       |   0
 .../java}/com/cloud/user/DomainService.java        |   0
 .../{ => main/java}/com/cloud/user/OwnedBy.java    |   0
 .../java}/com/cloud/user/ResourceLimitService.java |   0
 .../{ => main/java}/com/cloud/user/SSHKeyPair.java |   0
 api/src/{ => main/java}/com/cloud/user/User.java   |   0
 .../java}/com/cloud/user/UserAccount.java          |   0
 .../{ => main/java}/com/cloud/uservm/UserVm.java   |   0
 .../java}/com/cloud/vm/BareMetalVmService.java     |   0
 .../{ => main/java}/com/cloud/vm/ConsoleProxy.java |   0
 .../{ => main/java}/com/cloud/vm/DiskProfile.java  |   0
 .../java}/com/cloud/vm/InstanceGroup.java          |   0
 api/src/{ => main/java}/com/cloud/vm/Nic.java      |   0
 .../java}/com/cloud/vm/NicExtraDhcpOption.java     |   0
 .../{ => main/java}/com/cloud/vm/NicIpAlias.java   |   0
 .../{ => main/java}/com/cloud/vm/NicProfile.java   |   0
 .../java}/com/cloud/vm/NicSecondaryIp.java         |   0
 .../java}/com/cloud/vm/ReservationContext.java     |   0
 .../{ => main/java}/com/cloud/vm/RunningOn.java    |   0
 .../java}/com/cloud/vm/SecondaryStorageVm.java     |   0
 api/src/{ => main/java}/com/cloud/vm/SystemVm.java |   0
 .../java}/com/cloud/vm/UserVmService.java          |   0
 .../java}/com/cloud/vm/VirtualMachine.java         |   0
 .../java}/com/cloud/vm/VirtualMachineName.java     |   0
 .../java}/com/cloud/vm/VirtualMachineProfile.java  |   0
 .../java}/com/cloud/vm/VmDetailConstants.java      |   0
 .../{ => main/java}/com/cloud/vm/VmDiskStats.java  |   0
 .../java}/com/cloud/vm/VmNetworkStats.java         |   0
 api/src/{ => main/java}/com/cloud/vm/VmStats.java  |   0
 .../java}/com/cloud/vm/snapshot/VMSnapshot.java    |   0
 .../com/cloud/vm/snapshot/VMSnapshotService.java   |   0
 .../org/apache/cloudstack/acl/APIChecker.java      |   0
 .../org/apache/cloudstack/acl/APILimitChecker.java |   0
 .../apache/cloudstack/acl/ControlledEntity.java    |   0
 .../cloudstack/acl/InfrastructureEntity.java       |   0
 .../org/apache/cloudstack/acl/PermissionScope.java |   0
 .../org/apache/cloudstack/acl/QuerySelector.java   |   0
 .../java}/org/apache/cloudstack/acl/Role.java      |   0
 .../org/apache/cloudstack/acl/RolePermission.java  |   0
 .../org/apache/cloudstack/acl/RoleService.java     |   0
 .../java}/org/apache/cloudstack/acl/RoleType.java  |   0
 .../java}/org/apache/cloudstack/acl/Rule.java      |   0
 .../org/apache/cloudstack/acl/SecurityChecker.java |   0
 .../apache/cloudstack/affinity/AffinityGroup.java  |   0
 .../affinity/AffinityGroupProcessor.java           |   0
 .../cloudstack/affinity/AffinityGroupResponse.java |   0
 .../cloudstack/affinity/AffinityGroupService.java  |   0
 .../affinity/AffinityGroupTypeResponse.java        |   0
 .../cloudstack/affinity/AffinityProcessorBase.java |   0
 .../org/apache/cloudstack/alert/AlertService.java  |   0
 .../apache/cloudstack/annotation/Annotation.java   |   0
 .../cloudstack/annotation/AnnotationService.java   |   0
 .../java}/org/apache/cloudstack/api/ACL.java       |   0
 .../org/apache/cloudstack/api/APICommand.java      |   0
 .../cloudstack/api/AbstractGetUploadParamsCmd.java |   0
 .../org/apache/cloudstack/api/ApiArgValidator.java |   0
 .../apache/cloudstack/api/ApiCommandJobType.java   |   0
 .../org/apache/cloudstack/api/ApiConstants.java    |   0
 .../org/apache/cloudstack/api/ApiErrorCode.java    |   0
 .../apache/cloudstack/api/ApiServerService.java    |   0
 .../org/apache/cloudstack/api/BaseAsyncCmd.java    |   0
 .../apache/cloudstack/api/BaseAsyncCreateCmd.java  |   0
 .../cloudstack/api/BaseAsyncCreateCustomIdCmd.java |   0
 .../cloudstack/api/BaseAsyncCustomIdCmd.java       |   0
 .../java}/org/apache/cloudstack/api/BaseCmd.java   |   0
 .../org/apache/cloudstack/api/BaseCustomIdCmd.java |   0
 .../api/BaseListAccountResourcesCmd.java           |   0
 .../org/apache/cloudstack/api/BaseListCmd.java     |   0
 .../cloudstack/api/BaseListDomainResourcesCmd.java |   0
 .../api/BaseListProjectAndAccountResourcesCmd.java |   0
 .../cloudstack/api/BaseListTaggedResourcesCmd.java |   0
 .../api/BaseListTemplateOrIsoPermissionsCmd.java   |   0
 .../org/apache/cloudstack/api/BaseResponse.java    |   0
 .../api/BaseResponseWithTagInformation.java        |   0
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |   0
 .../api/BaseUpdateTemplateOrIsoPermissionsCmd.java |   0
 .../org/apache/cloudstack/api/Displayable.java     |   0
 .../org/apache/cloudstack/api/EntityReference.java |   0
 .../api/IBaseListAccountResourcesCmd.java          |   0
 .../org/apache/cloudstack/api/IBaseListCmd.java    |   0
 .../api/IBaseListDomainResourcesCmd.java           |   0
 .../IBaseListProjectAndAccountResourcesCmd.java    |   0
 .../api/IBaseListTaggedResourcesCmd.java           |   0
 .../java}/org/apache/cloudstack/api/Identity.java  |   0
 .../apache/cloudstack/api/InternalIdentity.java    |   0
 .../org/apache/cloudstack/api/LdapValidator.java   |   0
 .../java}/org/apache/cloudstack/api/Parameter.java |   0
 .../org/apache/cloudstack/api/ResourceDetail.java  |   0
 .../apache/cloudstack/api/ResponseGenerator.java   |   0
 .../org/apache/cloudstack/api/ResponseObject.java  |   0
 .../apache/cloudstack/api/ServerApiException.java  |   0
 .../java}/org/apache/cloudstack/api/Validate.java  |   0
 .../api/auth/APIAuthenticationManager.java         |   0
 .../cloudstack/api/auth/APIAuthenticationType.java |   0
 .../cloudstack/api/auth/APIAuthenticator.java      |   0
 .../api/auth/PluggableAPIAuthenticator.java        |   0
 .../command/admin/account/CreateAccountCmd.java    |   0
 .../command/admin/account/DeleteAccountCmd.java    |   0
 .../command/admin/account/DisableAccountCmd.java   |   0
 .../command/admin/account/EnableAccountCmd.java    |   0
 .../admin/account/ListAccountsCmdByAdmin.java      |   0
 .../api/command/admin/account/LockAccountCmd.java  |   0
 .../command/admin/account/UpdateAccountCmd.java    |   0
 .../api/command/admin/acl/CreateRoleCmd.java       |   0
 .../command/admin/acl/CreateRolePermissionCmd.java |   0
 .../api/command/admin/acl/DeleteRoleCmd.java       |   0
 .../command/admin/acl/DeleteRolePermissionCmd.java |   0
 .../command/admin/acl/ListRolePermissionsCmd.java  |   0
 .../api/command/admin/acl/ListRolesCmd.java        |   0
 .../api/command/admin/acl/UpdateRoleCmd.java       |   0
 .../command/admin/acl/UpdateRolePermissionCmd.java |   0
 .../admin/address/AcquirePodIpCmdByAdmin.java      |   0
 .../admin/address/AssociateIPAddrCmdByAdmin.java   |   0
 .../address/ListPublicIpAddressesCmdByAdmin.java   |   0
 .../admin/address/ReleasePodIpCmdByAdmin.java      |   0
 .../UpdateVMAffinityGroupCmdByAdmin.java           |   0
 .../api/command/admin/alert/GenerateAlertCmd.java  |   0
 .../command/admin/annotation/AddAnnotationCmd.java |   0
 .../admin/annotation/ListAnnotationsCmd.java       |   0
 .../admin/annotation/RemoveAnnotationCmd.java      |   0
 .../command/admin/autoscale/CreateCounterCmd.java  |   0
 .../command/admin/autoscale/DeleteCounterCmd.java  |   0
 .../api/command/admin/ca/IssueCertificateCmd.java  |   0
 .../api/command/admin/ca/ListCAProvidersCmd.java   |   0
 .../api/command/admin/ca/ListCaCertificateCmd.java |   0
 .../command/admin/ca/ProvisionCertificateCmd.java  |   0
 .../api/command/admin/ca/RevokeCertificateCmd.java |   0
 .../api/command/admin/cluster/AddClusterCmd.java   |   0
 .../command/admin/cluster/DeleteClusterCmd.java    |   0
 .../api/command/admin/cluster/ListClustersCmd.java |   0
 .../command/admin/cluster/UpdateClusterCmd.java    |   0
 .../api/command/admin/config/ListCfgsByCmd.java    |   0
 .../admin/config/ListDeploymentPlannersCmd.java    |   0
 .../config/ListHypervisorCapabilitiesCmd.java      |   0
 .../api/command/admin/config/UpdateCfgCmd.java     |   0
 .../config/UpdateHypervisorCapabilitiesCmd.java    |   0
 .../api/command/admin/domain/CreateDomainCmd.java  |   0
 .../api/command/admin/domain/DeleteDomainCmd.java  |   0
 .../admin/domain/ListDomainChildrenCmd.java        |   0
 .../api/command/admin/domain/ListDomainsCmd.java   |   0
 .../admin/domain/ListDomainsCmdByAdmin.java        |   0
 .../api/command/admin/domain/UpdateDomainCmd.java  |   0
 .../api/command/admin/guest/AddGuestOsCmd.java     |   0
 .../command/admin/guest/AddGuestOsMappingCmd.java  |   0
 .../command/admin/guest/ListGuestOsMappingCmd.java |   0
 .../api/command/admin/guest/RemoveGuestOsCmd.java  |   0
 .../admin/guest/RemoveGuestOsMappingCmd.java       |   0
 .../api/command/admin/guest/UpdateGuestOsCmd.java  |   0
 .../admin/guest/UpdateGuestOsMappingCmd.java       |   0
 .../command/admin/ha/ConfigureHAForHostCmd.java    |   0
 .../command/admin/ha/DisableHAForClusterCmd.java   |   0
 .../api/command/admin/ha/DisableHAForHostCmd.java  |   0
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |   0
 .../command/admin/ha/EnableHAForClusterCmd.java    |   0
 .../api/command/admin/ha/EnableHAForHostCmd.java   |   0
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |   0
 .../command/admin/ha/ListHostHAProvidersCmd.java   |   0
 .../command/admin/ha/ListHostHAResourcesCmd.java   |   0
 .../api/command/admin/host/AddHostCmd.java         |   0
 .../command/admin/host/AddSecondaryStorageCmd.java |   0
 .../command/admin/host/CancelMaintenanceCmd.java   |   0
 .../api/command/admin/host/DeleteHostCmd.java      |   0
 .../admin/host/FindHostsForMigrationCmd.java       |   0
 .../api/command/admin/host/ListHostTagsCmd.java    |   0
 .../api/command/admin/host/ListHostsCmd.java       |   0
 .../admin/host/PrepareForMaintenanceCmd.java       |   0
 .../api/command/admin/host/ReconnectHostCmd.java   |   0
 .../admin/host/ReleaseHostReservationCmd.java      |   0
 .../api/command/admin/host/UpdateHostCmd.java      |   0
 .../command/admin/host/UpdateHostPasswordCmd.java  |   0
 .../ConfigureInternalLoadBalancerElementCmd.java   |   0
 .../CreateInternalLoadBalancerElementCmd.java      |   0
 .../admin/internallb/ListInternalLBVMsCmd.java     |   0
 .../ListInternalLoadBalancerElementsCmd.java       |   0
 .../admin/internallb/StartInternalLBVMCmd.java     |   0
 .../admin/internallb/StopInternalLBVMCmd.java      |   0
 .../api/command/admin/iso/AttachIsoCmdByAdmin.java |   0
 .../api/command/admin/iso/CopyIsoCmdByAdmin.java   |   0
 .../api/command/admin/iso/DetachIsoCmdByAdmin.java |   0
 .../admin/iso/ListIsoPermissionsCmdByAdmin.java    |   0
 .../api/command/admin/iso/ListIsosCmdByAdmin.java  |   0
 .../command/admin/iso/RegisterIsoCmdByAdmin.java   |   0
 .../api/command/admin/iso/UpdateIsoCmdByAdmin.java |   0
 .../ListLoadBalancerRuleInstancesCmdByAdmin.java   |   0
 .../command/admin/network/AddNetworkDeviceCmd.java |   0
 .../network/AddNetworkServiceProviderCmd.java      |   0
 .../admin/network/CreateNetworkCmdByAdmin.java     |   0
 .../admin/network/CreateNetworkOfferingCmd.java    |   0
 .../admin/network/CreatePhysicalNetworkCmd.java    |   0
 .../network/CreateStorageNetworkIpRangeCmd.java    |   0
 .../admin/network/DedicateGuestVlanRangeCmd.java   |   0
 .../admin/network/DeleteNetworkDeviceCmd.java      |   0
 .../admin/network/DeleteNetworkOfferingCmd.java    |   0
 .../network/DeleteNetworkServiceProviderCmd.java   |   0
 .../admin/network/DeletePhysicalNetworkCmd.java    |   0
 .../network/DeleteStorageNetworkIpRangeCmd.java    |   0
 .../network/ListDedicatedGuestVlanRangesCmd.java   |   0
 .../admin/network/ListNetworkDeviceCmd.java        |   0
 .../network/ListNetworkIsolationMethodsCmd.java    |   0
 .../network/ListNetworkServiceProvidersCmd.java    |   0
 .../admin/network/ListNetworksCmdByAdmin.java      |   0
 .../admin/network/ListPhysicalNetworksCmd.java     |   0
 .../network/ListStorageNetworkIpRangeCmd.java      |   0
 .../network/ListSupportedNetworkServicesCmd.java   |   0
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |   0
 .../admin/network/UpdateNetworkCmdByAdmin.java     |   0
 .../admin/network/UpdateNetworkOfferingCmd.java    |   0
 .../network/UpdateNetworkServiceProviderCmd.java   |   0
 .../admin/network/UpdatePhysicalNetworkCmd.java    |   0
 .../network/UpdateStorageNetworkIpRangeCmd.java    |   0
 .../admin/offering/CreateDiskOfferingCmd.java      |   0
 .../admin/offering/CreateServiceOfferingCmd.java   |   0
 .../admin/offering/DeleteDiskOfferingCmd.java      |   0
 .../admin/offering/DeleteServiceOfferingCmd.java   |   0
 .../admin/offering/UpdateDiskOfferingCmd.java      |   0
 .../admin/offering/UpdateServiceOfferingCmd.java   |   0
 .../ChangeOutOfBandManagementPasswordCmd.java      |   0
 .../ConfigureOutOfBandManagementCmd.java           |   0
 .../DisableOutOfBandManagementForClusterCmd.java   |   0
 .../DisableOutOfBandManagementForHostCmd.java      |   0
 .../DisableOutOfBandManagementForZoneCmd.java      |   0
 .../EnableOutOfBandManagementForClusterCmd.java    |   0
 .../EnableOutOfBandManagementForHostCmd.java       |   0
 .../EnableOutOfBandManagementForZoneCmd.java       |   0
 .../IssueOutOfBandManagementPowerActionCmd.java    |   0
 .../api/command/admin/pod/CreatePodCmd.java        |   0
 .../api/command/admin/pod/DeletePodCmd.java        |   0
 .../api/command/admin/pod/ListPodsByCmd.java       |   0
 .../api/command/admin/pod/UpdatePodCmd.java        |   0
 .../api/command/admin/region/AddRegionCmd.java     |   0
 .../admin/region/CreatePortableIpRangeCmd.java     |   0
 .../admin/region/DeletePortableIpRangeCmd.java     |   0
 .../admin/region/ListPortableIpRangesCmd.java      |   0
 .../api/command/admin/region/RemoveRegionCmd.java  |   0
 .../api/command/admin/region/UpdateRegionCmd.java  |   0
 .../command/admin/resource/ArchiveAlertsCmd.java   |   0
 .../admin/resource/CleanVMReservationsCmd.java     |   0
 .../command/admin/resource/DeleteAlertsCmd.java    |   0
 .../api/command/admin/resource/ListAlertsCmd.java  |   0
 .../command/admin/resource/ListCapacityCmd.java    |   0
 .../admin/resource/UploadCustomCertificateCmd.java |   0
 .../admin/router/ConfigureOvsElementCmd.java       |   0
 .../router/ConfigureVirtualRouterElementCmd.java   |   0
 .../router/CreateVirtualRouterElementCmd.java      |   0
 .../api/command/admin/router/DestroyRouterCmd.java |   0
 .../command/admin/router/ListOvsElementsCmd.java   |   0
 .../api/command/admin/router/ListRoutersCmd.java   |   0
 .../admin/router/ListVirtualRouterElementsCmd.java |   0
 .../api/command/admin/router/RebootRouterCmd.java  |   0
 .../api/command/admin/router/StartRouterCmd.java   |   0
 .../api/command/admin/router/StopRouterCmd.java    |   0
 .../api/command/admin/router/UpgradeRouterCmd.java |   0
 .../admin/router/UpgradeRouterTemplateCmd.java     |   0
 .../command/admin/storage/AddImageStoreCmd.java    |   0
 .../command/admin/storage/AddImageStoreS3CMD.java  |   0
 .../CancelPrimaryStorageMaintenanceCmd.java        |   0
 .../storage/CreateSecondaryStagingStoreCmd.java    |   0
 .../admin/storage/CreateStoragePoolCmd.java        |   0
 .../command/admin/storage/DeleteImageStoreCmd.java |   0
 .../api/command/admin/storage/DeletePoolCmd.java   |   0
 .../storage/DeleteSecondaryStagingStoreCmd.java    |   0
 .../storage/FindStoragePoolsForMigrationCmd.java   |   0
 .../command/admin/storage/ListImageStoresCmd.java  |   0
 .../storage/ListSecondaryStagingStoresCmd.java     |   0
 .../command/admin/storage/ListStoragePoolsCmd.java |   0
 .../admin/storage/ListStorageProvidersCmd.java     |   0
 .../command/admin/storage/ListStorageTagsCmd.java  |   0
 .../PreparePrimaryStorageForMaintenanceCmd.java    |   0
 .../storage/UpdateCloudToUseObjectStoreCmd.java    |   0
 .../admin/storage/UpdateStoragePoolCmd.java        |   0
 .../api/command/admin/swift/AddSwiftCmd.java       |   0
 .../api/command/admin/swift/ListSwiftsCmd.java     |   0
 .../command/admin/systemvm/DestroySystemVmCmd.java |   0
 .../command/admin/systemvm/ListSystemVMsCmd.java   |   0
 .../command/admin/systemvm/MigrateSystemVMCmd.java |   0
 .../command/admin/systemvm/RebootSystemVmCmd.java  |   0
 .../command/admin/systemvm/ScaleSystemVMCmd.java   |   0
 .../command/admin/systemvm/StartSystemVMCmd.java   |   0
 .../command/admin/systemvm/StopSystemVmCmd.java    |   0
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |   0
 .../admin/template/CopyTemplateCmdByAdmin.java     |   0
 .../admin/template/CreateTemplateCmdByAdmin.java   |   0
 .../ListTemplatePermissionsCmdByAdmin.java         |   0
 .../admin/template/ListTemplatesCmdByAdmin.java    |   0
 .../command/admin/template/PrepareTemplateCmd.java |   0
 .../admin/template/RegisterTemplateCmdByAdmin.java |   0
 .../admin/template/UpdateTemplateCmdByAdmin.java   |   0
 .../command/admin/usage/AddTrafficMonitorCmd.java  |   0
 .../api/command/admin/usage/AddTrafficTypeCmd.java |   0
 .../admin/usage/DeleteTrafficMonitorCmd.java       |   0
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |   0
 .../admin/usage/GenerateUsageRecordsCmd.java       |   0
 .../command/admin/usage/GetUsageRecordsCmd.java    |   0
 .../admin/usage/ListTrafficMonitorsCmd.java        |   0
 .../usage/ListTrafficTypeImplementorsCmd.java      |   0
 .../command/admin/usage/ListTrafficTypesCmd.java   |   0
 .../api/command/admin/usage/ListUsageTypesCmd.java |   0
 .../admin/usage/RemoveRawUsageRecordsCmd.java      |   0
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |   0
 .../api/command/admin/user/CreateUserCmd.java      |   0
 .../api/command/admin/user/DeleteUserCmd.java      |   0
 .../api/command/admin/user/DisableUserCmd.java     |   0
 .../api/command/admin/user/EnableUserCmd.java      |   0
 .../api/command/admin/user/GetUserCmd.java         |   0
 .../api/command/admin/user/GetUserKeysCmd.java     |   0
 .../api/command/admin/user/ListUsersCmd.java       |   0
 .../api/command/admin/user/LockUserCmd.java        |   0
 .../api/command/admin/user/RegisterCmd.java        |   0
 .../api/command/admin/user/UpdateUserCmd.java      |   0
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |   0
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |   0
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |   0
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |   0
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |   0
 .../api/command/admin/vm/AddNicToVMCmdByAdmin.java |   0
 .../api/command/admin/vm/AssignVMCmd.java          |   0
 .../api/command/admin/vm/DeployVMCmdByAdmin.java   |   0
 .../api/command/admin/vm/DestroyVMCmdByAdmin.java  |   0
 .../api/command/admin/vm/ExpungeVMCmd.java         |   0
 .../api/command/admin/vm/GetVMUserDataCmd.java     |   0
 .../api/command/admin/vm/ListVMsCmdByAdmin.java    |   0
 .../api/command/admin/vm/MigrateVMCmd.java         |   0
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |   0
 .../api/command/admin/vm/RebootVMCmdByAdmin.java   |   0
 .../api/command/admin/vm/RecoverVMCmd.java         |   0
 .../admin/vm/RemoveNicFromVMCmdByAdmin.java        |   0
 .../admin/vm/ResetVMPasswordCmdByAdmin.java        |   0
 .../command/admin/vm/ResetVMSSHKeyCmdByAdmin.java  |   0
 .../api/command/admin/vm/RestoreVMCmdByAdmin.java  |   0
 .../api/command/admin/vm/ScaleVMCmdByAdmin.java    |   0
 .../api/command/admin/vm/StartVMCmdByAdmin.java    |   0
 .../api/command/admin/vm/StopVMCmdByAdmin.java     |   0
 .../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java  |   0
 .../api/command/admin/vm/UpdateVMCmdByAdmin.java   |   0
 .../api/command/admin/vm/UpgradeVMCmdByAdmin.java  |   0
 .../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java   |   0
 .../admin/volume/AttachVolumeCmdByAdmin.java       |   0
 .../admin/volume/CreateVolumeCmdByAdmin.java       |   0
 .../admin/volume/DetachVolumeCmdByAdmin.java       |   0
 .../admin/volume/ListVolumesCmdByAdmin.java        |   0
 .../admin/volume/MigrateVolumeCmdByAdmin.java      |   0
 .../admin/volume/ResizeVolumeCmdByAdmin.java       |   0
 .../admin/volume/UpdateVolumeCmdByAdmin.java       |   0
 .../admin/volume/UploadVolumeCmdByAdmin.java       |   0
 .../command/admin/vpc/CreatePrivateGatewayCmd.java |   0
 .../api/command/admin/vpc/CreateVPCCmdByAdmin.java |   0
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   0
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |   0
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |   0
 .../api/command/admin/vpc/ListVPCsCmdByAdmin.java  |   0
 .../api/command/admin/vpc/UpdateVPCCmdByAdmin.java |   0
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |   0
 .../api/command/admin/zone/CreateZoneCmd.java      |   0
 .../api/command/admin/zone/DeleteZoneCmd.java      |   0
 .../command/admin/zone/ListZonesCmdByAdmin.java    |   0
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |   0
 .../api/command/admin/zone/UpdateZoneCmd.java      |   0
 .../user/account/AddAccountToProjectCmd.java       |   0
 .../user/account/DeleteAccountFromProjectCmd.java  |   0
 .../api/command/user/account/ListAccountsCmd.java  |   0
 .../user/account/ListProjectAccountsCmd.java       |   0
 .../command/user/address/AssociateIPAddrCmd.java   |   0
 .../user/address/DisassociateIPAddrCmd.java        |   0
 .../user/address/ListPublicIpAddressesCmd.java     |   0
 .../api/command/user/address/UpdateIPAddrCmd.java  |   0
 .../user/affinitygroup/CreateAffinityGroupCmd.java |   0
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |   0
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |   0
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |   0
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |   0
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |   0
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |   0
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |   0
 .../command/user/autoscale/CreateConditionCmd.java |   0
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |   0
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |   0
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |   0
 .../command/user/autoscale/DeleteConditionCmd.java |   0
 .../user/autoscale/DisableAutoScaleVmGroupCmd.java |   0
 .../user/autoscale/EnableAutoScaleVmGroupCmd.java  |   0
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |   0
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |   0
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |   0
 .../command/user/autoscale/ListConditionsCmd.java  |   0
 .../command/user/autoscale/ListCountersCmd.java    |   0
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |   0
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |   0
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |   0
 .../command/user/config/ListCapabilitiesCmd.java   |   0
 .../api/command/user/event/ArchiveEventsCmd.java   |   0
 .../api/command/user/event/DeleteEventsCmd.java    |   0
 .../api/command/user/event/ListEventTypesCmd.java  |   0
 .../api/command/user/event/ListEventsCmd.java      |   0
 .../user/firewall/CreateEgressFirewallRuleCmd.java |   0
 .../user/firewall/CreateFirewallRuleCmd.java       |   0
 .../user/firewall/CreatePortForwardingRuleCmd.java |   0
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |   0
 .../user/firewall/DeleteFirewallRuleCmd.java       |   0
 .../user/firewall/DeletePortForwardingRuleCmd.java |   0
 .../user/firewall/IListFirewallRulesCmd.java       |   0
 .../user/firewall/ListEgressFirewallRulesCmd.java  |   0
 .../user/firewall/ListFirewallRulesCmd.java        |   0
 .../user/firewall/ListPortForwardingRulesCmd.java  |   0
 .../user/firewall/UpdateEgressFirewallRuleCmd.java |   0
 .../user/firewall/UpdateFirewallRuleCmd.java       |   0
 .../user/firewall/UpdatePortForwardingRuleCmd.java |   0
 .../user/guest/ListGuestOsCategoriesCmd.java       |   0
 .../api/command/user/guest/ListGuestOsCmd.java     |   0
 .../api/command/user/iso/AttachIsoCmd.java         |   0
 .../api/command/user/iso/CopyIsoCmd.java           |   0
 .../api/command/user/iso/DeleteIsoCmd.java         |   0
 .../api/command/user/iso/DetachIsoCmd.java         |   0
 .../api/command/user/iso/ExtractIsoCmd.java        |   0
 .../command/user/iso/ListIsoPermissionsCmd.java    |   0
 .../api/command/user/iso/ListIsosCmd.java          |   0
 .../api/command/user/iso/RegisterIsoCmd.java       |   0
 .../api/command/user/iso/UpdateIsoCmd.java         |   0
 .../command/user/iso/UpdateIsoPermissionsCmd.java  |   0
 .../api/command/user/job/ListAsyncJobsCmd.java     |   0
 .../command/user/job/QueryAsyncJobResultCmd.java   |   0
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |   0
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |   0
 .../CreateApplicationLoadBalancerCmd.java          |   0
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |   0
 .../loadbalancer/CreateLBStickinessPolicyCmd.java  |   0
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |   0
 .../DeleteApplicationLoadBalancerCmd.java          |   0
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |   0
 .../loadbalancer/DeleteLBStickinessPolicyCmd.java  |   0
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |   0
 .../user/loadbalancer/DeleteSslCertCmd.java        |   0
 .../ListApplicationLoadBalancersCmd.java           |   0
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |   0
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |   0
 .../ListLoadBalancerRuleInstancesCmd.java          |   0
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |   0
 .../command/user/loadbalancer/ListSslCertsCmd.java |   0
 .../RemoveCertFromLoadBalancerCmd.java             |   0
 .../RemoveFromLoadBalancerRuleCmd.java             |   0
 .../UpdateApplicationLoadBalancerCmd.java          |   0
 .../loadbalancer/UpdateLBHealthCheckPolicyCmd.java |   0
 .../loadbalancer/UpdateLBStickinessPolicyCmd.java  |   0
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |   0
 .../user/loadbalancer/UploadSslCertCmd.java        |   0
 .../user/nat/CreateIpForwardingRuleCmd.java        |   0
 .../user/nat/DeleteIpForwardingRuleCmd.java        |   0
 .../api/command/user/nat/DisableStaticNatCmd.java  |   0
 .../api/command/user/nat/EnableStaticNatCmd.java   |   0
 .../command/user/nat/ListIpForwardingRulesCmd.java |   0
 .../command/user/network/CreateNetworkACLCmd.java  |   0
 .../user/network/CreateNetworkACLListCmd.java      |   0
 .../api/command/user/network/CreateNetworkCmd.java |   0
 .../command/user/network/DeleteNetworkACLCmd.java  |   0
 .../user/network/DeleteNetworkACLListCmd.java      |   0
 .../api/command/user/network/DeleteNetworkCmd.java |   0
 .../user/network/ListNetworkACLListsCmd.java       |   0
 .../command/user/network/ListNetworkACLsCmd.java   |   0
 .../user/network/ListNetworkOfferingsCmd.java      |   0
 .../api/command/user/network/ListNetworksCmd.java  |   0
 .../user/network/ReplaceNetworkACLListCmd.java     |   0
 .../command/user/network/RestartNetworkCmd.java    |   0
 .../user/network/UpdateNetworkACLItemCmd.java      |   0
 .../user/network/UpdateNetworkACLListCmd.java      |   0
 .../api/command/user/network/UpdateNetworkCmd.java |   0
 .../user/offering/ListDiskOfferingsCmd.java        |   0
 .../user/offering/ListServiceOfferingsCmd.java     |   0
 .../command/user/project/ActivateProjectCmd.java   |   0
 .../api/command/user/project/CreateProjectCmd.java |   0
 .../api/command/user/project/DeleteProjectCmd.java |   0
 .../user/project/DeleteProjectInvitationCmd.java   |   0
 .../user/project/ListProjectInvitationsCmd.java    |   0
 .../api/command/user/project/ListProjectsCmd.java  |   0
 .../command/user/project/SuspendProjectCmd.java    |   0
 .../api/command/user/project/UpdateProjectCmd.java |   0
 .../user/project/UpdateProjectInvitationCmd.java   |   0
 .../api/command/user/region/ListRegionsCmd.java    |   0
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |   0
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |   0
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |   0
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |   0
 .../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java  |   0
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |   0
 .../user/resource/GetCloudIdentifierCmd.java       |   0
 .../command/user/resource/ListHypervisorsCmd.java  |   0
 .../user/resource/ListResourceLimitsCmd.java       |   0
 .../user/resource/UpdateResourceCountCmd.java      |   0
 .../user/resource/UpdateResourceLimitCmd.java      |   0
 .../AuthorizeSecurityGroupEgressCmd.java           |   0
 .../AuthorizeSecurityGroupIngressCmd.java          |   0
 .../user/securitygroup/CreateSecurityGroupCmd.java |   0
 .../user/securitygroup/DeleteSecurityGroupCmd.java |   0
 .../user/securitygroup/ListSecurityGroupsCmd.java  |   0
 .../RevokeSecurityGroupEgressCmd.java              |   0
 .../RevokeSecurityGroupIngressCmd.java             |   0
 .../command/user/snapshot/CreateSnapshotCmd.java   |   0
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |   0
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |   0
 .../command/user/snapshot/DeleteSnapshotCmd.java   |   0
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |   0
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |   0
 .../command/user/snapshot/ListSnapshotsCmd.java    |   0
 .../command/user/snapshot/RevertSnapshotCmd.java   |   0
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |   0
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |   0
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |   0
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |   0
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |   0
 .../api/command/user/tag/CreateTagsCmd.java        |   0
 .../api/command/user/tag/DeleteTagsCmd.java        |   0
 .../api/command/user/tag/ListTagsCmd.java          |   0
 .../api/command/user/template/CopyTemplateCmd.java |   0
 .../command/user/template/CreateTemplateCmd.java   |   0
 .../command/user/template/DeleteTemplateCmd.java   |   0
 .../command/user/template/ExtractTemplateCmd.java  |   0
 .../template/GetUploadParamsForTemplateCmd.java    |   0
 .../user/template/ListTemplatePermissionsCmd.java  |   0
 .../command/user/template/ListTemplatesCmd.java    |   0
 .../command/user/template/RegisterTemplateCmd.java |   0
 .../command/user/template/UpdateTemplateCmd.java   |   0
 .../template/UpdateTemplatePermissionsCmd.java     |   0
 .../api/command/user/vm/AddIpToVmNicCmd.java       |   0
 .../api/command/user/vm/AddNicToVMCmd.java         |   0
 .../api/command/user/vm/DeployVMCmd.java           |   0
 .../api/command/user/vm/DestroyVMCmd.java          |   0
 .../api/command/user/vm/GetVMPasswordCmd.java      |   0
 .../api/command/user/vm/ListNicsCmd.java           |   0
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   0
 .../api/command/user/vm/RebootVMCmd.java           |   0
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |   0
 .../api/command/user/vm/RemoveNicFromVMCmd.java    |   0
 .../api/command/user/vm/ResetVMPasswordCmd.java    |   0
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |   0
 .../api/command/user/vm/RestoreVMCmd.java          |   0
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |   0
 .../api/command/user/vm/SecurityGroupAction.java   |   0
 .../cloudstack/api/command/user/vm/StartVMCmd.java |   0
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |   0
 .../command/user/vm/UpdateDefaultNicForVMCmd.java  |   0
 .../api/command/user/vm/UpdateVMCmd.java           |   0
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |   0
 .../api/command/user/vm/UpgradeVMCmd.java          |   0
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |   0
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |   0
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |   0
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |   0
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |   0
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |   0
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |   0
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java     |   0
 .../command/user/volume/AddResourceDetailCmd.java  |   0
 .../api/command/user/volume/AttachVolumeCmd.java   |   0
 .../api/command/user/volume/CreateVolumeCmd.java   |   0
 .../api/command/user/volume/DeleteVolumeCmd.java   |   0
 .../api/command/user/volume/DetachVolumeCmd.java   |   0
 .../api/command/user/volume/ExtractVolumeCmd.java  |   0
 .../user/volume/GetUploadParamsForVolumeCmd.java   |   0
 .../user/volume/ListResourceDetailsCmd.java        |   0
 .../api/command/user/volume/ListVolumesCmd.java    |   0
 .../api/command/user/volume/MigrateVolumeCmd.java  |   0
 .../user/volume/RemoveResourceDetailCmd.java       |   0
 .../api/command/user/volume/ResizeVolumeCmd.java   |   0
 .../api/command/user/volume/UpdateVolumeCmd.java   |   0
 .../api/command/user/volume/UploadVolumeCmd.java   |   0
 .../api/command/user/vpc/CreateStaticRouteCmd.java |   0
 .../api/command/user/vpc/CreateVPCCmd.java         |   0
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |   0
 .../api/command/user/vpc/DeleteVPCCmd.java         |   0
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |   0
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |   0
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |   0
 .../api/command/user/vpc/ListVPCsCmd.java          |   0
 .../api/command/user/vpc/RestartVPCCmd.java        |   0
 .../api/command/user/vpc/UpdateVPCCmd.java         |   0
 .../api/command/user/vpn/AddVpnUserCmd.java        |   0
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |   0
 .../command/user/vpn/CreateVpnConnectionCmd.java   |   0
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |   0
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |   0
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |   0
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |   0
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |   0
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |   0
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |   0
 .../command/user/vpn/ListVpnConnectionsCmd.java    |   0
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |   0
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |   0
 .../api/command/user/vpn/ListVpnUsersCmd.java      |   0
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |   0
 .../command/user/vpn/ResetVpnConnectionCmd.java    |   0
 .../command/user/vpn/UpdateRemoteAccessVpnCmd.java |   0
 .../command/user/vpn/UpdateVpnConnectionCmd.java   |   0
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |   0
 .../api/command/user/vpn/UpdateVpnGatewayCmd.java  |   0
 .../api/command/user/zone/ListZonesCmd.java        |   0
 .../cloudstack/api/response/AccountResponse.java   |   0
 .../api/response/AcquireIPAddressResponse.java     |   0
 .../api/response/AcquirePodIpCmdResponse.java      |   0
 .../cloudstack/api/response/AlertResponse.java     |   0
 .../api/response/AnnotationResponse.java           |   0
 .../ApplicationLoadBalancerInstanceResponse.java   |   0
 .../response/ApplicationLoadBalancerResponse.java  |   0
 .../ApplicationLoadBalancerRuleResponse.java       |   0
 .../cloudstack/api/response/AsyncJobResponse.java  |   0
 .../api/response/AuthenticationCmdResponse.java    |   0
 .../api/response/AutoScalePolicyResponse.java      |   0
 .../api/response/AutoScaleVmGroupResponse.java     |   0
 .../api/response/AutoScaleVmProfileResponse.java   |   0
 .../api/response/CAProviderResponse.java           |   0
 .../api/response/CapabilitiesResponse.java         |   0
 .../api/response/CapabilityResponse.java           |   0
 .../cloudstack/api/response/CapacityResponse.java  |   0
 .../api/response/CertificateResponse.java          |   0
 .../api/response/CloudIdentifierResponse.java      |   0
 .../cloudstack/api/response/ClusterResponse.java   |   0
 .../cloudstack/api/response/ConditionResponse.java |   0
 .../api/response/ConfigurationResponse.java        |   0
 .../api/response/ControlledEntityResponse.java     |   0
 .../api/response/ControlledViewEntityResponse.java |   0
 .../cloudstack/api/response/CounterResponse.java   |   0
 .../cloudstack/api/response/CreateCmdResponse.java |   0
 .../api/response/CreateSSHKeyPairResponse.java     |   0
 .../api/response/CustomCertificateResponse.java    |   0
 .../api/response/DeploymentPlannersResponse.java   |   0
 .../api/response/DiskOfferingResponse.java         |   0
 .../cloudstack/api/response/DomainResponse.java    |   0
 .../api/response/DomainRouterResponse.java         |   0
 .../cloudstack/api/response/EventResponse.java     |   0
 .../cloudstack/api/response/EventTypeResponse.java |   0
 .../cloudstack/api/response/ExceptionResponse.java |   0
 .../api/response/ExternalFirewallResponse.java     |   0
 .../api/response/ExternalLoadBalancerResponse.java |   0
 .../cloudstack/api/response/ExtractResponse.java   |   0
 .../cloudstack/api/response/FirewallResponse.java  |   0
 .../api/response/FirewallRuleResponse.java         |   0
 .../api/response/GetUploadParamsResponse.java      |   0
 .../api/response/GetVMPasswordResponse.java        |   0
 .../api/response/GlobalLoadBalancerResponse.java   |   0
 .../cloudstack/api/response/GpuResponse.java       |   0
 .../api/response/GuestOSCategoryResponse.java      |   0
 .../cloudstack/api/response/GuestOSResponse.java   |   0
 .../api/response/GuestOsMappingResponse.java       |   0
 .../api/response/GuestVlanRangeResponse.java       |   0
 .../api/response/HAProviderResponse.java           |   0
 .../api/response/HostForMigrationResponse.java     |   0
 .../cloudstack/api/response/HostHAResponse.java    |   0
 .../cloudstack/api/response/HostResponse.java      |   0
 .../cloudstack/api/response/HostTagResponse.java   |   0
 .../response/HypervisorCapabilitiesResponse.java   |   0
 .../api/response/HypervisorResponse.java           |   0
 .../cloudstack/api/response/IPAddressResponse.java |   0
 .../api/response/ImageStoreDetailResponse.java     |   0
 .../api/response/ImageStoreResponse.java           |   0
 .../api/response/InstanceGroupResponse.java        |   0
 .../InternalLoadBalancerElementResponse.java       |   0
 .../api/response/IpForwardingRuleResponse.java     |   0
 .../cloudstack/api/response/IsoVmResponse.java     |   0
 .../api/response/IsolationMethodResponse.java      |   0
 .../api/response/LBHealthCheckPolicyResponse.java  |   0
 .../api/response/LBHealthCheckResponse.java        |   0
 .../api/response/LBStickinessPolicyResponse.java   |   0
 .../api/response/LBStickinessResponse.java         |   0
 .../cloudstack/api/response/ListResponse.java      |   0
 .../api/response/LoadBalancerResponse.java         |   0
 .../response/LoadBalancerRuleVmMapResponse.java    |   0
 .../cloudstack/api/response/LoginCmdResponse.java  |   0
 .../cloudstack/api/response/LogoutCmdResponse.java |   0
 .../api/response/NetworkACLItemResponse.java       |   0
 .../api/response/NetworkACLResponse.java           |   0
 .../api/response/NetworkDeviceResponse.java        |   0
 .../api/response/NetworkOfferingResponse.java      |   0
 .../cloudstack/api/response/NetworkResponse.java   |   0
 .../api/response/NicExtraDhcpOptionResponse.java   |   0
 .../cloudstack/api/response/NicResponse.java       |   0
 .../api/response/NicSecondaryIpResponse.java       |   0
 .../api/response/OutOfBandManagementResponse.java  |   0
 .../api/response/OvsProviderResponse.java          |   0
 .../api/response/PhysicalNetworkResponse.java      |   0
 .../cloudstack/api/response/PodResponse.java       |   0
 .../api/response/PortableIpRangeResponse.java      |   0
 .../api/response/PortableIpResponse.java           |   0
 .../api/response/PrivateGatewayResponse.java       |   0
 .../api/response/ProjectAccountResponse.java       |   0
 .../api/response/ProjectInvitationResponse.java    |   0
 .../cloudstack/api/response/ProjectResponse.java   |   0
 .../cloudstack/api/response/ProviderResponse.java  |   0
 .../cloudstack/api/response/RegionResponse.java    |   0
 .../cloudstack/api/response/RegisterResponse.java  |   0
 .../api/response/RemoteAccessVpnResponse.java      |   0
 .../api/response/ResourceCountResponse.java        |   0
 .../api/response/ResourceDetailResponse.java       |   0
 .../response/ResourceLimitAndCountResponse.java    |   0
 .../api/response/ResourceLimitResponse.java        |   0
 .../api/response/ResourceTagResponse.java          |   0
 .../api/response/RolePermissionResponse.java       |   0
 .../cloudstack/api/response/RoleResponse.java      |   0
 .../api/response/SSHKeyPairResponse.java           |   0
 .../api/response/SecurityGroupResponse.java        |   0
 .../api/response/SecurityGroupRuleResponse.java    |   0
 .../api/response/ServiceOfferingResponse.java      |   0
 .../cloudstack/api/response/ServiceResponse.java   |   0
 .../response/Site2SiteCustomerGatewayResponse.java |   0
 .../response/Site2SiteVpnConnectionResponse.java   |   0
 .../api/response/Site2SiteVpnGatewayResponse.java  |   0
 .../api/response/SnapshotPolicyResponse.java       |   0
 .../cloudstack/api/response/SnapshotResponse.java  |   0
 .../api/response/SnapshotScheduleResponse.java     |   0
 .../cloudstack/api/response/SslCertResponse.java   |   0
 .../api/response/StaticRouteResponse.java          |   0
 .../response/StorageNetworkIpRangeResponse.java    |   0
 .../api/response/StoragePoolResponse.java          |   0
 .../api/response/StorageProviderResponse.java      |   0
 .../api/response/StorageTagResponse.java           |   0
 .../cloudstack/api/response/SuccessResponse.java   |   0
 .../api/response/SystemVmInstanceResponse.java     |   0
 .../cloudstack/api/response/SystemVmResponse.java  |   0
 .../api/response/TemplatePermissionsResponse.java  |   0
 .../cloudstack/api/response/TemplateResponse.java  |   0
 .../api/response/TrafficMonitorResponse.java       |   0
 .../response/TrafficTypeImplementorResponse.java   |   0
 .../api/response/TrafficTypeResponse.java          |   0
 .../response/UpgradeRouterTemplateResponse.java    |   0
 .../api/response/UsageRecordResponse.java          |   0
 .../cloudstack/api/response/UsageTypeResponse.java |   0
 .../cloudstack/api/response/UserResponse.java      |   0
 .../cloudstack/api/response/UserVmResponse.java    |   0
 .../api/response/VMSnapshotResponse.java           |   0
 .../api/response/VMUserDataResponse.java           |   0
 .../cloudstack/api/response/VgpuResponse.java      |   0
 .../response/VirtualRouterProviderResponse.java    |   0
 .../api/response/VlanIpRangeResponse.java          |   0
 .../cloudstack/api/response/VolumeResponse.java    |   0
 .../api/response/VpcOfferingResponse.java          |   0
 .../cloudstack/api/response/VpcResponse.java       |   0
 .../cloudstack/api/response/VpnUsersResponse.java  |   0
 .../cloudstack/api/response/ZoneResponse.java      |   0
 .../java}/org/apache/cloudstack/ca/CAManager.java  |   0
 .../UploadTemplateDirectDownloadCertificate.java   |   0
 .../network/CreateManagementNetworkIpRangeCmd.java |   0
 .../network/DeleteManagementNetworkIpRangeCmd.java |   0
 .../command/admin/network/MigrateNetworkCmd.java   |   0
 .../api/command/admin/network/MigrateVPCCmd.java   |   0
 .../api/command/admin/user/MoveUserCmd.java        |   0
 .../api/response/ChildTemplateResponse.java        |   0
 .../direct/download/DirectDownloadManager.java     |   0
 .../cloudstack/config/ApiServiceConfiguration.java |   0
 .../org/apache/cloudstack/context/CallContext.java |   0
 .../cloudstack/context/CallContextListener.java    |   0
 .../org/apache/cloudstack/context/LogContext.java  |   0
 .../cloudstack/context/LogContextListener.java     |   0
 .../java}/org/apache/cloudstack/ha/HAConfig.java   |   0
 .../org/apache/cloudstack/ha/HAConfigManager.java  |   0
 .../java}/org/apache/cloudstack/ha/HAResource.java |   0
 .../java}/org/apache/cloudstack/jobs/JobInfo.java  |   0
 .../org/apache/cloudstack/kernel/Partition.java    |   0
 .../network/ExternalNetworkDeviceManager.java      |   0
 .../InternalLoadBalancerElementService.java        |   0
 .../lb/ApplicationLoadBalancerContainer.java       |   0
 .../network/lb/ApplicationLoadBalancerRule.java    |   0
 .../network/lb/ApplicationLoadBalancerService.java |   0
 .../network/lb/InternalLoadBalancerVMService.java  |   0
 .../apache/cloudstack/network/tls/CertService.java |   0
 .../org/apache/cloudstack/network/tls/SslCert.java |   0
 .../outofbandmanagement/OutOfBandManagement.java   |   0
 .../OutOfBandManagementDriver.java                 |   0
 .../OutOfBandManagementService.java                |   0
 ...fBandManagementDriverChangePasswordCommand.java |   0
 .../driver/OutOfBandManagementDriverCommand.java   |   0
 .../OutOfBandManagementDriverPowerCommand.java     |   0
 .../driver/OutOfBandManagementDriverResponse.java  |   0
 .../cloudstack/poll/BackgroundPollManager.java     |   0
 .../apache/cloudstack/poll/BackgroundPollTask.java |   0
 .../org/apache/cloudstack/query/QueryService.java  |   0
 .../org/apache/cloudstack/region/PortableIp.java   |   0
 .../apache/cloudstack/region/PortableIpRange.java  |   0
 .../java}/org/apache/cloudstack/region/Region.java |   0
 .../apache/cloudstack/region/RegionService.java    |   0
 .../org/apache/cloudstack/region/RegionSync.java   |   0
 .../java}/org/apache/cloudstack/usage/Usage.java   |   0
 .../org/apache/cloudstack/usage/UsageService.java  |   0
 .../org/apache/cloudstack/usage/UsageTypes.java    |   0
 .../cloudstack/api-config/module.properties        |   0
 .../api-config/spring-api-config-context.xml       |   0
 .../cloudstack/api-planner/module.properties       |   0
 .../api-planner/spring-api-planner-context.xml     |   0
 .../com/cloud/network/IsolationMethodTest.java     |   0
 .../test/java}/com/cloud/network/NetworksTest.java |   0
 .../test/java}/com/cloud/storage/StorageTest.java  |   0
 .../org/apache/cloudstack/acl/RoleTypeTest.java    |   0
 .../java}/org/apache/cloudstack/acl/RuleTest.java  |   0
 .../org/apache/cloudstack/api/ApiCmdTestUtil.java  |   0
 .../org/apache/cloudstack/api/BaseCmdTest.java     |   0
 .../admin/account/CreateAccountCmdTest.java        |   0
 .../admin/annotation/AddAnnotationCmdTest.java     |   0
 .../CreateSecondaryStagingStoreCmdTest.java        |   0
 .../api/command/admin/user/CreateUserCmdTest.java  |   0
 .../admin/vpc/CreateVPCOfferingCmdTest.java        |   0
 .../api/command/test/ActivateProjectCmdTest.java   |   0
 .../command/test/AddAccountToProjectCmdTest.java   |   0
 .../api/command/test/AddClusterCmdTest.java        |   0
 .../api/command/test/AddHostCmdTest.java           |   0
 .../api/command/test/AddIpToVmNicTest.java         |   0
 .../test/AddNetworkServiceProviderCmdTest.java     |   0
 .../command/test/AddSecondaryStorageCmdTest.java   |   0
 .../api/command/test/AddVpnUserCmdTest.java        |   0
 .../api/command/test/CreateSnapshotCmdTest.java    |   0
 .../api/command/test/ListCfgCmdTest.java           |   0
 .../cloudstack/api/command/test/RegionCmdTest.java |   0
 .../api/command/test/ScaleVMCmdTest.java           |   0
 .../api/command/test/UpdateCfgCmdTest.java         |   0
 .../command/test/UpdateHostPasswordCmdTest.java    |   0
 .../api/command/test/UpdateVmNicIpTest.java        |   0
 .../cloudstack/api/command/test/UsageCmdTest.java  |   0
 .../user/template/CopyTemplateCmdByAdminTest.java  |   0
 .../command/user/template/CopyTemplateCmdTest.java |   0
 .../template/RegisterTemplateCmdByAdminTest.java   |   0
 .../user/template/RegisterTemplateCmdTest.java     |   0
 .../cloudstack/api/response/HostResponseTest.java  |   0
 .../apache/cloudstack/context/CallContextTest.java |   0
 .../apache/cloudstack/test/utils/SpringUtils.java  |   0
 client/pom.xml                                     |   4 +-
 .../java}/org/apache/cloudstack/ServerDaemon.java  |   0
 .../META-INF/cloudstack/webApplicationContext.xml  |   0
 client/{ => src/main/webapp}/WEB-INF/web.xml       |   0
 .../java}/com/cloud/agent/IAgentControl.java       |   0
 .../com/cloud/agent/IAgentControlListener.java     |   0
 .../com/cloud/agent/StartupCommandProcessor.java   |   0
 .../com/cloud/agent/api/AgentControlAnswer.java    |   0
 .../com/cloud/agent/api/AgentControlCommand.java   |   0
 .../java}/com/cloud/agent/api/AttachIsoAnswer.java |   0
 .../com/cloud/agent/api/AttachIsoCommand.java      |   0
 .../api/AttachOrDettachConfigDriveCommand.java     |   0
 .../com/cloud/agent/api/BackupSnapshotAnswer.java  |   0
 .../com/cloud/agent/api/BackupSnapshotCommand.java |   0
 .../com/cloud/agent/api/BumpUpPriorityCommand.java |   0
 .../java}/com/cloud/agent/api/CancelCommand.java   |   0
 .../com/cloud/agent/api/ChangeAgentAnswer.java     |   0
 .../com/cloud/agent/api/ChangeAgentCommand.java    |   0
 .../com/cloud/agent/api/CheckHealthAnswer.java     |   0
 .../com/cloud/agent/api/CheckHealthCommand.java    |   0
 .../com/cloud/agent/api/CheckNetworkAnswer.java    |   0
 .../com/cloud/agent/api/CheckNetworkCommand.java   |   0
 .../com/cloud/agent/api/CheckOnHostAnswer.java     |   0
 .../com/cloud/agent/api/CheckOnHostCommand.java    |   0
 .../com/cloud/agent/api/CheckRouterAnswer.java     |   0
 .../com/cloud/agent/api/CheckRouterCommand.java    |   0
 .../agent/api/CheckS2SVpnConnectionsAnswer.java    |   0
 .../agent/api/CheckS2SVpnConnectionsCommand.java   |   0
 .../com/cloud/agent/api/CheckStateAnswer.java      |   0
 .../com/cloud/agent/api/CheckStateCommand.java     |   0
 .../api/CheckVMActivityOnStoragePoolCommand.java   |   0
 .../cloud/agent/api/CheckVirtualMachineAnswer.java |   0
 .../agent/api/CheckVirtualMachineCommand.java      |   0
 .../cloud/agent/api/CleanupNetworkRulesCmd.java    |   0
 .../agent/api/ClusterVMMetaDataSyncAnswer.java     |   0
 .../agent/api/ClusterVMMetaDataSyncCommand.java    |   0
 .../cloud/agent/api/ComputeChecksumCommand.java    |   0
 .../api/ConsoleAccessAuthenticationAnswer.java     |   0
 .../api/ConsoleAccessAuthenticationCommand.java    |   0
 .../agent/api/ConsoleProxyLoadReportCommand.java   |   0
 .../CreatePrivateTemplateFromSnapshotCommand.java  |   0
 .../CreatePrivateTemplateFromVolumeCommand.java    |   0
 .../cloud/agent/api/CreateStoragePoolCommand.java  |   0
 .../cloud/agent/api/CreateVMSnapshotAnswer.java    |   0
 .../cloud/agent/api/CreateVMSnapshotCommand.java   |   0
 .../agent/api/CreateVolumeFromSnapshotAnswer.java  |   0
 .../agent/api/CreateVolumeFromSnapshotCommand.java |   0
 .../api/CreateVolumeFromVMSnapshotAnswer.java      |   0
 .../api/CreateVolumeFromVMSnapshotCommand.java     |   0
 .../java}/com/cloud/agent/api/CronCommand.java     |   0
 .../cloud/agent/api/DeleteSnapshotsDirCommand.java |   0
 .../cloud/agent/api/DeleteStoragePoolCommand.java  |   0
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java    |   0
 .../cloud/agent/api/DeleteVMSnapshotCommand.java   |   0
 .../cloud/agent/api/DirectNetworkUsageAnswer.java  |   0
 .../cloud/agent/api/DirectNetworkUsageCommand.java |   0
 .../api/ExternalNetworkResourceUsageAnswer.java    |   0
 .../api/ExternalNetworkResourceUsageCommand.java   |   0
 .../java}/com/cloud/agent/api/FenceAnswer.java     |   0
 .../java}/com/cloud/agent/api/FenceCommand.java    |   0
 .../com/cloud/agent/api/GetDomRVersionAnswer.java  |   0
 .../com/cloud/agent/api/GetDomRVersionCmd.java     |   0
 .../com/cloud/agent/api/GetGPUStatsAnswer.java     |   0
 .../com/cloud/agent/api/GetGPUStatsCommand.java    |   0
 .../com/cloud/agent/api/GetHostStatsAnswer.java    |   0
 .../com/cloud/agent/api/GetHostStatsCommand.java   |   0
 .../com/cloud/agent/api/GetRouterAlertsAnswer.java |   0
 .../com/cloud/agent/api/GetStorageStatsAnswer.java |   0
 .../cloud/agent/api/GetStorageStatsCommand.java    |   0
 .../com/cloud/agent/api/GetVmConfigAnswer.java     |   0
 .../com/cloud/agent/api/GetVmConfigCommand.java    |   0
 .../com/cloud/agent/api/GetVmDiskStatsAnswer.java  |   0
 .../com/cloud/agent/api/GetVmDiskStatsCommand.java |   0
 .../com/cloud/agent/api/GetVmIpAddressCommand.java |   0
 .../cloud/agent/api/GetVmNetworkStatsAnswer.java   |   0
 .../cloud/agent/api/GetVmNetworkStatsCommand.java  |   0
 .../com/cloud/agent/api/GetVmStatsAnswer.java      |   0
 .../com/cloud/agent/api/GetVmStatsCommand.java     |   0
 .../com/cloud/agent/api/GetVncPortAnswer.java      |   0
 .../com/cloud/agent/api/GetVncPortCommand.java     |   0
 .../com/cloud/agent/api/GetVolumeStatsAnswer.java  |   0
 .../com/cloud/agent/api/GetVolumeStatsCommand.java |   0
 .../agent/api/HandleConfigDriveIsoCommand.java     |   0
 .../java}/com/cloud/agent/api/HostStatsEntry.java  |   0
 .../java}/com/cloud/agent/api/MaintainAnswer.java  |   0
 .../java}/com/cloud/agent/api/MaintainCommand.java |   0
 .../com/cloud/agent/api/ManageSnapshotAnswer.java  |   0
 .../com/cloud/agent/api/ManageSnapshotCommand.java |   0
 .../java}/com/cloud/agent/api/MigrateAnswer.java   |   0
 .../java}/com/cloud/agent/api/MigrateCommand.java  |   0
 .../cloud/agent/api/MigrateWithStorageAnswer.java  |   0
 .../cloud/agent/api/MigrateWithStorageCommand.java |   0
 .../api/MigrateWithStorageCompleteAnswer.java      |   0
 .../api/MigrateWithStorageCompleteCommand.java     |   0
 .../agent/api/MigrateWithStorageReceiveAnswer.java |   0
 .../api/MigrateWithStorageReceiveCommand.java      |   0
 .../agent/api/MigrateWithStorageSendAnswer.java    |   0
 .../agent/api/MigrateWithStorageSendCommand.java   |   0
 .../com/cloud/agent/api/ModifySshKeysCommand.java  |   0
 .../cloud/agent/api/ModifyStoragePoolAnswer.java   |   0
 .../cloud/agent/api/ModifyStoragePoolCommand.java  |   0
 .../com/cloud/agent/api/ModifyTargetsAnswer.java   |   0
 .../com/cloud/agent/api/ModifyTargetsCommand.java  |   0
 .../cloud/agent/api/ModifyVmNicConfigAnswer.java   |   0
 .../cloud/agent/api/ModifyVmNicConfigCommand.java  |   0
 .../api/NetScalerImplementNetworkCommand.java      |   0
 .../agent/api/NetworkRulesSystemVmCommand.java     |   0
 .../api/NetworkRulesVmSecondaryIpCommand.java      |   0
 .../com/cloud/agent/api/NetworkUsageAnswer.java    |   0
 .../com/cloud/agent/api/NetworkUsageCommand.java   |   0
 .../cloud/agent/api/PerformanceMonitorAnswer.java  |   0
 .../cloud/agent/api/PerformanceMonitorCommand.java |   0
 .../java}/com/cloud/agent/api/PingAnswer.java      |   0
 .../java}/com/cloud/agent/api/PingCommand.java     |   0
 .../com/cloud/agent/api/PingRoutingCommand.java    |   0
 .../agent/api/PingRoutingWithNwGroupsCommand.java  |   0
 .../cloud/agent/api/PingRoutingWithOvsCommand.java |   0
 .../com/cloud/agent/api/PingStorageCommand.java    |   0
 .../java}/com/cloud/agent/api/PingTestCommand.java |   0
 .../java}/com/cloud/agent/api/PlugNicAnswer.java   |   0
 .../java}/com/cloud/agent/api/PlugNicCommand.java  |   0
 .../cloud/agent/api/PrepareForMigrationAnswer.java |   0
 .../agent/api/PrepareForMigrationCommand.java      |   0
 .../cloud/agent/api/PrepareOCFS2NodesCommand.java  |   0
 .../agent/api/PropagateResourceEventCommand.java   |   0
 .../java}/com/cloud/agent/api/ReadyAnswer.java     |   0
 .../java}/com/cloud/agent/api/ReadyCommand.java    |   0
 .../java}/com/cloud/agent/api/RebootAnswer.java    |   0
 .../java}/com/cloud/agent/api/RebootCommand.java   |   0
 .../com/cloud/agent/api/RebootRouterCommand.java   |   0
 .../agent/api/RecurringNetworkUsageAnswer.java     |   0
 .../agent/api/RecurringNetworkUsageCommand.java    |   0
 .../cloud/agent/api/RestoreVMSnapshotAnswer.java   |   0
 .../cloud/agent/api/RestoreVMSnapshotCommand.java  |   0
 .../cloud/agent/api/RevertToVMSnapshotAnswer.java  |   0
 .../cloud/agent/api/RevertToVMSnapshotCommand.java |   0
 .../java}/com/cloud/agent/api/ScaleVmAnswer.java   |   0
 .../java}/com/cloud/agent/api/ScaleVmCommand.java  |   0
 .../agent/api/ScheduleHostScanTaskCommand.java     |   0
 .../agent/api/SecStorageFirewallCfgCommand.java    |   0
 .../com/cloud/agent/api/SecStorageSetupAnswer.java |   0
 .../cloud/agent/api/SecStorageSetupCommand.java    |   0
 .../cloud/agent/api/SecStorageVMSetupCommand.java  |   0
 .../cloud/agent/api/SecurityGroupRuleAnswer.java   |   0
 .../com/cloud/agent/api/SecurityGroupRulesCmd.java |   0
 .../com/cloud/agent/api/SetHostParamsCommand.java  |   0
 .../java}/com/cloud/agent/api/SetupAnswer.java     |   0
 .../java}/com/cloud/agent/api/SetupCommand.java    |   0
 .../cloud/agent/api/SetupGuestNetworkCommand.java  |   0
 .../java}/com/cloud/agent/api/ShutdownCommand.java |   0
 .../java}/com/cloud/agent/api/SnapshotCommand.java |   0
 .../java}/com/cloud/agent/api/StartAnswer.java     |   0
 .../java}/com/cloud/agent/api/StartCommand.java    |   0
 .../java}/com/cloud/agent/api/StartupAnswer.java   |   0
 .../java}/com/cloud/agent/api/StartupCommand.java  |   0
 .../agent/api/StartupExternalDhcpCommand.java      |   0
 .../agent/api/StartupExternalFirewallCommand.java  |   0
 .../api/StartupExternalLoadBalancerCommand.java    |   0
 .../com/cloud/agent/api/StartupProxyCommand.java   |   0
 .../cloud/agent/api/StartupPxeServerCommand.java   |   0
 .../com/cloud/agent/api/StartupRoutingCommand.java |   0
 .../agent/api/StartupSecondaryStorageCommand.java  |   0
 .../com/cloud/agent/api/StartupStorageCommand.java |   0
 .../agent/api/StartupTrafficMonitorCommand.java    |   0
 .../cloud/agent/api/StartupVMMAgentCommand.java    |   0
 .../java}/com/cloud/agent/api/StopAnswer.java      |   0
 .../java}/com/cloud/agent/api/StopCommand.java     |   0
 .../com/cloud/agent/api/TransferAgentCommand.java  |   0
 .../java}/com/cloud/agent/api/UnPlugNicAnswer.java |   0
 .../com/cloud/agent/api/UnPlugNicCommand.java      |   0
 .../com/cloud/agent/api/UnregisterNicCommand.java  |   0
 .../com/cloud/agent/api/UnregisterVMCommand.java   |   0
 .../cloud/agent/api/UpdateHostPasswordCommand.java |   0
 .../cloud/agent/api/UpgradeSnapshotCommand.java    |   0
 .../com/cloud/agent/api/VMSnapshotBaseCommand.java |   0
 .../java}/com/cloud/agent/api/VMSnapshotTO.java    |   0
 .../cloud/agent/api/ValidateSnapshotAnswer.java    |   0
 .../cloud/agent/api/ValidateSnapshotCommand.java   |   0
 .../com/cloud/agent/api/VmDiskStatsEntry.java      |   0
 .../com/cloud/agent/api/VmNetworkStatsEntry.java   |   0
 .../java}/com/cloud/agent/api/VmStatsEntry.java    |   0
 .../com/cloud/agent/api/VolumeStatsEntry.java      |   0
 .../com/cloud/agent/api}/api/ReplugNicAnswer.java  |   0
 .../com/cloud/agent/api}/api/ReplugNicCommand.java |   0
 .../api/storage/CreateDatadiskTemplateAnswer.java  |   0
 .../api/storage/CreateDatadiskTemplateCommand.java |   0
 .../agent/api}/api/storage/GetDatadisksAnswer.java |   0
 .../api}/api/storage/GetDatadisksCommand.java      |   0
 .../agent/api/baremetal/IpmISetBootDevCommand.java |   0
 .../api/baremetal/IpmiBootorResetCommand.java      |   0
 .../baremetal/PrepareCreateTemplateCommand.java    |   0
 .../api/baremetal/PreparePxeServerAnswer.java      |   0
 .../api/baremetal/PreparePxeServerCommand.java     |   0
 .../com/cloud/agent/api/check/CheckSshAnswer.java  |   0
 .../com/cloud/agent/api/check/CheckSshCommand.java |   0
 .../api/proxy/CheckConsoleProxyLoadCommand.java    |   0
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java    |   0
 .../com/cloud/agent/api/proxy/ProxyCommand.java    |   0
 .../StartConsoleProxyAgentHttpHandlerCommand.java  |   0
 .../api/proxy/WatchConsoleProxyLoadCommand.java    |   0
 .../api/routing/AggregationControlCommand.java     |   0
 .../agent/api/routing/CreateIpAliasCommand.java    |   0
 .../CreateLoadBalancerApplianceCommand.java        |   0
 .../agent/api/routing/DeleteIpAliasCommand.java    |   0
 .../DestroyLoadBalancerApplianceCommand.java       |   0
 .../cloud/agent/api/routing/DhcpEntryCommand.java  |   0
 .../agent/api/routing/DnsMasqConfigCommand.java    |   0
 .../agent/api/routing/GetRouterAlertsCommand.java  |   0
 .../routing/GlobalLoadBalancerConfigAnswer.java    |   0
 .../routing/GlobalLoadBalancerConfigCommand.java   |   0
 .../com/cloud/agent/api/routing/GroupAnswer.java   |   0
 .../api/routing/HealthCheckLBConfigAnswer.java     |   0
 .../api/routing/HealthCheckLBConfigCommand.java    |   0
 .../com/cloud/agent/api/routing/IpAliasTO.java     |   0
 .../com/cloud/agent/api/routing/IpAssocAnswer.java |   0
 .../cloud/agent/api/routing/IpAssocCommand.java    |   0
 .../cloud/agent/api/routing/IpAssocVpcCommand.java |   0
 .../api/routing/LoadBalancerConfigCommand.java     |   0
 .../agent/api/routing/NetworkElementCommand.java   |   0
 .../api/routing/RemoteAccessVpnCfgCommand.java     |   0
 .../agent/api/routing/SavePasswordCommand.java     |   0
 .../agent/api/routing/SetFirewallRulesAnswer.java  |   0
 .../agent/api/routing/SetFirewallRulesCommand.java |   0
 .../api/routing/SetMonitorServiceCommand.java      |   0
 .../agent/api/routing/SetNetworkACLAnswer.java     |   0
 .../agent/api/routing/SetNetworkACLCommand.java    |   0
 .../api/routing/SetPortForwardingRulesAnswer.java  |   0
 .../api/routing/SetPortForwardingRulesCommand.java |   0
 .../routing/SetPortForwardingRulesVpcCommand.java  |   0
 .../agent/api/routing/SetSourceNatAnswer.java      |   0
 .../agent/api/routing/SetSourceNatCommand.java     |   0
 .../agent/api/routing/SetStaticNatRulesAnswer.java |   0
 .../api/routing/SetStaticNatRulesCommand.java      |   0
 .../agent/api/routing/SetStaticRouteAnswer.java    |   0
 .../agent/api/routing/SetStaticRouteCommand.java   |   0
 .../agent/api/routing/Site2SiteVpnCfgCommand.java  |   0
 .../agent/api/routing/SiteLoadBalancerConfig.java  |   0
 .../cloud/agent/api/routing/UserDataCommand.java   |   0
 .../com/cloud/agent/api/routing/VmDataCommand.java |   0
 .../agent/api/routing/VpnUsersCfgCommand.java      |   0
 .../agent/api/storage/AbstractDownloadCommand.java |   0
 .../agent/api/storage/AbstractUploadCommand.java   |   0
 .../cloud/agent/api/storage/CopyVolumeAnswer.java  |   0
 .../cloud/agent/api/storage/CopyVolumeCommand.java |   0
 .../com/cloud/agent/api/storage/CreateAnswer.java  |   0
 .../com/cloud/agent/api/storage/CreateCommand.java |   0
 .../api/storage/CreateEntityDownloadURLAnswer.java |   0
 .../storage/CreateEntityDownloadURLCommand.java    |   0
 .../api/storage/CreatePrivateTemplateAnswer.java   |   0
 .../api/storage/CreatePrivateTemplateCommand.java  |   0
 .../storage/DeleteEntityDownloadURLCommand.java    |   0
 .../com/cloud/agent/api/storage/DestroyAnswer.java |   0
 .../cloud/agent/api/storage/DestroyCommand.java    |   0
 .../cloud/agent/api/storage/DownloadAnswer.java    |   0
 .../agent/api/storage/ListTemplateAnswer.java      |   0
 .../agent/api/storage/ListTemplateCommand.java     |   0
 .../cloud/agent/api/storage/ListVolumeAnswer.java  |   0
 .../cloud/agent/api/storage/ListVolumeCommand.java |   0
 .../storage/ManageVolumeAvailabilityAnswer.java    |   0
 .../storage/ManageVolumeAvailabilityCommand.java   |   0
 .../agent/api/storage/MigrateVolumeAnswer.java     |   0
 .../agent/api/storage/MigrateVolumeCommand.java    |   0
 .../api/storage/PrimaryStorageDownloadAnswer.java  |   0
 .../api/storage/PrimaryStorageDownloadCommand.java |   0
 .../agent/api/storage/ResizeVolumeAnswer.java      |   0
 .../agent/api/storage/ResizeVolumeCommand.java     |   0
 .../com/cloud/agent/api/storage/SsCommand.java     |   0
 .../cloud/agent/api/storage/StorageCommand.java    |   0
 .../api/storage/StorageNfsVersionCommand.java      |   0
 .../cloud/agent/api/storage/UpgradeDiskAnswer.java |   0
 .../agent/api/storage/UpgradeDiskCommand.java      |   0
 .../com/cloud/agent/api/storage/UploadAnswer.java  |   0
 .../com/cloud/agent/api/storage/UploadCommand.java |   0
 .../agent/api/storage/UploadProgressCommand.java   |   0
 .../agent/resource/virtualnetwork/ConfigItem.java  |   0
 .../resource/virtualnetwork/FileConfigItem.java    |   0
 .../resource/virtualnetwork/ScriptConfigItem.java  |   0
 .../agent/resource/virtualnetwork/VRScripts.java   |   0
 .../virtualnetwork/VirtualRouterDeployer.java      |   0
 .../virtualnetwork/VirtualRoutingResource.java     |   0
 .../facade/AbstractConfigItemFacade.java           |   0
 .../facade/BumpUpPriorityConfigItem.java           |   0
 .../facade/CreateIpAliasConfigItem.java            |   0
 .../facade/DeleteIpAliasConfigItem.java            |   0
 .../virtualnetwork/facade/DhcpEntryConfigItem.java |   0
 .../virtualnetwork/facade/DnsMasqConfigItem.java   |   0
 .../facade/IpAssociationConfigItem.java            |   0
 .../facade/LoadBalancerConfigItem.java             |   0
 .../facade/RemoteAccessVpnConfigItem.java          |   0
 .../facade/SavePasswordConfigItem.java             |   0
 .../facade/SetFirewallRulesConfigItem.java         |   0
 .../facade/SetGuestNetworkConfigItem.java          |   0
 .../facade/SetMonitorServiceConfigItem.java        |   0
 .../facade/SetNetworkAclConfigItem.java            |   0
 .../facade/SetPortForwardingRulesConfigItem.java   |   0
 .../SetPortForwardingRulesVpcConfigItem.java       |   0
 .../facade/SetSourceNatConfigItem.java             |   0
 .../facade/SetStaticNatRulesConfigItem.java        |   0
 .../facade/SetStaticRouteConfigItem.java           |   0
 .../facade/Site2SiteVpnConfigItem.java             |   0
 .../virtualnetwork/facade/VmDataConfigItem.java    |   0
 .../virtualnetwork/facade/VpnUsersConfigItem.java  |   0
 .../resource/virtualnetwork/model/AclRule.java     |   0
 .../resource/virtualnetwork/model/AllAclRule.java  |   0
 .../resource/virtualnetwork/model/ConfigBase.java  |   0
 .../resource/virtualnetwork/model/DhcpConfig.java  |   0
 .../virtualnetwork/model/DhcpConfigEntry.java      |   0
 .../virtualnetwork/model/FirewallRule.java         |   0
 .../virtualnetwork/model/FirewallRules.java        |   0
 .../virtualnetwork/model/ForwardingRule.java       |   0
 .../virtualnetwork/model/ForwardingRules.java      |   0
 .../virtualnetwork/model/GuestNetwork.java         |   0
 .../resource/virtualnetwork/model/IcmpAclRule.java |   0
 .../resource/virtualnetwork/model/IpAddress.java   |   0
 .../virtualnetwork/model/IpAddressAlias.java       |   0
 .../resource/virtualnetwork/model/IpAliases.java   |   0
 .../virtualnetwork/model/IpAssociation.java        |   0
 .../virtualnetwork/model/LoadBalancerRule.java     |   0
 .../virtualnetwork/model/LoadBalancerRules.java    |   0
 .../virtualnetwork/model/MonitorService.java       |   0
 .../resource/virtualnetwork/model/NetworkACL.java  |   0
 .../virtualnetwork/model/ProtocolAclRule.java      |   0
 .../virtualnetwork/model/RemoteAccessVpn.java      |   0
 .../virtualnetwork/model/Site2SiteVpn.java         |   0
 .../virtualnetwork/model/StaticNatRule.java        |   0
 .../virtualnetwork/model/StaticNatRules.java       |   0
 .../resource/virtualnetwork/model/StaticRoute.java |   0
 .../virtualnetwork/model/StaticRoutes.java         |   0
 .../resource/virtualnetwork/model/TcpAclRule.java  |   0
 .../resource/virtualnetwork/model/UdpAclRule.java  |   0
 .../resource/virtualnetwork/model/VmData.java      |   0
 .../virtualnetwork/model/VmDhcpConfig.java         |   0
 .../resource/virtualnetwork/model/VmPassword.java  |   0
 .../resource/virtualnetwork/model/VpnUser.java     |   0
 .../resource/virtualnetwork/model/VpnUserList.java |   0
 .../cloud/agent/transport/ArrayTypeAdaptor.java    |   0
 .../agent/transport/InterfaceTypeAdaptor.java      |   0
 .../agent/transport/LoggingExclusionStrategy.java  |   0
 .../java}/com/cloud/agent/transport/Request.java   |   0
 .../java}/com/cloud/agent/transport/Response.java  |   0
 .../template/MetalinkTemplateDownloader.java       |   0
 .../exception/UnsupportedVersionException.java     |   0
 .../com/cloud/exception/UsageServerException.java  |   0
 .../{ => main/java}/com/cloud/host/HostInfo.java   |   0
 .../com/cloud/info/ConsoleProxyConnectionInfo.java |   0
 .../java}/com/cloud/info/ConsoleProxyInfo.java     |   0
 .../java}/com/cloud/info/ConsoleProxyStatus.java   |   0
 .../com/cloud/info/RunningHostInfoAgregator.java   |   0
 .../java}/com/cloud/info/SecStorageVmLoadInfo.java |   0
 .../com/cloud/network/HAProxyConfigurator.java     |   0
 .../cloud/network/LoadBalancerConfigurator.java    |   0
 .../com/cloud/network/LoadBalancerValidator.java   |   0
 .../CreateLoadBalancerApplianceAnswer.java         |   0
 .../DestroyLoadBalancerApplianceAnswer.java        |   0
 .../network/resource/TrafficSentinelResource.java  |   0
 .../java}/com/cloud/resource/CommandWrapper.java   |   0
 .../java}/com/cloud/resource/RequestWrapper.java   |   0
 .../java}/com/cloud/resource/ResourceListener.java |   0
 .../java}/com/cloud/resource/ResourceWrapper.java  |   0
 .../java}/com/cloud/resource/ServerResource.java   |   0
 .../com/cloud/resource/ServerResourceBase.java     |   0
 .../resource/hypervisor/HypervisorResource.java    |   0
 .../java}/com/cloud/serializer/GsonHelper.java     |   0
 .../com/cloud/serializer/SerializerHelper.java     |   0
 .../java}/com/cloud/storage/JavaStorageLayer.java  |   0
 .../java}/com/cloud/storage/StorageLayer.java      |   0
 .../storage/resource/StoragePoolResource.java      |   0
 .../cloud/storage/resource/StorageProcessor.java   |   0
 .../resource/StorageSubsystemCommandHandler.java   |   0
 .../StorageSubsystemCommandHandlerBase.java        |   0
 .../storage/template/FtpTemplateUploader.java      |   0
 .../storage/template/HttpTemplateDownloader.java   |   0
 .../com/cloud/storage/template/IsoProcessor.java   |   0
 .../storage/template/LocalTemplateDownloader.java  |   0
 .../com/cloud/storage/template/OVAProcessor.java   |   0
 .../com/cloud/storage/template/Processor.java      |   0
 .../com/cloud/storage/template/QCOW2Processor.java |   0
 .../cloud/storage/template/RawImageProcessor.java  |   0
 .../storage/template/S3TemplateDownloader.java     |   0
 .../storage/template/ScpTemplateDownloader.java    |   0
 .../com/cloud/storage/template/TARProcessor.java   |   0
 .../cloud/storage/template/TemplateConstants.java  |   0
 .../cloud/storage/template/TemplateDownloader.java |   0
 .../storage/template/TemplateDownloaderBase.java   |   0
 .../cloud/storage/template/TemplateLocation.java   |   0
 .../cloud/storage/template/TemplateUploader.java   |   0
 .../com/cloud/storage/template/VhdProcessor.java   |   0
 .../com/cloud/storage/template/VmdkProcessor.java  |   0
 .../agent/directdownload/CheckUrlAnswer.java       |   0
 .../agent/directdownload/CheckUrlCommand.java      |   0
 .../agent/directdownload/DirectDownloadAnswer.java |   0
 .../directdownload/DirectDownloadCommand.java      |   0
 .../directdownload/HttpDirectDownloadCommand.java  |   0
 .../directdownload/HttpsDirectDownloadCommand.java |   0
 .../MetalinkDirectDownloadCommand.java             |   0
 .../directdownload/NfsDirectDownloadCommand.java   |   0
 .../SetupDirectDownloadCertificate.java            |   0
 .../cloudstack/ca/SetupCertificateAnswer.java      |   0
 .../cloudstack/ca/SetupCertificateCommand.java     |   0
 .../apache/cloudstack/ca/SetupKeyStoreCommand.java |   0
 .../apache/cloudstack/ca/SetupKeystoreAnswer.java  |   0
 .../cloudstack/storage/command/AttachAnswer.java   |   0
 .../cloudstack/storage/command/AttachCommand.java  |   0
 .../command/AttachPrimaryDataStoreAnswer.java      |   0
 .../storage/command/AttachPrimaryDataStoreCmd.java |   0
 .../cloudstack/storage/command/CopyCmdAnswer.java  |   0
 .../cloudstack/storage/command/CopyCommand.java    |   0
 .../storage/command/CreateObjectAnswer.java        |   0
 .../storage/command/CreateObjectCommand.java       |   0
 .../storage/command/CreatePrimaryDataStoreCmd.java |   0
 .../cloudstack/storage/command/DeleteCommand.java  |   0
 .../cloudstack/storage/command/DettachAnswer.java  |   0
 .../cloudstack/storage/command/DettachCommand.java |   0
 .../storage/command/DownloadCommand.java           |   0
 .../storage/command/DownloadProgressCommand.java   |   0
 .../storage/command/ForgetObjectCmd.java           |   0
 .../storage/command/IntroduceObjectAnswer.java     |   0
 .../storage/command/IntroduceObjectCmd.java        |   0
 .../storage/command/ResignatureAnswer.java         |   0
 .../storage/command/ResignatureCommand.java        |   0
 .../storage/command/RevertSnapshotCommand.java     |   0
 .../storage/command/SnapshotAndCopyAnswer.java     |   0
 .../storage/command/SnapshotAndCopyCommand.java    |   0
 .../storage/command/StorageSubSystemCommand.java   |   0
 .../command/TemplateOrVolumePostUploadCommand.java |   0
 .../storage/command/UploadStatusAnswer.java        |   0
 .../storage/command/UploadStatusCommand.java       |   0
 .../apache/cloudstack/storage/to/ImageStoreTO.java |   0
 .../cloudstack/storage/to/PrimaryDataStoreTO.java  |   0
 .../cloudstack/storage/to/SnapshotObjectTO.java    |   0
 .../cloudstack/storage/to/TemplateObjectTO.java    |   0
 .../cloudstack/storage/to/VolumeObjectTO.java      |   0
 .../cloudstack/allocator/module.properties         |   0
 .../allocator/spring-core-allocator-context.xml    |   0
 ...ore-lifecycle-allocator-context-inheritable.xml |   0
 .../META-INF/cloudstack/api/module.properties      |   0
 ...ring-core-lifecycle-api-context-inheritable.xml |   0
 .../META-INF/cloudstack/backend/module.properties  |   0
 .../cloudstack/bootstrap/module.properties         |   0
 .../spring-bootstrap-context-inheritable.xml       |   0
 .../bootstrap/spring-bootstrap-context.xml         |   0
 .../META-INF/cloudstack/ca/module.properties       |   0
 ...pring-core-lifecycle-ca-context-inheritable.xml |   0
 .../cloudstack/direct-download/module.properties   |   0
 ...fecycle-direct-download-context-inheritable.xml |   0
 .../META-INF/cloudstack/compute/module.properties  |   0
 ...-core-lifecycle-compute-context-inheritable.xml |   0
 .../META-INF/cloudstack/core/module.properties     |   0
 .../cloudstack/core/spring-core-context.xml        |   0
 ...ing-core-lifecycle-core-context-inheritable.xml |   0
 .../core/spring-core-registry-core-context.xml     |   0
 .../cloudstack/discoverer/module.properties        |   0
 ...re-lifecycle-discoverer-context-inheritable.xml |   0
 .../META-INF/cloudstack/network/module.properties  |   0
 ...-core-lifecycle-network-context-inheritable.xml |   0
 .../outofbandmanagement/module.properties          |   0
 ...cle-outofbandmanagement-context-inheritable.xml |   0
 .../META-INF/cloudstack/planner/module.properties  |   0
 ...-core-lifecycle-planner-context-inheritable.xml |   0
 .../META-INF/cloudstack/storage/module.properties  |   0
 ...pring-lifecycle-storage-context-inheritable.xml |   0
 .../META-INF/cloudstack/system/module.properties   |   0
 .../spring-core-system-context-inheritable.xml     |   0
 .../system/spring-core-system-context.xml          |   0
 .../cloud/agent/api/SecurityGroupRulesCmdTest.java |   0
 .../api/routing/SetNetworkACLCommandTest.java      |   0
 .../resource/virtualnetwork/ConfigHelperTest.java  |   0
 .../virtualnetwork/VirtualRoutingResourceTest.java |   0
 .../com/cloud/agent/transport/RequestTest.java     |   0
 .../com/cloud/network/HAProxyConfiguratorTest.java |   0
 .../template/LocalTemplateDownloaderTest.java      |   0
 .../cloud/storage/template/OVAProcessorTest.java   |   0
 .../cloud/storage/template/QCOW2ProcessorTest.java |   0
 .../cloud/storage/template/VhdProcessorTest.java   |   0
 .../api/agent/test/AgentControlAnswerTest.java     |   0
 .../api/agent/test/AgentControlCommandTest.java    |   0
 .../cloudstack/api/agent/test/AnswerTest.java      |   0
 .../api/agent/test/AttachIsoCommandTest.java       |   0
 .../api/agent/test/BackupSnapshotAnswerTest.java   |   0
 .../api/agent/test/BackupSnapshotCommandTest.java  |   0
 .../api/agent/test/BumpUpPriorityCommandTest.java  |   0
 .../api/agent/test/CancelCommandTest.java          |   0
 .../api/agent/test/ChangeAgentAnswerTest.java      |   0
 .../api/agent/test/ChangeAgentCommandTest.java     |   0
 .../api/agent/test/CheckHealthAnswerTest.java      |   0
 .../api/agent/test/CheckHealthCommandTest.java     |   0
 .../api/agent/test/CheckNetworkAnswerTest.java     |   0
 .../api/agent/test/CheckNetworkCommandTest.java    |   0
 .../api/agent/test/CheckOnHostCommandTest.java     |   0
 .../api/agent/test/SnapshotCommandTest.java        |   0
 core/{ => src}/test/resources/vhds/test.vhd        | Bin
 core/{ => src}/test/resources/vhds/test.vhd.bz2    | Bin
 core/{ => src}/test/resources/vhds/test.vhd.gz     | Bin
 core/{ => src}/test/resources/vhds/test.vhd.zip    | Bin
 .../java}/com/cloud/vm/VirtualMachineGuru.java     |   0
 .../java}/com/cloud/vm/VirtualMachineManager.java  |   0
 .../engine/cloud/entity/api/BackupEntity.java      |   0
 .../engine/cloud/entity/api/EdgeService.java       |   0
 .../engine/cloud/entity/api/NetworkEntity.java     |   0
 .../engine/cloud/entity/api/NicEntity.java         |   0
 .../engine/cloud/entity/api/SnapshotEntity.java    |   0
 .../engine/cloud/entity/api/TemplateEntity.java    |   0
 .../cloud/entity/api/VirtualMachineEntity.java     |   0
 .../engine/cloud/entity/api/VolumeEntity.java      |   0
 .../datacenter/entity/api/ClusterEntity.java       |   0
 .../entity/api/DataCenterResourceEntity.java       |   0
 .../engine/datacenter/entity/api/HostEntity.java   |   0
 .../datacenter/entity/api/OrganizationScope.java   |   0
 .../engine/datacenter/entity/api/PodEntity.java    |   0
 .../datacenter/entity/api/StorageEntity.java       |   0
 .../engine/datacenter/entity/api/ZoneEntity.java   |   0
 .../engine/entity/api/CloudStackEntity.java        |   0
 .../exception/InsufficientCapacityException.java   |   0
 .../service/NetworkOrchestrationService.java       |   0
 .../service/VolumeOrchestrationService.java        |   0
 .../rest/service/api/ClusterRestService.java       |   0
 .../rest/service/api/NetworkRestService.java       |   0
 .../engine/rest/service/api/PodRestService.java    |   0
 .../service/api/VirtualMachineRestService.java     |   0
 .../engine/rest/service/api/VolumeRestService.java |   0
 .../engine/rest/service/api/ZoneRestService.java   |   0
 .../engine/service/api/DirectoryService.java       |   0
 .../engine/service/api/EntityService.java          |   0
 .../engine/service/api/OperationsServices.java     |   0
 .../engine/service/api/OrchestrationService.java   |   0
 .../engine/service/api/ProvisioningService.java    |   0
 .../subsystem/api/hypervisor/ComputeSubsystem.java |   0
 .../api/network/NetworkServiceProvider.java        |   0
 .../subsystem/api/network/NetworkSubsystem.java    |   0
 .../subsystem/api/storage/AbstractScope.java       |   0
 .../engine/subsystem/api/storage/ChapInfo.java     |   0
 .../engine/subsystem/api/storage/ClusterScope.java |   0
 .../subsystem/api/storage/CopyCommandResult.java   |   0
 .../subsystem/api/storage/CreateCmdResult.java     |   0
 .../subsystem/api/storage/DataMotionService.java   |   0
 .../subsystem/api/storage/DataMotionStrategy.java  |   0
 .../engine/subsystem/api/storage/DataObject.java   |   0
 .../subsystem/api/storage/DataObjectInStore.java   |   0
 .../engine/subsystem/api/storage/DataStore.java    |   0
 .../api/storage/DataStoreCapabilities.java         |   0
 .../subsystem/api/storage/DataStoreDriver.java     |   0
 .../subsystem/api/storage/DataStoreLifeCycle.java  |   0
 .../subsystem/api/storage/DataStoreManager.java    |   0
 .../subsystem/api/storage/DataStoreProvider.java   |   0
 .../api/storage/DataStoreProviderManager.java      |   0
 .../engine/subsystem/api/storage/EndPoint.java     |   0
 .../subsystem/api/storage/EndPointSelector.java    |   0
 .../engine/subsystem/api/storage/HostScope.java    |   0
 .../api/storage/HypervisorHostListener.java        |   0
 .../subsystem/api/storage/ImageStoreProvider.java  |   0
 .../api/storage/ObjectInDataStoreStateMachine.java |   0
 .../subsystem/api/storage/PrimaryDataStore.java    |   0
 .../api/storage/PrimaryDataStoreDriver.java        |   0
 .../api/storage/PrimaryDataStoreInfo.java          |   0
 .../api/storage/PrimaryDataStoreLifeCycle.java     |   0
 .../api/storage/PrimaryDataStoreParameters.java    |   0
 .../api/storage/PrimaryDataStoreProvider.java      |   0
 .../engine/subsystem/api/storage/Scope.java        |   0
 .../subsystem/api/storage/SnapshotDataFactory.java |   0
 .../engine/subsystem/api/storage/SnapshotInfo.java |   0
 .../subsystem/api/storage/SnapshotProfile.java     |   0
 .../subsystem/api/storage/SnapshotResult.java      |   0
 .../subsystem/api/storage/SnapshotService.java     |   0
 .../subsystem/api/storage/SnapshotStrategy.java    |   0
 .../subsystem/api/storage/StorageAction.java       |   0
 .../subsystem/api/storage/StorageCacheManager.java |   0
 .../engine/subsystem/api/storage/StorageEvent.java |   0
 .../api/storage/StoragePoolAllocator.java          |   0
 .../api/storage/StorageStrategyFactory.java        |   0
 .../subsystem/api/storage/StrategyPriority.java    |   0
 .../subsystem/api/storage/TemplateDataFactory.java |   0
 .../subsystem/api/storage/TemplateEvent.java       |   0
 .../engine/subsystem/api/storage/TemplateInfo.java |   0
 .../subsystem/api/storage/TemplateService.java     |   0
 .../subsystem/api/storage/TemplateState.java       |   0
 .../subsystem/api/storage/VMSnapshotOptions.java   |   0
 .../subsystem/api/storage/VMSnapshotStrategy.java  |   0
 .../subsystem/api/storage/VolumeDataFactory.java   |   0
 .../engine/subsystem/api/storage/VolumeInfo.java   |   0
 .../subsystem/api/storage/VolumeService.java       |   0
 .../engine/subsystem/api/storage/ZoneScope.java    |   0
 .../subsystem/api/storage/disktype/DiskFormat.java |   0
 .../subsystem/api/storage/disktype/QCOW2.java      |   0
 .../subsystem/api/storage/disktype/Unknown.java    |   0
 .../engine/subsystem/api/storage/disktype/VHD.java |   0
 .../subsystem/api/storage/disktype/VHDX.java       |   0
 .../subsystem/api/storage/disktype/VMDK.java       |   0
 .../api/storage/disktype/VolumeDiskType.java       |   0
 .../api/storage/disktype/VolumeDiskTypeBase.java   |   0
 .../api/storage/disktype/VolumeDiskTypeHelper.java |   0
 .../subsystem/api/storage/type/BaseImage.java      |   0
 .../subsystem/api/storage/type/DataDisk.java       |   0
 .../engine/subsystem/api/storage/type/Iso.java     |   0
 .../subsystem/api/storage/type/RootDisk.java       |   0
 .../engine/subsystem/api/storage/type/Unknown.java |   0
 .../subsystem/api/storage/type/VolumeType.java     |   0
 .../subsystem/api/storage/type/VolumeTypeBase.java |   0
 .../api/storage/type/VolumeTypeHelper.java         |   0
 .../cloudstack/storage/command/CommandResult.java  |   0
 .../storage/image/datastore/ImageStoreEntity.java  |   0
 .../storage/image/datastore/ImageStoreInfo.java    |   0
 .../core/spring-engine-api-core-context.xml        |   0
 .../engine/subsystem/api/storage/ScopeTest.java    |   0
 .../api/storage/type/VolumeTypeHelperTest.java     |   0
 .../java}/com/cloud/agent/AgentManager.java        |   0
 .../{ => main/java}/com/cloud/agent/Listener.java  |   0
 .../java}/com/cloud/alert/AlertManager.java        |   0
 .../java}/com/cloud/capacity/CapacityManager.java  |   0
 .../cloud/configuration/ConfigurationManager.java  |   0
 .../cloud/deploy/DeploymentPlanningManager.java    |   0
 .../java}/com/cloud/event/UsageEventUtils.java     |   0
 .../com/cloud/ha/HighAvailabilityManager.java      |   0
 .../cloud/hypervisor/HypervisorGuruManager.java    |   0
 .../java}/com/cloud/network/IpAddressManager.java  |   0
 .../com/cloud/network/NetworkStateListener.java    |   0
 .../java}/com/cloud/network/addr/PublicIp.java     |   0
 .../network/lb/LoadBalancingRulesManager.java      |   0
 .../com/cloud/network/rules/FirewallManager.java   |   0
 .../com/cloud/network/rules/RulesManager.java      |   0
 .../com/cloud/network/rules/StaticNatRuleImpl.java |   0
 .../com/cloud/network/vpc/NetworkACLManager.java   |   0
 .../java}/com/cloud/network/vpc/VpcManager.java    |   0
 .../java}/com/cloud/resource/Discoverer.java       |   0
 .../java}/com/cloud/resource/ResourceManager.java  |   0
 .../com/cloud/resource/ResourceStateAdapter.java   |   0
 .../java}/com/cloud/storage/StorageManager.java    |   0
 .../java}/com/cloud/template/TemplateManager.java  |   0
 .../java}/com/cloud/vm/ReservationContextImpl.java |   0
 .../com/cloud/vm/VirtualMachineProfileImpl.java    |   0
 .../src/{ => main/java}/com/cloud/vm/VmWork.java   |   0
 .../java}/com/cloud/vm/VmWorkAttachVolume.java     |   0
 .../java}/com/cloud/vm/VmWorkConstants.java        |   0
 .../java}/com/cloud/vm/VmWorkDetachVolume.java     |   0
 .../java}/com/cloud/vm/VmWorkExtractVolume.java    |   0
 .../java}/com/cloud/vm/VmWorkJobHandler.java       |   0
 .../java}/com/cloud/vm/VmWorkJobHandlerProxy.java  |   0
 .../java}/com/cloud/vm/VmWorkMigrateVolume.java    |   0
 .../java}/com/cloud/vm/VmWorkResizeVolume.java     |   0
 .../java}/com/cloud/vm/VmWorkSerializer.java       |   0
 .../com/cloud/vm/VmWorkTakeVolumeSnapshot.java     |   0
 .../com/cloud/vm/snapshot/VMSnapshotManager.java   |   0
 .../org/apache/cloudstack/compute/ComputeGuru.java |   0
 .../spring-engine-components-api-core-context.xml  |   0
 engine/network/pom.xml                             |   2 -
 .../cloudstack/network/NetworkOrchestrator.java    |   0
 .../com/cloud/agent/manager/AgentAttache.java      |   0
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   0
 .../cloud/agent/manager/ClusteredAgentAttache.java |   0
 .../agent/manager/ClusteredAgentManagerImpl.java   |   0
 .../agent/manager/ClusteredDirectAgentAttache.java |   0
 .../cloud/agent/manager/ConnectedAgentAttache.java |   0
 .../cloud/agent/manager/DirectAgentAttache.java    |   0
 .../com/cloud/agent/manager/DummyAttache.java      |   0
 .../java}/com/cloud/agent/manager/Routable.java    |   0
 .../cloud/agent/manager/SynchronousListener.java   |   0
 .../cluster/ClusteredAgentRebalanceService.java    |   0
 .../cluster/agentlb/AgentLoadBalancerPlanner.java  |   0
 .../ClusterBasedAgentLoadBalancerPlanner.java      |   0
 .../vm/ClusteredVirtualMachineManagerImpl.java     |   0
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   0
 .../com/cloud/vm/VirtualMachinePowerStateSync.java |   0
 .../cloud/vm/VirtualMachinePowerStateSyncImpl.java |   0
 .../java}/com/cloud/vm/VmWorkAddVmToNetwork.java   |   0
 .../java}/com/cloud/vm/VmWorkJobDispatcher.java    |   0
 .../com/cloud/vm/VmWorkJobWakeupDispatcher.java    |   0
 .../java}/com/cloud/vm/VmWorkMigrate.java          |   0
 .../java}/com/cloud/vm/VmWorkMigrateAway.java      |   0
 .../java}/com/cloud/vm/VmWorkMigrateForScale.java  |   0
 .../com/cloud/vm/VmWorkMigrateWithStorage.java     |   0
 .../{ => main/java}/com/cloud/vm/VmWorkReboot.java |   0
 .../java}/com/cloud/vm/VmWorkReconfigure.java      |   0
 .../java}/com/cloud/vm/VmWorkRemoveNicFromVm.java  |   0
 .../com/cloud/vm/VmWorkRemoveVmFromNetwork.java    |   0
 .../{ => main/java}/com/cloud/vm/VmWorkStart.java  |   0
 .../{ => main/java}/com/cloud/vm/VmWorkStop.java   |   0
 .../java}/com/cloud/vm/VmWorkStorageMigration.java |   0
 .../engine/cloud/entity/api/VMEntityManager.java   |   0
 .../cloud/entity/api/VMEntityManagerImpl.java      |   0
 .../cloud/entity/api/VirtualMachineEntityImpl.java |   0
 .../datacenter/entity/api/ClusterEntityImpl.java   |   0
 .../entity/api/DataCenterResourceManager.java      |   0
 .../entity/api/DataCenterResourceManagerImpl.java  |   0
 .../datacenter/entity/api/HostEntityImpl.java      |   0
 .../datacenter/entity/api/PodEntityImpl.java       |   0
 .../datacenter/entity/api/ZoneEntityImpl.java      |   0
 .../datacenter/entity/api/db/ClusterDetailsVO.java |   0
 .../datacenter/entity/api/db/DcDetailVO.java       |   0
 .../datacenter/entity/api/db/EngineCluster.java    |   0
 .../datacenter/entity/api/db/EngineClusterVO.java  |   0
 .../datacenter/entity/api/db/EngineDataCenter.java |   0
 .../entity/api/db/EngineDataCenterVO.java          |   0
 .../datacenter/entity/api/db/EngineHost.java       |   0
 .../datacenter/entity/api/db/EngineHostPodVO.java  |   0
 .../datacenter/entity/api/db/EngineHostVO.java     |   0
 .../engine/datacenter/entity/api/db/EnginePod.java |   0
 .../datacenter/entity/api/db/dao/DcDetailsDao.java |   0
 .../entity/api/db/dao/DcDetailsDaoImpl.java        |   0
 .../entity/api/db/dao/EngineClusterDao.java        |   0
 .../entity/api/db/dao/EngineClusterDaoImpl.java    |   0
 .../entity/api/db/dao/EngineDataCenterDao.java     |   0
 .../entity/api/db/dao/EngineDataCenterDaoImpl.java |   0
 .../entity/api/db/dao/EngineHostDao.java           |   0
 .../entity/api/db/dao/EngineHostDaoImpl.java       |   0
 .../entity/api/db/dao/EngineHostPodDao.java        |   0
 .../entity/api/db/dao/EngineHostPodDaoImpl.java    |   0
 .../entity/api/db/dao/HostDetailsDao.java          |   0
 .../entity/api/db/dao/HostDetailsDaoImpl.java      |   0
 .../datacenter/entity/api/db/dao/HostTagsDao.java  |   0
 .../entity/api/db/dao/HostTagsDaoImpl.java         |   0
 .../engine/orchestration/CloudOrchestrator.java    |   0
 .../engine/orchestration/NetworkOrchestrator.java  |   0
 .../engine/orchestration/VolumeOrchestrator.java   |   0
 .../service/api/ProvisioningServiceImpl.java       |   0
 .../spring-engine-orchestration-core-context.xml   |   0
 .../cloud/agent/manager/AgentManagerImplTest.java  |   0
 .../agent/manager/ConnectedAgentAttacheTest.java   |   0
 .../agent/manager/DirectAgentAttacheTest.java      |   0
 .../cloud/vm/VirtualMachineManagerImplTest.java    |   0
 .../orchestration/NetworkOrchestratorTest.java     |   0
 .../provisioning/test/ChildTestConfiguration.java  |   0
 .../engine/provisioning/test/ProvisioningTest.java |   0
 .../test/resources}/provisioningContext.xml        |   0
 .../{ => main/java}/com/cloud/alert/AlertVO.java   |   0
 .../java}/com/cloud/alert/dao/AlertDao.java        |   0
 .../java}/com/cloud/alert/dao/AlertDaoImpl.java    |   0
 .../java}/com/cloud/capacity/CapacityVO.java       |   0
 .../java}/com/cloud/capacity/dao/CapacityDao.java  |   0
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   0
 .../java}/com/cloud/certificate/CertificateVO.java |   0
 .../java}/com/cloud/certificate/CrlVO.java         |   0
 .../com/cloud/certificate/dao/CertificateDao.java  |   0
 .../cloud/certificate/dao/CertificateDaoImpl.java  |   0
 .../java}/com/cloud/certificate/dao/CrlDao.java    |   0
 .../com/cloud/certificate/dao/CrlDaoImpl.java      |   0
 .../ManagementServiceConfiguration.java            |   0
 .../ManagementServiceConfigurationImpl.java        |   0
 .../cloud/usage/UsageSnapshotOnPrimaryVO.java      |   0
 .../usage/dao/UsageVMSnapshotOnPrimaryDao.java     |   0
 .../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java |   0
 .../cloud/cluster/agentlb/HostTransferMapVO.java   |   0
 .../cluster/agentlb/dao/HostTransferMapDao.java    |   0
 .../agentlb/dao/HostTransferMapDaoImpl.java        |   0
 .../com/cloud/configuration/ResourceCountVO.java   |   0
 .../com/cloud/configuration/ResourceLimitVO.java   |   0
 .../cloud/configuration/dao/ResourceCountDao.java  |   0
 .../configuration/dao/ResourceCountDaoImpl.java    |   0
 .../cloud/configuration/dao/ResourceLimitDao.java  |   0
 .../configuration/dao/ResourceLimitDaoImpl.java    |   0
 .../java}/com/cloud/dc/AccountVlanMapVO.java       |   0
 .../java}/com/cloud/dc/ClusterDetailsDao.java      |   0
 .../java}/com/cloud/dc/ClusterDetailsDaoImpl.java  |   0
 .../java}/com/cloud/dc/ClusterDetailsVO.java       |   0
 .../{ => main/java}/com/cloud/dc/ClusterVO.java    |   0
 .../java}/com/cloud/dc/ClusterVSMMapVO.java        |   0
 .../java}/com/cloud/dc/DataCenterDetailVO.java     |   0
 .../java}/com/cloud/dc/DataCenterIpAddressVO.java  |   0
 .../cloud/dc/DataCenterLinkLocalIpAddressVO.java   |   0
 .../{ => main/java}/com/cloud/dc/DataCenterVO.java |   0
 .../java}/com/cloud/dc/DataCenterVnetVO.java       |   0
 .../java}/com/cloud/dc/DomainVlanMapVO.java        |   0
 .../{ => main/java}/com/cloud/dc/HostPodVO.java    |   0
 .../{ => main/java}/com/cloud/dc/PodCluster.java   |   0
 .../{ => main/java}/com/cloud/dc/PodVlanMapVO.java |   0
 .../{ => main/java}/com/cloud/dc/PodVlanVO.java    |   0
 .../com/cloud/dc/StorageNetworkIpAddressVO.java    |   0
 .../com/cloud/dc/StorageNetworkIpRangeVO.java      |   0
 .../java}/com/cloud/dc/VlanDetailsVO.java          |   0
 .../src/{ => main/java}/com/cloud/dc/VlanVO.java   |   0
 .../java}/com/cloud/dc/dao/AccountVlanMapDao.java  |   0
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java    |   0
 .../java}/com/cloud/dc/dao/ClusterDao.java         |   0
 .../java}/com/cloud/dc/dao/ClusterDaoImpl.java     |   0
 .../java}/com/cloud/dc/dao/ClusterVSMMapDao.java   |   0
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java     |   0
 .../java}/com/cloud/dc/dao/DataCenterDao.java      |   0
 .../java}/com/cloud/dc/dao/DataCenterDaoImpl.java  |   0
 .../com/cloud/dc/dao/DataCenterDetailsDao.java     |   0
 .../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java |   0
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |   0
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |   0
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java    |   0
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |   0
 .../java}/com/cloud/dc/dao/DataCenterVnetDao.java  |   0
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |   0
 .../java}/com/cloud/dc/dao/DomainVlanMapDao.java   |   0
 .../com/cloud/dc/dao/DomainVlanMapDaoImpl.java     |   0
 .../java}/com/cloud/dc/dao/HostPodDao.java         |   0
 .../java}/com/cloud/dc/dao/HostPodDaoImpl.java     |   0
 .../java}/com/cloud/dc/dao/PodVlanDao.java         |   0
 .../java}/com/cloud/dc/dao/PodVlanDaoImpl.java     |   0
 .../java}/com/cloud/dc/dao/PodVlanMapDao.java      |   0
 .../java}/com/cloud/dc/dao/PodVlanMapDaoImpl.java  |   0
 .../cloud/dc/dao/StorageNetworkIpAddressDao.java   |   0
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java     |   0
 .../com/cloud/dc/dao/StorageNetworkIpRangeDao.java |   0
 .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java |   0
 .../{ => main/java}/com/cloud/dc/dao/VlanDao.java  |   0
 .../java}/com/cloud/dc/dao/VlanDaoImpl.java        |   0
 .../java}/com/cloud/dc/dao/VlanDetailsDao.java     |   0
 .../java}/com/cloud/dc/dao/VlanDetailsDaoImpl.java |   0
 .../{ => main/java}/com/cloud/domain/DomainVO.java |   0
 .../java}/com/cloud/domain/dao/DomainDao.java      |   0
 .../java}/com/cloud/domain/dao/DomainDaoImpl.java  |   0
 .../com/cloud/domain}/domain/DomainDetailVO.java   |   0
 .../cloud/domain}/domain/dao/DomainDetailsDao.java |   0
 .../domain}/domain/dao/DomainDetailsDaoImpl.java   |   0
 .../{ => main/java}/com/cloud/event/EventVO.java   |   0
 .../java}/com/cloud/event/UsageEventDetailsVO.java |   0
 .../java}/com/cloud/event/UsageEventVO.java        |   0
 .../java}/com/cloud/event/dao/EventDao.java        |   0
 .../java}/com/cloud/event/dao/EventDaoImpl.java    |   0
 .../java}/com/cloud/event/dao/UsageEventDao.java   |   0
 .../com/cloud/event/dao/UsageEventDaoImpl.java     |   0
 .../com/cloud/event/dao/UsageEventDetailsDao.java  |   0
 .../cloud/event/dao/UsageEventDetailsDaoImpl.java  |   0
 .../java}/com/cloud/gpu/HostGpuGroupsVO.java       |   0
 .../{ => main/java}/com/cloud/gpu/VGPUTypesVO.java |   0
 .../java}/com/cloud/gpu/dao/HostGpuGroupsDao.java  |   0
 .../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java    |   0
 .../java}/com/cloud/gpu/dao/VGPUTypesDao.java      |   0
 .../java}/com/cloud/gpu/dao/VGPUTypesDaoImpl.java  |   0
 .../{ => main/java}/com/cloud/host/DetailVO.java   |   0
 .../{ => main/java}/com/cloud/host/HostTagVO.java  |   0
 .../src/{ => main/java}/com/cloud/host/HostVO.java |   0
 .../java}/com/cloud/host/dao/HostDao.java          |   0
 .../java}/com/cloud/host/dao/HostDaoImpl.java      |   0
 .../java}/com/cloud/host/dao/HostDetailsDao.java   |   0
 .../com/cloud/host/dao/HostDetailsDaoImpl.java     |   0
 .../java}/com/cloud/host/dao/HostTagsDao.java      |   0
 .../java}/com/cloud/host/dao/HostTagsDaoImpl.java  |   0
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   0
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |   0
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   0
 .../com/cloud/network/LBHealthCheckPolicyVO.java   |   0
 .../java}/com/cloud/network/UserIpv6AddressVO.java |   0
 .../java}/com/cloud/network/VpnUserVO.java         |   0
 .../network/as/AutoScalePolicyConditionMapVO.java  |   0
 .../com/cloud/network/as/AutoScalePolicyVO.java    |   0
 .../network/as/AutoScaleVmGroupPolicyMapVO.java    |   0
 .../com/cloud/network/as/AutoScaleVmGroupVO.java   |   0
 .../cloud/network/as/AutoScaleVmGroupVmMapVO.java  |   0
 .../com/cloud/network/as/AutoScaleVmProfileVO.java |   0
 .../java}/com/cloud/network/as/ConditionVO.java    |   0
 .../java}/com/cloud/network/as/CounterVO.java      |   0
 .../as/dao/AutoScalePolicyConditionMapDao.java     |   0
 .../as/dao/AutoScalePolicyConditionMapDaoImpl.java |   0
 .../cloud/network/as/dao/AutoScalePolicyDao.java   |   0
 .../network/as/dao/AutoScalePolicyDaoImpl.java     |   0
 .../cloud/network/as/dao/AutoScaleVmGroupDao.java  |   0
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java    |   0
 .../as/dao/AutoScaleVmGroupPolicyMapDao.java       |   0
 .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |   0
 .../network/as/dao/AutoScaleVmGroupVmMapDao.java   |   0
 .../as/dao/AutoScaleVmGroupVmMapDaoImpl.java       |   0
 .../network/as/dao/AutoScaleVmProfileDao.java      |   0
 .../network/as/dao/AutoScaleVmProfileDaoImpl.java  |   0
 .../com/cloud/network/as/dao/ConditionDao.java     |   0
 .../com/cloud/network/as/dao/ConditionDaoImpl.java |   0
 .../java}/com/cloud/network/as/dao/CounterDao.java |   0
 .../com/cloud/network/as/dao/CounterDaoImpl.java   |   0
 .../cloud/network/dao/AccountGuestVlanMapDao.java  |   0
 .../network/dao/AccountGuestVlanMapDaoImpl.java    |   0
 .../cloud/network/dao/AccountGuestVlanMapVO.java   |   0
 .../network/dao/ExternalFirewallDeviceDao.java     |   0
 .../network/dao/ExternalFirewallDeviceDaoImpl.java |   0
 .../network/dao/ExternalFirewallDeviceVO.java      |   0
 .../network/dao/ExternalLoadBalancerDeviceDao.java |   0
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java     |   0
 .../network/dao/ExternalLoadBalancerDeviceVO.java  |   0
 .../cloud/network/dao/FirewallRulesCidrsDao.java   |   0
 .../network/dao/FirewallRulesCidrsDaoImpl.java     |   0
 .../cloud/network/dao/FirewallRulesCidrsVO.java    |   0
 .../com/cloud/network/dao/FirewallRulesDao.java    |   0
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |   0
 .../cloud/network/dao/FirewallRulesDcidrsDao.java  |   0
 .../network/dao/FirewallRulesDcidrsDaoImpl.java    |   0
 .../network/dao/FirewallRulesDestCidrsVO.java      |   0
 .../java}/com/cloud/network/dao/IPAddressDao.java  |   0
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |   0
 .../java}/com/cloud/network/dao/IPAddressVO.java   |   0
 .../network/dao/InlineLoadBalancerNicMapDao.java   |   0
 .../dao/InlineLoadBalancerNicMapDaoImpl.java       |   0
 .../network/dao/InlineLoadBalancerNicMapVO.java    |   0
 .../cloud/network/dao/LBHealthCheckPolicyDao.java  |   0
 .../network/dao/LBHealthCheckPolicyDaoImpl.java    |   0
 .../cloud/network/dao/LBStickinessPolicyDao.java   |   0
 .../network/dao/LBStickinessPolicyDaoImpl.java     |   0
 .../cloud/network/dao/LBStickinessPolicyVO.java    |   0
 .../cloud/network/dao/LoadBalancerCertMapDao.java  |   0
 .../network/dao/LoadBalancerCertMapDaoImpl.java    |   0
 .../cloud/network/dao/LoadBalancerCertMapVO.java   |   0
 .../com/cloud/network/dao/LoadBalancerDao.java     |   0
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |   0
 .../cloud/network/dao/LoadBalancerVMMapDao.java    |   0
 .../network/dao/LoadBalancerVMMapDaoImpl.java      |   0
 .../com/cloud/network/dao/LoadBalancerVMMapVO.java |   0
 .../com/cloud/network/dao/LoadBalancerVO.java      |   0
 .../cloud/network/dao/MonitoringServiceDao.java    |   0
 .../network/dao/MonitoringServiceDaoImpl.java      |   0
 .../com/cloud/network/dao/MonitoringServiceVO.java |   0
 .../com/cloud/network/dao/NetworkAccountDao.java   |   0
 .../cloud/network/dao/NetworkAccountDaoImpl.java   |   0
 .../com/cloud/network/dao/NetworkAccountVO.java    |   0
 .../java}/com/cloud/network/dao/NetworkDao.java    |   0
 .../com/cloud/network/dao/NetworkDaoImpl.java      |   0
 .../com/cloud/network/dao/NetworkDetailVO.java     |   0
 .../com/cloud/network/dao/NetworkDetailsDao.java   |   0
 .../cloud/network/dao/NetworkDetailsDaoImpl.java   |   0
 .../com/cloud/network/dao/NetworkDomainDao.java    |   0
 .../cloud/network/dao/NetworkDomainDaoImpl.java    |   0
 .../com/cloud/network/dao/NetworkDomainVO.java     |   0
 .../network/dao/NetworkExternalFirewallDao.java    |   0
 .../dao/NetworkExternalFirewallDaoImpl.java        |   0
 .../network/dao/NetworkExternalFirewallVO.java     |   0
 .../dao/NetworkExternalLoadBalancerDao.java        |   0
 .../dao/NetworkExternalLoadBalancerDaoImpl.java    |   0
 .../network/dao/NetworkExternalLoadBalancerVO.java |   0
 .../java}/com/cloud/network/dao/NetworkOpDao.java  |   0
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |   0
 .../java}/com/cloud/network/dao/NetworkOpVO.java   |   0
 .../cloud/network/dao/NetworkRuleConfigDao.java    |   0
 .../network/dao/NetworkRuleConfigDaoImpl.java      |   0
 .../com/cloud/network/dao/NetworkRuleConfigVO.java |   0
 .../cloud/network/dao/NetworkServiceMapDao.java    |   0
 .../network/dao/NetworkServiceMapDaoImpl.java      |   0
 .../com/cloud/network/dao/NetworkServiceMapVO.java |   0
 .../java}/com/cloud/network/dao/NetworkVO.java     |   0
 .../network/dao/OpRouterMonitorServiceDao.java     |   0
 .../network/dao/OpRouterMonitorServiceDaoImpl.java |   0
 .../network/dao/OpRouterMonitorServiceVO.java      |   0
 .../com/cloud/network/dao/OvsProviderDao.java      |   0
 .../com/cloud/network/dao/OvsProviderDaoImpl.java  |   0
 .../com/cloud/network/dao/PhysicalNetworkDao.java  |   0
 .../cloud/network/dao/PhysicalNetworkDaoImpl.java  |   0
 .../dao/PhysicalNetworkIsolationMethodDaoImpl.java |   0
 .../dao/PhysicalNetworkIsolationMethodVO.java      |   0
 .../dao/PhysicalNetworkServiceProviderDao.java     |   0
 .../dao/PhysicalNetworkServiceProviderDaoImpl.java |   0
 .../dao/PhysicalNetworkServiceProviderVO.java      |   0
 .../network/dao/PhysicalNetworkTagDaoImpl.java     |   0
 .../cloud/network/dao/PhysicalNetworkTagVO.java    |   0
 .../network/dao/PhysicalNetworkTrafficTypeDao.java |   0
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java     |   0
 .../network/dao/PhysicalNetworkTrafficTypeVO.java  |   0
 .../com/cloud/network/dao/PhysicalNetworkVO.java   |   0
 .../com/cloud/network/dao/PortProfileDao.java      |   0
 .../com/cloud/network/dao/PortProfileDaoImpl.java  |   0
 .../java}/com/cloud/network/dao/PortProfileVO.java |   0
 .../com/cloud/network/dao/RemoteAccessVpnDao.java  |   0
 .../cloud/network/dao/RemoteAccessVpnDaoImpl.java  |   0
 .../com/cloud/network/dao/RemoteAccessVpnVO.java   |   0
 .../com/cloud/network/dao/RouterNetworkDao.java    |   0
 .../cloud/network/dao/RouterNetworkDaoImpl.java    |   0
 .../com/cloud/network/dao/RouterNetworkVO.java     |   0
 .../network/dao/Site2SiteCustomerGatewayDao.java   |   0
 .../dao/Site2SiteCustomerGatewayDaoImpl.java       |   0
 .../network/dao/Site2SiteCustomerGatewayVO.java    |   0
 .../network/dao/Site2SiteVpnConnectionDao.java     |   0
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |   0
 .../network/dao/Site2SiteVpnConnectionVO.java      |   0
 .../cloud/network/dao/Site2SiteVpnGatewayDao.java  |   0
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |   0
 .../cloud/network/dao/Site2SiteVpnGatewayVO.java   |   0
 .../java}/com/cloud/network/dao/SslCertDao.java    |   0
 .../com/cloud/network/dao/SslCertDaoImpl.java      |   0
 .../java}/com/cloud/network/dao/SslCertVO.java     |   0
 .../com/cloud/network/dao/UserIpv6AddressDao.java  |   0
 .../cloud/network/dao/UserIpv6AddressDaoImpl.java  |   0
 .../network/dao/VirtualRouterProviderDao.java      |   0
 .../network/dao/VirtualRouterProviderDaoImpl.java  |   0
 .../java}/com/cloud/network/dao/VpnUserDao.java    |   0
 .../com/cloud/network/dao/VpnUserDaoImpl.java      |   0
 .../com/cloud/network/element/OvsProviderVO.java   |   0
 .../network/element/VirtualRouterProviderVO.java   |   0
 .../com/cloud/network/rules/FirewallRuleVO.java    |   0
 .../cloud/network/rules/PortForwardingRuleVO.java  |   0
 .../network/rules/dao/PortForwardingRulesDao.java  |   0
 .../rules/dao/PortForwardingRulesDaoImpl.java      |   0
 .../network/security/SecurityGroupRuleVO.java      |   0
 .../network/security/SecurityGroupRulesVO.java     |   0
 .../network/security/SecurityGroupVMMapVO.java     |   0
 .../cloud/network/security/SecurityGroupVO.java    |   0
 .../cloud/network/security/SecurityGroupWork.java  |   0
 .../network/security/SecurityGroupWorkVO.java      |   0
 .../com/cloud/network/security/VmRulesetLogVO.java |   0
 .../network/security/dao/SecurityGroupDao.java     |   0
 .../network/security/dao/SecurityGroupDaoImpl.java |   0
 .../network/security/dao/SecurityGroupRuleDao.java |   0
 .../security/dao/SecurityGroupRuleDaoImpl.java     |   0
 .../security/dao/SecurityGroupRulesDao.java        |   0
 .../security/dao/SecurityGroupRulesDaoImpl.java    |   0
 .../security/dao/SecurityGroupVMMapDao.java        |   0
 .../security/dao/SecurityGroupVMMapDaoImpl.java    |   0
 .../network/security/dao/SecurityGroupWorkDao.java |   0
 .../security/dao/SecurityGroupWorkDaoImpl.java     |   0
 .../network/security/dao/VmRulesetLogDao.java      |   0
 .../network/security/dao/VmRulesetLogDaoImpl.java  |   0
 .../cloud/network/vpc/NetworkACLItemCidrsDao.java  |   0
 .../cloud/network/vpc/NetworkACLItemCidrsVO.java   |   0
 .../com/cloud/network/vpc/NetworkACLItemDao.java   |   0
 .../com/cloud/network/vpc/NetworkACLItemVO.java    |   0
 .../java}/com/cloud/network/vpc/NetworkACLVO.java  |   0
 .../java}/com/cloud/network/vpc/PrivateIpVO.java   |   0
 .../java}/com/cloud/network/vpc/StaticRouteVO.java |   0
 .../java}/com/cloud/network/vpc/VpcGatewayVO.java  |   0
 .../cloud/network/vpc/VpcOfferingServiceMapVO.java |   0
 .../java}/com/cloud/network/vpc/VpcOfferingVO.java |   0
 .../com/cloud/network/vpc/VpcServiceMapVO.java     |   0
 .../java}/com/cloud/network/vpc/VpcVO.java         |   0
 .../com/cloud/network/vpc/dao/NetworkACLDao.java   |   0
 .../cloud/network/vpc/dao/NetworkACLDaoImpl.java   |   0
 .../vpc/dao/NetworkACLItemCidrsDaoImpl.java        |   0
 .../network/vpc/dao/NetworkACLItemDaoImpl.java     |   0
 .../com/cloud/network/vpc/dao/PrivateIpDao.java    |   0
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java    |   0
 .../com/cloud/network/vpc/dao/StaticRouteDao.java  |   0
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |   0
 .../java}/com/cloud/network/vpc/dao/VpcDao.java    |   0
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java      |   0
 .../com/cloud/network/vpc/dao/VpcGatewayDao.java   |   0
 .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java   |   0
 .../com/cloud/network/vpc/dao/VpcOfferingDao.java  |   0
 .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java  |   0
 .../network/vpc/dao/VpcOfferingServiceMapDao.java  |   0
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java      |   0
 .../cloud/network/vpc/dao/VpcServiceMapDao.java    |   0
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |   0
 .../cloud/offerings/NetworkOfferingDetailsVO.java  |   0
 .../offerings/NetworkOfferingServiceMapVO.java     |   0
 .../com/cloud/offerings/NetworkOfferingVO.java     |   0
 .../cloud/offerings/dao/NetworkOfferingDao.java    |   0
 .../offerings/dao/NetworkOfferingDaoImpl.java      |   0
 .../offerings/dao/NetworkOfferingDetailsDao.java   |   0
 .../dao/NetworkOfferingDetailsDaoImpl.java         |   0
 .../dao/NetworkOfferingServiceMapDao.java          |   0
 .../dao/NetworkOfferingServiceMapDaoImpl.java      |   0
 .../java}/com/cloud/projects/ProjectAccountVO.java |   0
 .../com/cloud/projects/ProjectInvitationVO.java    |   0
 .../java}/com/cloud/projects/ProjectVO.java        |   0
 .../com/cloud/projects/dao/ProjectAccountDao.java  |   0
 .../cloud/projects/dao/ProjectAccountDaoImpl.java  |   0
 .../java}/com/cloud/projects/dao/ProjectDao.java   |   0
 .../com/cloud/projects/dao/ProjectDaoImpl.java     |   0
 .../cloud/projects/dao/ProjectInvitationDao.java   |   0
 .../projects/dao/ProjectInvitationDaoImpl.java     |   0
 .../com/cloud/secstorage/CommandExecLogDao.java    |   0
 .../cloud/secstorage/CommandExecLogDaoImpl.java    |   0
 .../com/cloud/secstorage/CommandExecLogVO.java     |   0
 .../cloud/service/ServiceOfferingDetailsVO.java    |   0
 .../java}/com/cloud/service/ServiceOfferingVO.java |   0
 .../com/cloud/service/dao/ServiceOfferingDao.java  |   0
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |   0
 .../service/dao/ServiceOfferingDetailsDao.java     |   0
 .../service/dao/ServiceOfferingDetailsDaoImpl.java |   0
 .../java}/com/cloud/storage/DiskOfferingVO.java    |   0
 .../java}/com/cloud/storage/GuestOSCategoryVO.java |   0
 .../com/cloud/storage/GuestOSHypervisorVO.java     |   0
 .../java}/com/cloud/storage/GuestOSVO.java         |   0
 .../com/cloud/storage/LaunchPermissionVO.java      |   0
 .../java}/com/cloud/storage/SnapshotPolicyVO.java  |   0
 .../com/cloud/storage/SnapshotScheduleVO.java      |   0
 .../java}/com/cloud/storage/SnapshotVO.java        |   0
 .../com/cloud/storage/StoragePoolHostAssoc.java    |   0
 .../java}/com/cloud/storage/StoragePoolHostVO.java |   0
 .../java}/com/cloud/storage/StoragePoolTagVO.java  |   0
 .../java}/com/cloud/storage/StoragePoolWorkVO.java |   0
 .../java}/com/cloud/storage/UploadVO.java          |   0
 .../com/cloud/storage/VMTemplateDetailVO.java      |   0
 .../java}/com/cloud/storage/VMTemplateHostVO.java  |   0
 .../com/cloud/storage/VMTemplateStoragePoolVO.java |   0
 .../java}/com/cloud/storage/VMTemplateVO.java      |   0
 .../java}/com/cloud/storage/VMTemplateZoneVO.java  |   0
 .../java}/com/cloud/storage/VolumeDetailVO.java    |   0
 .../java}/com/cloud/storage/VolumeHostVO.java      |   0
 .../java}/com/cloud/storage/VolumeVO.java          |   0
 .../com/cloud/storage/dao/DiskOfferingDao.java     |   0
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |   0
 .../com/cloud/storage/dao/GuestOSCategoryDao.java  |   0
 .../cloud/storage/dao/GuestOSCategoryDaoImpl.java  |   0
 .../java}/com/cloud/storage/dao/GuestOSDao.java    |   0
 .../com/cloud/storage/dao/GuestOSDaoImpl.java      |   0
 .../cloud/storage/dao/GuestOSHypervisorDao.java    |   0
 .../storage/dao/GuestOSHypervisorDaoImpl.java      |   0
 .../com/cloud/storage/dao/LaunchPermissionDao.java |   0
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |   0
 .../java}/com/cloud/storage/dao/SnapshotDao.java   |   0
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |   0
 .../com/cloud/storage/dao/SnapshotDetailsDao.java  |   0
 .../cloud/storage/dao/SnapshotDetailsDaoImpl.java  |   0
 .../com/cloud/storage/dao/SnapshotDetailsVO.java   |   0
 .../com/cloud/storage/dao/SnapshotPolicyDao.java   |   0
 .../cloud/storage/dao/SnapshotPolicyDaoImpl.java   |   0
 .../com/cloud/storage/dao/SnapshotScheduleDao.java |   0
 .../cloud/storage/dao/SnapshotScheduleDaoImpl.java |   0
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |   0
 .../com/cloud/storage/dao/StoragePoolHostDao.java  |   0
 .../cloud/storage/dao/StoragePoolHostDaoImpl.java  |   0
 .../com/cloud/storage/dao/StoragePoolTagsDao.java  |   0
 .../cloud/storage/dao/StoragePoolTagsDaoImpl.java  |   0
 .../com/cloud/storage/dao/StoragePoolWorkDao.java  |   0
 .../cloud/storage/dao/StoragePoolWorkDaoImpl.java  |   0
 .../java}/com/cloud/storage/dao/UploadDao.java     |   0
 .../java}/com/cloud/storage/dao/UploadDaoImpl.java |   0
 .../java}/com/cloud/storage/dao/VMTemplateDao.java |   0
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   0
 .../cloud/storage/dao/VMTemplateDetailsDao.java    |   0
 .../storage/dao/VMTemplateDetailsDaoImpl.java      |   0
 .../com/cloud/storage/dao/VMTemplateHostDao.java   |   0
 .../cloud/storage/dao/VMTemplateHostDaoImpl.java   |   0
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |   0
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |   0
 .../com/cloud/storage/dao/VMTemplateZoneDao.java   |   0
 .../cloud/storage/dao/VMTemplateZoneDaoImpl.java   |   0
 .../java}/com/cloud/storage/dao/VolumeDao.java     |   0
 .../java}/com/cloud/storage/dao/VolumeDaoImpl.java |   0
 .../com/cloud/storage/dao/VolumeDetailsDao.java    |   0
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java    |   0
 .../java}/com/cloud/storage/dao/VolumeHostDao.java |   0
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |   0
 .../java}/com/cloud/tags/ResourceTagVO.java        |   0
 .../java}/com/cloud/tags/dao/ResourceTagDao.java   |   0
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |   0
 .../java}/com/cloud/upgrade/DatabaseCreator.java   |   0
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |   0
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   0
 .../cloud/upgrade/dao/DatabaseAccessObject.java    |   0
 .../java}/com/cloud/upgrade/dao/DbUpgrade.java     |   0
 .../com/cloud/upgrade/dao/DbUpgradeUtils.java      |   0
 .../com/cloud/upgrade/dao/LegacyDbUpgrade.java     |   0
 .../com/cloud/upgrade/dao/Upgrade217to218.java     |   0
 .../com/cloud/upgrade/dao/Upgrade218to22.java      |   0
 .../upgrade/dao/Upgrade218to224DomainVlans.java    |   0
 .../cloud/upgrade/dao/Upgrade218to22Premium.java   |   0
 .../com/cloud/upgrade/dao/Upgrade2210to2211.java   |   0
 .../com/cloud/upgrade/dao/Upgrade2211to2212.java   |   0
 .../upgrade/dao/Upgrade2211to2212Premium.java      |   0
 .../com/cloud/upgrade/dao/Upgrade2212to2213.java   |   0
 .../com/cloud/upgrade/dao/Upgrade2213to2214.java   |   0
 .../com/cloud/upgrade/dao/Upgrade2214to30.java     |   0
 .../com/cloud/upgrade/dao/Upgrade221to222.java     |   0
 .../cloud/upgrade/dao/Upgrade221to222Premium.java  |   0
 .../com/cloud/upgrade/dao/Upgrade222to224.java     |   0
 .../cloud/upgrade/dao/Upgrade222to224Premium.java  |   0
 .../com/cloud/upgrade/dao/Upgrade224to225.java     |   0
 .../com/cloud/upgrade/dao/Upgrade225to226.java     |   0
 .../com/cloud/upgrade/dao/Upgrade227to228.java     |   0
 .../cloud/upgrade/dao/Upgrade227to228Premium.java  |   0
 .../com/cloud/upgrade/dao/Upgrade228to229.java     |   0
 .../com/cloud/upgrade/dao/Upgrade229to2210.java    |   0
 .../com/cloud/upgrade/dao/Upgrade301to302.java     |   0
 .../com/cloud/upgrade/dao/Upgrade302to303.java     |   0
 .../com/cloud/upgrade/dao/Upgrade302to40.java      |   0
 .../com/cloud/upgrade/dao/Upgrade303to304.java     |   0
 .../com/cloud/upgrade/dao/Upgrade304to305.java     |   0
 .../com/cloud/upgrade/dao/Upgrade305to306.java     |   0
 .../com/cloud/upgrade/dao/Upgrade306to307.java     |   0
 .../com/cloud/upgrade/dao/Upgrade307to410.java     |   0
 .../com/cloud/upgrade/dao/Upgrade30to301.java      |   0
 .../com/cloud/upgrade/dao/Upgrade30xBase.java      |   0
 .../java}/com/cloud/upgrade/dao/Upgrade40to41.java |   0
 .../com/cloud/upgrade/dao/Upgrade41000to41100.java |   0
 .../com/cloud/upgrade/dao/Upgrade410to420.java     |   0
 .../com/cloud/upgrade/dao/Upgrade420to421.java     |   0
 .../com/cloud/upgrade/dao/Upgrade421to430.java     |   0
 .../com/cloud/upgrade/dao/Upgrade430to440.java     |   0
 .../com/cloud/upgrade/dao/Upgrade431to440.java     |   0
 .../com/cloud/upgrade/dao/Upgrade432to440.java     |   0
 .../com/cloud/upgrade/dao/Upgrade440to441.java     |   0
 .../com/cloud/upgrade/dao/Upgrade441to442.java     |   0
 .../com/cloud/upgrade/dao/Upgrade442to450.java     |   0
 .../com/cloud/upgrade/dao/Upgrade443to444.java     |   0
 .../com/cloud/upgrade/dao/Upgrade443to450.java     |   0
 .../com/cloud/upgrade/dao/Upgrade444to450.java     |   0
 .../com/cloud/upgrade/dao/Upgrade450to451.java     |   0
 .../com/cloud/upgrade/dao/Upgrade451to452.java     |   0
 .../com/cloud/upgrade/dao/Upgrade452to453.java     |   0
 .../com/cloud/upgrade/dao/Upgrade452to460.java     |   0
 .../com/cloud/upgrade/dao/Upgrade453to460.java     |   0
 .../com/cloud/upgrade/dao/Upgrade460to461.java     |   0
 .../com/cloud/upgrade/dao/Upgrade461to470.java     |   0
 .../com/cloud/upgrade/dao/Upgrade470to471.java     |   0
 .../com/cloud/upgrade/dao/Upgrade471to480.java     |   0
 .../com/cloud/upgrade/dao/Upgrade480to481.java     |   0
 .../com/cloud/upgrade/dao/Upgrade481to490.java     |   0
 .../com/cloud/upgrade/dao/Upgrade490to4910.java    |   0
 .../com/cloud/upgrade/dao/Upgrade4910to4920.java   |   0
 .../com/cloud/upgrade/dao/Upgrade4920to4930.java   |   0
 .../com/cloud/upgrade/dao/Upgrade4930to41000.java  |   0
 .../cloud/upgrade/dao/UpgradeSnapshot217to224.java |   0
 .../cloud/upgrade/dao/UpgradeSnapshot223to224.java |   0
 .../java}/com/cloud/upgrade/dao/VersionDao.java    |   0
 .../com/cloud/upgrade/dao/VersionDaoImpl.java      |   0
 .../java}/com/cloud/upgrade/dao/VersionVO.java     |   0
 .../cloud/usage/ExternalPublicIpStatisticsVO.java  |   0
 .../java}/com/cloud/usage/UsageIPAddressVO.java    |   0
 .../java}/com/cloud/usage/UsageJobVO.java          |   0
 .../com/cloud/usage/UsageLoadBalancerPolicyVO.java |   0
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |   0
 .../java}/com/cloud/usage/UsageNetworkVO.java      |   0
 .../com/cloud/usage/UsagePortForwardingRuleVO.java |   0
 .../com/cloud/usage/UsageSecurityGroupVO.java      |   0
 .../java}/com/cloud/usage/UsageStorageVO.java      |   0
 .../java}/com/cloud/usage/UsageVMInstanceVO.java   |   0
 .../java}/com/cloud/usage/UsageVMSnapshotVO.java   |   0
 .../{ => main/java}/com/cloud/usage/UsageVO.java   |   0
 .../java}/com/cloud/usage/UsageVPNUserVO.java      |   0
 .../java}/com/cloud/usage/UsageVmDiskVO.java       |   0
 .../java}/com/cloud/usage/UsageVolumeVO.java       |   0
 .../usage/dao/ExternalPublicIpStatisticsDao.java   |   0
 .../dao/ExternalPublicIpStatisticsDaoImpl.java     |   0
 .../java}/com/cloud/usage/dao/UsageDao.java        |   0
 .../java}/com/cloud/usage/dao/UsageDaoImpl.java    |   0
 .../com/cloud/usage/dao/UsageIPAddressDao.java     |   0
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |   0
 .../java}/com/cloud/usage/dao/UsageJobDao.java     |   0
 .../java}/com/cloud/usage/dao/UsageJobDaoImpl.java |   0
 .../usage/dao/UsageLoadBalancerPolicyDao.java      |   0
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |   0
 .../java}/com/cloud/usage/dao/UsageNetworkDao.java |   0
 .../com/cloud/usage/dao/UsageNetworkDaoImpl.java   |   0
 .../cloud/usage/dao/UsageNetworkOfferingDao.java   |   0
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |   0
 .../usage/dao/UsagePortForwardingRuleDao.java      |   0
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |   0
 .../com/cloud/usage/dao/UsageSecurityGroupDao.java |   0
 .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java |   0
 .../java}/com/cloud/usage/dao/UsageStorageDao.java |   0
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |   0
 .../com/cloud/usage/dao/UsageVMInstanceDao.java    |   0
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |   0
 .../com/cloud/usage/dao/UsageVMSnapshotDao.java    |   0
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java    |   0
 .../java}/com/cloud/usage/dao/UsageVPNUserDao.java |   0
 .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java   |   0
 .../java}/com/cloud/usage/dao/UsageVmDiskDao.java  |   0
 .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java    |   0
 .../java}/com/cloud/usage/dao/UsageVolumeDao.java  |   0
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java    |   0
 .../java}/com/cloud/user/AccountDetailVO.java      |   0
 .../java}/com/cloud/user/AccountDetailsDao.java    |   0
 .../com/cloud/user/AccountDetailsDaoImpl.java      |   0
 .../{ => main/java}/com/cloud/user/AccountVO.java  |   0
 .../java}/com/cloud/user/SSHKeyPairVO.java         |   0
 .../java}/com/cloud/user/UserAccountVO.java        |   0
 .../java}/com/cloud/user/UserStatisticsVO.java     |   0
 .../java}/com/cloud/user/UserStatsLogVO.java       |   0
 .../src/{ => main/java}/com/cloud/user/UserVO.java |   0
 .../java}/com/cloud/user/VmDiskStatisticsVO.java   |   0
 .../java}/com/cloud/user/dao/AccountDao.java       |   0
 .../java}/com/cloud/user/dao/AccountDaoImpl.java   |   0
 .../java}/com/cloud/user/dao/SSHKeyPairDao.java    |   0
 .../com/cloud/user/dao/SSHKeyPairDaoImpl.java      |   0
 .../java}/com/cloud/user/dao/UserAccountDao.java   |   0
 .../com/cloud/user/dao/UserAccountDaoImpl.java     |   0
 .../java}/com/cloud/user/dao/UserDao.java          |   0
 .../java}/com/cloud/user/dao/UserDaoImpl.java      |   0
 .../com/cloud/user/dao/UserStatisticsDao.java      |   0
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |   0
 .../java}/com/cloud/user/dao/UserStatsLogDao.java  |   0
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java    |   0
 .../com/cloud/user/dao/VmDiskStatisticsDao.java    |   0
 .../cloud/user/dao/VmDiskStatisticsDaoImpl.java    |   0
 .../java}/com/cloud/vm/ConsoleProxyVO.java         |   0
 .../java}/com/cloud/vm/DomainRouterVO.java         |   0
 .../java}/com/cloud/vm/InstanceGroupVMMapVO.java   |   0
 .../java}/com/cloud/vm/InstanceGroupVO.java        |   0
 .../{ => main/java}/com/cloud/vm/ItWorkDao.java    |   0
 .../java}/com/cloud/vm/ItWorkDaoImpl.java          |   0
 .../src/{ => main/java}/com/cloud/vm/ItWorkVO.java |   0
 .../{ => main/java}/com/cloud/vm/NicDetailVO.java  |   0
 .../java}/com/cloud/vm/NicExtraDhcpOptionVO.java   |   0
 .../src/{ => main/java}/com/cloud/vm/NicVO.java    |   0
 .../java}/com/cloud/vm/SecondaryStorageVmVO.java   |   0
 .../java}/com/cloud/vm/UserVmCloneSettingVO.java   |   0
 .../java}/com/cloud/vm/UserVmDetailVO.java         |   0
 .../src/{ => main/java}/com/cloud/vm/UserVmVO.java |   0
 .../{ => main/java}/com/cloud/vm/VMInstanceVO.java |   0
 .../java}/com/cloud/vm/dao/ConsoleProxyDao.java    |   0
 .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java      |   0
 .../java}/com/cloud/vm/dao/DomainRouterDao.java    |   0
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java      |   0
 .../java}/com/cloud/vm/dao/InstanceGroupDao.java   |   0
 .../com/cloud/vm/dao/InstanceGroupDaoImpl.java     |   0
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java    |   0
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java    |   0
 .../{ => main/java}/com/cloud/vm/dao/NicDao.java   |   0
 .../java}/com/cloud/vm/dao/NicDaoImpl.java         |   0
 .../java}/com/cloud/vm/dao/NicDetailsDao.java      |   0
 .../java}/com/cloud/vm/dao/NicDetailsDaoImpl.java  |   0
 .../com/cloud/vm/dao/NicExtraDhcpOptionDao.java    |   0
 .../cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java    |   0
 .../java}/com/cloud/vm/dao/NicIpAliasDao.java      |   0
 .../java}/com/cloud/vm/dao/NicIpAliasDaoImpl.java  |   0
 .../java}/com/cloud/vm/dao/NicIpAliasVO.java       |   0
 .../java}/com/cloud/vm/dao/NicSecondaryIpDao.java  |   0
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |   0
 .../java}/com/cloud/vm/dao/NicSecondaryIpVO.java   |   0
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java    |   0
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java    |   0
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |   0
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |   0
 .../java}/com/cloud/vm/dao/UserVmDao.java          |   0
 .../java}/com/cloud/vm/dao/UserVmDaoImpl.java      |   0
 .../java}/com/cloud/vm/dao/UserVmData.java         |   0
 .../java}/com/cloud/vm/dao/UserVmDetailsDao.java   |   0
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java     |   0
 .../java}/com/cloud/vm/dao/VMInstanceDao.java      |   0
 .../java}/com/cloud/vm/dao/VMInstanceDaoImpl.java  |   0
 .../com/cloud/vm/snapshot/VMSnapshotDetailsVO.java |   0
 .../java}/com/cloud/vm/snapshot/VMSnapshotVO.java  |   0
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |   0
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |   0
 .../vm/snapshot/dao/VMSnapshotDetailsDao.java      |   0
 .../vm/snapshot/dao/VMSnapshotDetailsDaoImpl.java  |   0
 .../apache/cloudstack/acl/RolePermissionVO.java    |   0
 .../java}/org/apache/cloudstack/acl/RoleVO.java    |   0
 .../org/apache/cloudstack/acl/dao/RoleDao.java     |   0
 .../org/apache/cloudstack/acl/dao/RoleDaoImpl.java |   0
 .../cloudstack/acl/dao/RolePermissionsDao.java     |   0
 .../cloudstack/acl/dao/RolePermissionsDaoImpl.java |   0
 .../affinity/AffinityGroupDomainMapVO.java         |   0
 .../cloudstack/affinity/AffinityGroupVMMapVO.java  |   0
 .../cloudstack/affinity/AffinityGroupVO.java       |   0
 .../cloudstack/affinity/dao/AffinityGroupDao.java  |   0
 .../affinity/dao/AffinityGroupDaoImpl.java         |   0
 .../affinity/dao/AffinityGroupDomainMapDao.java    |   0
 .../dao/AffinityGroupDomainMapDaoImpl.java         |   0
 .../affinity/dao/AffinityGroupVMMapDao.java        |   0
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java    |   0
 .../apache/cloudstack/annotation/AnnotationVO.java |   0
 .../cloudstack/annotation/dao/AnnotationDao.java   |   0
 .../annotation/dao/AnnotationDaoImpl.java          |   0
 .../engine/cloud/entity/api/db/VMComputeTagVO.java |   0
 .../engine/cloud/entity/api/db/VMEntityVO.java     |   0
 .../engine/cloud/entity/api/db/VMNetworkMapVO.java |   0
 .../cloud/entity/api/db/VMReservationVO.java       |   0
 .../cloud/entity/api/db/VMRootDiskTagVO.java       |   0
 .../cloud/entity/api/db/VolumeReservationVO.java   |   0
 .../cloud/entity/api/db/dao/VMComputeTagDao.java   |   0
 .../entity/api/db/dao/VMComputeTagDaoImpl.java     |   0
 .../cloud/entity/api/db/dao/VMEntityDao.java       |   0
 .../cloud/entity/api/db/dao/VMEntityDaoImpl.java   |   0
 .../cloud/entity/api/db/dao/VMNetworkMapDao.java   |   0
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java     |   0
 .../cloud/entity/api/db/dao/VMReservationDao.java  |   0
 .../entity/api/db/dao/VMReservationDaoImpl.java    |   0
 .../cloud/entity/api/db/dao/VMRootDiskTagDao.java  |   0
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java    |   0
 .../entity/api/db/dao/VolumeReservationDao.java    |   0
 .../api/db/dao/VolumeReservationDaoImpl.java       |   0
 .../java}/org/apache/cloudstack/ha/HAConfigVO.java |   0
 .../org/apache/cloudstack/ha/dao/HAConfigDao.java  |   0
 .../apache/cloudstack/ha/dao/HAConfigDaoImpl.java  |   0
 .../lb/ApplicationLoadBalancerRuleVO.java          |   0
 .../lb/dao/ApplicationLoadBalancerRuleDao.java     |   0
 .../lb/dao/ApplicationLoadBalancerRuleDaoImpl.java |   0
 .../outofbandmanagement/OutOfBandManagementVO.java |   0
 .../dao/OutOfBandManagementDao.java                |   0
 .../dao/OutOfBandManagementDaoImpl.java            |   0
 .../apache/cloudstack/region/PortableIpDao.java    |   0
 .../cloudstack/region/PortableIpDaoImpl.java       |   0
 .../cloudstack/region/PortableIpRangeDao.java      |   0
 .../cloudstack/region/PortableIpRangeDaoImpl.java  |   0
 .../cloudstack/region/PortableIpRangeVO.java       |   0
 .../org/apache/cloudstack/region/PortableIpVO.java |   0
 .../org/apache/cloudstack/region/RegionSyncVO.java |   0
 .../org/apache/cloudstack/region/RegionVO.java     |   0
 .../apache/cloudstack/region/dao/RegionDao.java    |   0
 .../cloudstack/region/dao/RegionDaoImpl.java       |   0
 .../region/gslb/GlobalLoadBalancerDaoImpl.java     |   0
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java       |   0
 .../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java   |   0
 .../region/gslb/GlobalLoadBalancerLbRuleMapVO.java |   0
 .../region/gslb/GlobalLoadBalancerRuleDao.java     |   0
 .../region/gslb/GlobalLoadBalancerRuleVO.java      |   0
 .../resourcedetail/AutoScaleVmGroupDetailVO.java   |   0
 .../resourcedetail/AutoScaleVmProfileDetailVO.java |   0
 .../resourcedetail/DiskOfferingDetailVO.java       |   0
 .../resourcedetail/FirewallRuleDetailVO.java       |   0
 .../cloudstack/resourcedetail/GuestOsDetailVO.java |   0
 .../LBHealthCheckPolicyDetailVO.java               |   0
 .../resourcedetail/LBStickinessPolicyDetailVO.java |   0
 .../resourcedetail/NetworkACLItemDetailVO.java     |   0
 .../resourcedetail/NetworkACLListDetailVO.java     |   0
 .../resourcedetail/RemoteAccessVpnDetailVO.java    |   0
 .../resourcedetail/ResourceDetailsDao.java         |   0
 .../resourcedetail/ResourceDetailsDaoBase.java     |   0
 .../Site2SiteCustomerGatewayDetailVO.java          |   0
 .../Site2SiteVpnConnectionDetailVO.java            |   0
 .../Site2SiteVpnGatewayDetailVO.java               |   0
 .../resourcedetail/SnapshotPolicyDetailVO.java     |   0
 .../cloudstack/resourcedetail/UserDetailVO.java    |   0
 .../resourcedetail/UserIpAddressDetailVO.java      |   0
 .../cloudstack/resourcedetail/VpcDetailVO.java     |   0
 .../resourcedetail/VpcGatewayDetailVO.java         |   0
 .../dao/AutoScaleVmGroupDetailsDao.java            |   0
 .../dao/AutoScaleVmGroupDetailsDaoImpl.java        |   0
 .../dao/AutoScaleVmProfileDetailsDao.java          |   0
 .../dao/AutoScaleVmProfileDetailsDaoImpl.java      |   0
 .../resourcedetail/dao/DiskOfferingDetailsDao.java |   0
 .../dao/DiskOfferingDetailsDaoImpl.java            |   0
 .../resourcedetail/dao/FirewallRuleDetailsDao.java |   0
 .../dao/FirewallRuleDetailsDaoImpl.java            |   0
 .../resourcedetail/dao/GuestOsDetailsDao.java      |   0
 .../resourcedetail/dao/GuestOsDetailsDaoImpl.java  |   0
 .../dao/LBHealthCheckPolicyDetailsDao.java         |   0
 .../dao/LBHealthCheckPolicyDetailsDaoImpl.java     |   0
 .../dao/LBStickinessPolicyDetailsDao.java          |   0
 .../dao/LBStickinessPolicyDetailsDaoImpl.java      |   0
 .../dao/NetworkACLItemDetailsDao.java              |   0
 .../dao/NetworkACLItemDetailsDaoImpl.java          |   0
 .../dao/NetworkACLListDetailsDao.java              |   0
 .../dao/NetworkACLListDetailsDaoImpl.java          |   0
 .../dao/RemoteAccessVpnDetailsDao.java             |   0
 .../dao/RemoteAccessVpnDetailsDaoImpl.java         |   0
 .../dao/Site2SiteCustomerGatewayDetailsDao.java    |   0
 .../Site2SiteCustomerGatewayDetailsDaoImpl.java    |   0
 .../dao/Site2SiteVpnConnectionDetailsDao.java      |   0
 .../dao/Site2SiteVpnConnectionDetailsDaoImpl.java  |   0
 .../dao/Site2SiteVpnGatewayDetailsDao.java         |   0
 .../dao/Site2SiteVpnGatewayDetailsDaoImpl.java     |   0
 .../dao/SnapshotPolicyDetailsDao.java              |   0
 .../dao/SnapshotPolicyDetailsDaoImpl.java          |   0
 .../resourcedetail/dao/UserDetailsDao.java         |   0
 .../resourcedetail/dao/UserDetailsDaoImpl.java     |   0
 .../dao/UserIpAddressDetailsDao.java               |   0
 .../dao/UserIpAddressDetailsDaoImpl.java           |   0
 .../resourcedetail/dao/VpcDetailsDao.java          |   0
 .../resourcedetail/dao/VpcDetailsDaoImpl.java      |   0
 .../resourcedetail/dao/VpcGatewayDetailsDao.java   |   0
 .../dao/VpcGatewayDetailsDaoImpl.java              |   0
 .../storage/datastore/db/ImageStoreDao.java        |   0
 .../storage/datastore/db/ImageStoreDaoImpl.java    |   0
 .../storage/datastore/db/ImageStoreDetailVO.java   |   0
 .../storage/datastore/db/ImageStoreDetailsDao.java |   0
 .../datastore/db/ImageStoreDetailsDaoImpl.java     |   0
 .../storage/datastore/db/ImageStoreVO.java         |   0
 .../storage/datastore/db/PrimaryDataStoreDao.java  |   0
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |   0
 .../datastore/db/PrimaryDataStoreDetailVO.java     |   0
 .../datastore/db/PrimaryDataStoreDetailsDao.java   |   0
 .../storage/datastore/db/SnapshotDataStoreDao.java |   0
 .../storage/datastore/db/SnapshotDataStoreVO.java  |   0
 .../storage/datastore/db/StoragePoolDetailVO.java  |   0
 .../datastore/db/StoragePoolDetailsDao.java        |   0
 .../storage/datastore/db/StoragePoolVO.java        |   0
 .../storage/datastore/db/TemplateDataStoreDao.java |   0
 .../storage/datastore/db/TemplateDataStoreVO.java  |   0
 .../storage/datastore/db/VolumeDataStoreDao.java   |   0
 .../storage/datastore/db/VolumeDataStoreVO.java    |   0
 .../spring-engine-schema-core-daos-context.xml     |   0
 ...pring-engine-schema-system-checkers-context.xml |   0
 .../db/create-default-role-api-mappings.sql        |   0
 .../main}/resources/META-INF/db/data-217to218.sql  |   0
 .../main}/resources/META-INF/db/schema-20to21.sql  |   0
 .../resources/META-INF/db/schema-217to218.sql      |   0
 .../META-INF/db/schema-21to22-cleanup.sql          |   0
 .../META-INF/db/schema-21to22-premium.sql          |   0
 .../main}/resources/META-INF/db/schema-21to22.sql  |   0
 .../resources/META-INF/db/schema-2210to2211.sql    |   0
 .../META-INF/db/schema-2211to2212-premium.sql      |   0
 .../resources/META-INF/db/schema-2211to2212.sql    |   0
 .../resources/META-INF/db/schema-2212to2213.sql    |   0
 .../resources/META-INF/db/schema-2213to2214.sql    |   0
 .../META-INF/db/schema-2214to30-cleanup.sql        |   0
 .../resources/META-INF/db/schema-2214to30.sql      |   0
 .../META-INF/db/schema-221to222-cleanup.sql        |   0
 .../META-INF/db/schema-221to222-premium.sql        |   0
 .../resources/META-INF/db/schema-221to222.sql      |   0
 .../META-INF/db/schema-222to224-cleanup.sql        |   0
 .../META-INF/db/schema-222to224-premium.sql        |   0
 .../resources/META-INF/db/schema-222to224.sql      |   0
 .../META-INF/db/schema-224to225-cleanup.sql        |   0
 .../resources/META-INF/db/schema-224to225.sql      |   0
 .../resources/META-INF/db/schema-225to226.sql      |   0
 .../META-INF/db/schema-227to228-premium.sql        |   0
 .../resources/META-INF/db/schema-227to228.sql      |   0
 .../resources/META-INF/db/schema-228to229.sql      |   0
 .../resources/META-INF/db/schema-229to2210.sql     |   0
 .../META-INF/db/schema-22beta1to22beta2.sql        |   0
 .../META-INF/db/schema-22beta3to22beta4.sql        |   0
 .../META-INF/db/schema-301to302-cleanup.sql        |   0
 .../resources/META-INF/db/schema-301to302.sql      |   0
 .../resources/META-INF/db/schema-302to303.sql      |   0
 .../META-INF/db/schema-302to40-cleanup.sql         |   0
 .../main}/resources/META-INF/db/schema-302to40.sql |   0
 .../META-INF/db/schema-304to305-cleanup.sql        |   0
 .../resources/META-INF/db/schema-304to305.sql      |   0
 .../META-INF/db/schema-305to306-cleanup.sql        |   0
 .../resources/META-INF/db/schema-305to306.sql      |   0
 .../resources/META-INF/db/schema-306to307.sql      |   0
 .../META-INF/db/schema-307to410-cleanup.sql        |   0
 .../resources/META-INF/db/schema-307to410.sql      |   0
 .../main}/resources/META-INF/db/schema-30to301.sql |   0
 .../META-INF/db/schema-40to410-cleanup.sql         |   0
 .../main}/resources/META-INF/db/schema-40to410.sql |   0
 .../META-INF/db/schema-41000to41100-cleanup.sql    |   0
 .../resources/META-INF/db/schema-41000to41100.sql  |   0
 .../META-INF/db/schema-410to420-cleanup.sql        |   0
 .../resources/META-INF/db/schema-410to420.sql      |   0
 .../resources/META-INF/db/schema-420to421.sql      |   0
 .../META-INF/db/schema-421to430-cleanup.sql        |   0
 .../resources/META-INF/db/schema-421to430.sql      |   0
 .../META-INF/db/schema-430to440-cleanup.sql        |   0
 .../resources/META-INF/db/schema-430to440.sql      |   0
 .../META-INF/db/schema-440to441-cleanup.sql        |   0
 .../resources/META-INF/db/schema-440to441.sql      |   0
 .../resources/META-INF/db/schema-441to442.sql      |   0
 .../META-INF/db/schema-442to450-cleanup.sql        |   0
 .../resources/META-INF/db/schema-442to450.sql      |   0
 .../resources/META-INF/db/schema-443to444.sql      |   0
 .../META-INF/db/schema-450to451-cleanup.sql        |   0
 .../resources/META-INF/db/schema-450to451.sql      |   0
 .../META-INF/db/schema-451to452-cleanup.sql        |   0
 .../resources/META-INF/db/schema-451to452.sql      |   0
 .../META-INF/db/schema-452to453-cleanup.sql        |   0
 .../resources/META-INF/db/schema-452to453.sql      |   0
 .../META-INF/db/schema-452to460-cleanup.sql        |   0
 .../resources/META-INF/db/schema-452to460.sql      |   0
 .../META-INF/db/schema-460to461-cleanup.sql        |   0
 .../resources/META-INF/db/schema-460to461.sql      |   0
 .../META-INF/db/schema-461to470-cleanup.sql        |   0
 .../resources/META-INF/db/schema-461to470.sql      |   0
 .../META-INF/db/schema-470to471-cleanup.sql        |   0
 .../resources/META-INF/db/schema-470to471.sql      |   0
 .../META-INF/db/schema-471to480-cleanup.sql        |   0
 .../resources/META-INF/db/schema-471to480.sql      |   0
 .../META-INF/db/schema-480to481-cleanup.sql        |   0
 .../resources/META-INF/db/schema-480to481.sql      |   0
 .../META-INF/db/schema-481to490-cleanup.sql        |   0
 .../resources/META-INF/db/schema-481to490.sql      |   0
 .../META-INF/db/schema-490to4910-cleanup.sql       |   0
 .../resources/META-INF/db/schema-490to4910.sql     |   0
 .../META-INF/db/schema-4910to4920-cleanup.sql      |   0
 .../resources/META-INF/db/schema-4910to4920.sql    |   0
 .../META-INF/db/schema-4920to4930-cleanup.sql      |   0
 .../resources/META-INF/db/schema-4920to4930.sql    |   0
 .../META-INF/db/schema-4930to41000-cleanup.sql     |   0
 .../resources/META-INF/db/schema-4930to41000.sql   |   0
 .../main}/resources/META-INF/db/schema-level.sql   |   0
 .../META-INF/db/schema-snapshot-217to224.sql       |   0
 .../META-INF/db/schema-snapshot-223to224.sql       |   0
 .../storage/dao/StoragePoolTagsDaoImplTest.java    |   0
 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  |   0
 .../upgrade/dao/DatabaseAccessObjectTest.java      |   0
 .../com/cloud/upgrade/dao/DbUpgradeUtilsTest.java  |   0
 .../cloud/usage/dao/UsageStorageDaoImplTest.java   |   0
 .../com/cloud/vm/dao/VMInstanceDaoImplTest.java    |   0
 .../datastore/db/PrimaryDataStoreDaoImplTest.java  |   0
 .../schema/{ => src}/test/resources/db.properties  |   0
 .../cache/allocator/StorageCacheAllocator.java     |   0
 .../allocator/StorageCacheRandomAllocator.java     |   0
 .../cache/manager/StorageCacheManagerImpl.java     |   0
 .../manager/StorageCacheReplacementAlgorithm.java  |   0
 .../StorageCacheReplacementAlgorithmLRU.java       |   0
 .../spring-engine-storage-cache-core-context.xml   |   0
 .../storage/motion/AncientDataMotionStrategy.java  |   0
 .../storage/motion/DataMotionServiceImpl.java      |   0
 .../motion/StorageSystemDataMotionStrategy.java    |   0
 ...ring-engine-storage-datamotion-core-context.xml |   0
 ...g-engine-storage-datamotion-storage-context.xml |   0
 .../motion/AncientDataMotionStrategyTest.java      |   0
 .../storage/image/TemplateDataFactoryImpl.java     |   0
 .../storage/image/TemplateServiceImpl.java         |   0
 .../manager/ImageStoreProviderManagerImpl.java     |   0
 .../storage/image/store/ImageStoreImpl.java        |   0
 .../storage/image/store/TemplateObject.java        |   0
 .../image/store/lifecycle/ImageStoreLifeCycle.java |   0
 .../spring-engine-storage-image-core-context.xml   |   0
 .../cloud/vm/snapshot/dao/VmSnapshotDaoTest.java   |   0
 .../MockLocalNfsSecondaryStorageResource.java      |   0
 .../storage/allocator/StorageAllocatorTest.java    |   0
 .../StorageAllocatorTestConfiguration.java         |   0
 .../StorageCacheReplacementAlgorithmLRUTest.java   |   0
 .../apache/cloudstack/storage/test/AllTests.java   |   0
 .../apache/cloudstack/storage/test/AopTest.java    |   0
 .../cloudstack/storage/test/AopTestAdvice.java     |   0
 .../storage/test/ChildTestConfiguration.java       |   0
 .../storage/test/CloudStackTestNGBase.java         |   0
 .../storage/test/DirectAgentManagerSimpleImpl.java |   0
 .../cloudstack/storage/test/DirectAgentTest.java   |   0
 .../storage/test/EndpointSelectorTest.java         |   0
 .../storage/test/FakeDriverTestConfiguration.java  |   0
 .../storage/test/FakePrimaryDataStoreDriver.java   |   0
 .../storage/test/MockLocalHostEndPoint.java        |   0
 .../cloudstack/storage/test/MockRpcCallBack.java   |   0
 .../storage/test/MockStorageMotionStrategy.java    |   0
 .../cloudstack/storage/test/S3TemplateTest.java    |   0
 .../cloudstack/storage/test/SnapshotTest.java      |   0
 .../storage/test/SnapshotTestWithFakeData.java     |   0
 .../storage/test/StorageFactoryBean.java           |   0
 .../cloudstack/storage/test/StorageTest.java       |   0
 .../cloudstack/storage/test/TemplateTest.java      |   0
 .../cloudstack/storage/test/TestConfiguration.java |   0
 .../apache/cloudstack/storage/test/TestHttp.java   |   0
 .../org/apache/cloudstack/storage/test/TestNG.java |   0
 .../apache/cloudstack/storage/test/TestNGAop.java  |   0
 .../cloudstack/storage/test/VolumeServiceTest.java |   0
 .../apache/cloudstack/storage/test/VolumeTest.java |   0
 .../cloudstack/storage/test/VolumeTestVmware.java  |   0
 .../cloudstack/storage/test/XenEndpoint.java       |   0
 .../test/resources/StorageAllocatorTestContext.xml |   0
 .../{ => src}/test/resources/component.xml         |   0
 .../test/resources}/fakeDriverTestContext.xml      |   0
 .../{ => src}/test/resources/s3_testng.xml         |   0
 .../{ => src}/test/resources/storageContext.xml    |   0
 .../{ => src}/test/resources/testng.xml            |   0
 .../storage/snapshot/SnapshotBackupException.java  |   0
 .../storage/snapshot/SnapshotDataFactoryImpl.java  |   0
 .../storage/snapshot/SnapshotObject.java           |   0
 .../storage/snapshot/SnapshotServiceImpl.java      |   0
 .../snapshot/SnapshotStateMachineManager.java      |   0
 .../snapshot/SnapshotStateMachineManagerImpl.java  |   0
 .../storage/snapshot/SnapshotStrategyBase.java     |   0
 .../snapshot/StorageSystemSnapshotStrategy.java    |   0
 .../snapshot/XenserverSnapshotStrategy.java        |   0
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |   0
 ...spring-engine-storage-snapshot-core-context.xml |   0
 ...ing-engine-storage-snapshot-storage-context.xml |   0
 .../test/java}/src/SnapshotDataFactoryTest.java    |   0
 .../test/java}/src/VMSnapshotStrategyTest.java     |   0
 .../test/resources/SnapshotManagerTestContext.xml  |   0
 .../snapshot/src}/test/resources/db.properties     |   0
 .../org/apache/cloudstack/storage/BaseType.java    |   0
 .../org/apache/cloudstack/storage/EndPoint.java    |   0
 .../cloudstack/storage/LocalHostEndpoint.java      |   0
 .../cloudstack/storage/RemoteHostEndPoint.java     |   0
 .../allocator/AbstractStoragePoolAllocator.java    |   0
 .../ClusterScopeStoragePoolAllocator.java          |   0
 .../GarbageCollectingStoragePoolAllocator.java     |   0
 .../allocator/LocalStoragePoolAllocator.java       |   0
 .../allocator/UseLocalForRootAllocator.java        |   0
 .../allocator/ZoneWideStoragePoolAllocator.java    |   0
 .../storage/backup/SnapshotOnBackupStoreInfo.java  |   0
 .../storage/backup/datastore/BackupStoreInfo.java  |   0
 .../storage/datastore/DataObjectManager.java       |   0
 .../storage/datastore/DataObjectManagerImpl.java   |   0
 .../cloudstack/storage/datastore/DataStore.java    |   0
 .../storage/datastore/DataStoreManagerImpl.java    |   0
 .../datastore/ObjectInDataStoreManager.java        |   0
 .../datastore/ObjectInDataStoreManagerImpl.java    |   0
 .../datastore/PrimaryDataStoreProviderManager.java |   0
 .../storage/datastore/TemplateInDataStore.java     |   0
 .../datastore/protocol/DataStoreProtocol.java      |   0
 .../provider/DataStoreProviderManagerImpl.java     |   0
 .../storage/db/ObjectInDataStoreDao.java           |   0
 .../storage/db/ObjectInDataStoreDaoImpl.java       |   0
 .../cloudstack/storage/db/ObjectInDataStoreVO.java |   0
 .../storage/endpoint/DefaultEndPointSelector.java  |   0
 .../storage/helper/HypervisorHelper.java           |   0
 .../storage/helper/HypervisorHelperImpl.java       |   0
 .../storage/helper/StorageStrategyFactoryImpl.java |   0
 .../storage/helper/VMSnapshotHelperImpl.java       |   0
 .../storage/image/BaseImageStoreDriverImpl.java    |   0
 .../cloudstack/storage/image/ImageStoreDriver.java |   0
 .../storage/image/NfsImageStoreDriverImpl.java     |   0
 .../storage/image/TemplateEntityImpl.java          |   0
 .../storage/image/datastore/ImageStoreHelper.java  |   0
 .../image/datastore/ImageStoreProviderManager.java |   0
 .../storage/image/db/SnapshotDataStoreDaoImpl.java |   0
 .../storage/image/db/TemplateDataStoreDaoImpl.java |   0
 .../storage/image/db/VolumeDataStoreDaoImpl.java   |   0
 .../cloudstack/storage/image/format/BAREMETAL.java |   0
 .../cloudstack/storage/image/format/ISO.java       |   0
 .../storage/image/format/ImageFormat.java          |   0
 .../storage/image/format/ImageFormatHelper.java    |   0
 .../cloudstack/storage/image/format/OVA.java       |   0
 .../cloudstack/storage/image/format/QCOW2.java     |   0
 .../cloudstack/storage/image/format/RAW.java       |   0
 .../cloudstack/storage/image/format/Unknown.java   |   0
 .../cloudstack/storage/image/format/VHD.java       |   0
 .../cloudstack/storage/image/format/VHDX.java      |   0
 .../storage/image/motion/ImageMotionService.java   |   0
 .../storage/snapshot/SnapshotEntityImpl.java       |   0
 .../storage/vmsnapshot/VMSnapshotHelper.java       |   0
 .../volume/TemplateOnPrimaryDataStoreInfo.java     |   0
 .../cloudstack/storage/volume/VolumeEvent.java     |   0
 .../volume/datastore/PrimaryDataStoreHelper.java   |   0
 .../volume/db/PrimaryDataStoreDetailsDaoImpl.java  |   0
 .../core/spring-engine-storage-core-context.xml    |   0
 .../cloudstack/storage-allocator/module.properties |   0
 ...ng-engine-storage-storage-allocator-context.xml |   0
 .../api/storage/StrategyPriorityTest.java          |   0
 .../apache/cloudstack/storage/BaseTypeTest.java    |   0
 engine/storage/storage.ucls                        |  38 ++++-----
 .../storage/datastore/PrimaryDataStoreImpl.java    |   0
 .../PrimaryDataStoreProviderManagerImpl.java       |   0
 .../storage/datastore/manager/data model.ucls      |   8 +-
 .../datastore/provider/DefaultHostListener.java    |   0
 .../storage/datastore/type/DataStoreType.java      |   0
 .../cloudstack/storage/datastore/type/ISCSI.java   |   0
 .../storage/datastore/type/NetworkFileSystem.java  |   0
 .../storage/datastore/type/SharedMount.java        |   0
 .../storage/volume/VolumeDataFactoryImpl.java      |   0
 .../cloudstack/storage/volume/VolumeObject.java    |   0
 .../storage/volume/VolumeServiceImpl.java          |   0
 .../spring-engine-storage-volume-core-context.xml  |   0
 .../storage/volume/VolumeObjectTest.java           |   0
 .../storage/volume/test/ConfiguratorTest.java      |   0
 .../cloudstack/storage/volume/test/Server.java     |   0
 .../cloudstack/storage/volume/test/Server1.java    |   0
 .../storage/volume/test/TestConfiguration.java     |   0
 .../storage/volume/test/TestInProcessAsync.java    |   0
 .../volume/{ => src}/test/resource/testContext.xml |   0
 .../apache/cloudstack/framework/ca/CAProvider.java |   0
 .../apache/cloudstack/framework/ca/CAService.java  |   0
 .../cloudstack/framework/ca/Certificate.java       |   0
 .../com/cloud/cluster/ActiveFencingException.java  |   0
 .../com/cloud/cluster/ClusterFenceManager.java     |   0
 .../com/cloud/cluster/ClusterFenceManagerImpl.java |   0
 .../cluster/ClusterInvalidSessionException.java    |   0
 .../java}/com/cloud/cluster/ClusterManager.java    |   0
 .../com/cloud/cluster/ClusterManagerImpl.java      |   0
 .../com/cloud/cluster/ClusterManagerListener.java  |   0
 .../com/cloud/cluster/ClusterManagerMBean.java     |   0
 .../com/cloud/cluster/ClusterManagerMBeanImpl.java |   0
 .../com/cloud/cluster/ClusterManagerMessage.java   |   0
 .../cloud/cluster/ClusterNodeJoinEventArgs.java    |   0
 .../cloud/cluster/ClusterNodeLeftEventArgs.java    |   0
 .../java}/com/cloud/cluster/ClusterService.java    |   0
 .../com/cloud/cluster/ClusterServiceAdapter.java   |   0
 .../java}/com/cloud/cluster/ClusterServicePdu.java |   0
 .../cloud/cluster/ClusterServiceRequestPdu.java    |   0
 .../cluster/ClusterServiceServletAdapter.java      |   0
 .../cluster/ClusterServiceServletContainer.java    |   0
 .../cluster/ClusterServiceServletHttpHandler.java  |   0
 .../cloud/cluster/ClusterServiceServletImpl.java   |   0
 .../com/cloud/cluster/ManagementServerHost.java    |   0
 .../cloud/cluster/ManagementServerHostPeerVO.java  |   0
 .../com/cloud/cluster/ManagementServerHostVO.java  |   0
 .../com/cloud/cluster/RemoteMethodConstants.java   |   0
 .../cloud/cluster/dao/ManagementServerHostDao.java |   0
 .../cluster/dao/ManagementServerHostDaoImpl.java   |   0
 .../cluster/dao/ManagementServerHostPeerDao.java   |   0
 .../dao/ManagementServerHostPeerDaoImpl.java       |   0
 .../core/spring-framework-cluster-core-context.xml |   0
 .../cluster/ClusterServiceServletAdapterTest.java  |   0
 .../apache/cloudstack/config/Configuration.java    |   0
 .../cloudstack/framework/config/ConfigDepot.java   |   0
 .../framework/config/ConfigDepotAdmin.java         |   0
 .../cloudstack/framework/config/ConfigKey.java     |   0
 .../cloudstack/framework/config/Configurable.java  |   0
 .../framework/config/ScopedConfigStorage.java      |   0
 .../framework/config/dao/ConfigurationDao.java     |   0
 .../framework/config/dao/ConfigurationDaoImpl.java |   0
 .../framework/config/impl/ConfigDepotImpl.java     |   0
 .../framework/config/impl/ConfigurationVO.java     |   0
 ...framework-config-system-context-inheritable.xml |   0
 .../spring-framework-config-system-context.xml     |   0
 .../cloudstack/framework/config/ConfigKeyTest.java |   0
 .../config/impl/ConfigDepotAdminTest.java          |   0
 .../java}/com/cloud/dao/EntityManagerImpl.java     |   0
 .../utils/crypt/EncryptionSecretKeyChanger.java    |   0
 .../java}/com/cloud/utils/db/Attribute.java        |   0
 .../com/cloud/utils/db/ConnectionConcierge.java    |   0
 .../cloud/utils/db/ConnectionConciergeMBean.java   |   0
 .../src/{ => main/java}/com/cloud/utils/db/DB.java |   0
 .../{ => main/java}/com/cloud/utils/db/DbUtil.java |   0
 .../java}/com/cloud/utils/db/DriverLoader.java     |   0
 .../{ => main/java}/com/cloud/utils/db/EcInfo.java |   0
 .../java}/com/cloud/utils/db/Encrypt.java          |   0
 .../{ => main/java}/com/cloud/utils/db/Filter.java |   0
 .../java}/com/cloud/utils/db/GenericDao.java       |   0
 .../java}/com/cloud/utils/db/GenericDaoBase.java   |   0
 .../com/cloud/utils/db/GenericQueryBuilder.java    |   0
 .../com/cloud/utils/db/GenericSearchBuilder.java   |   0
 .../java}/com/cloud/utils/db/GlobalLock.java       |   0
 .../java}/com/cloud/utils/db/GroupBy.java          |   0
 .../java}/com/cloud/utils/db/JoinBuilder.java      |   0
 .../java}/com/cloud/utils/db/JoinType.java         |   0
 .../java}/com/cloud/utils/db/Merovingian2.java     |   0
 .../java}/com/cloud/utils/db/MerovingianMBean.java |   0
 .../java}/com/cloud/utils/db/QueryBuilder.java     |   0
 .../java}/com/cloud/utils/db/ScriptRunner.java     |   0
 .../java}/com/cloud/utils/db/SearchBase.java       |   0
 .../java}/com/cloud/utils/db/SearchBuilder.java    |   0
 .../java}/com/cloud/utils/db/SearchCriteria.java   |   0
 .../java}/com/cloud/utils/db/SequenceFetcher.java  |   0
 .../java}/com/cloud/utils/db/SqlGenerator.java     |   0
 .../java}/com/cloud/utils/db/StateMachine.java     |   0
 .../java}/com/cloud/utils/db/Transaction.java      |   0
 .../com/cloud/utils/db/TransactionAttachment.java  |   0
 .../com/cloud/utils/db/TransactionCallback.java    |   0
 .../utils/db/TransactionCallbackNoReturn.java      |   0
 .../utils/db/TransactionCallbackWithException.java |   0
 .../TransactionCallbackWithExceptionNoReturn.java  |   0
 .../cloud/utils/db/TransactionContextBuilder.java  |   0
 .../utils/db/TransactionContextInterceptor.java    |   0
 .../cloud/utils/db/TransactionContextListener.java |   0
 .../com/cloud/utils/db/TransactionLegacy.java      |   0
 .../java}/com/cloud/utils/db/TransactionMBean.java |   0
 .../com/cloud/utils/db/TransactionMBeanImpl.java   |   0
 .../com/cloud/utils/db/TransactionStatus.java      |   0
 .../java}/com/cloud/utils/db/UpdateBuilder.java    |   0
 .../java}/com/cloud/utils/db/UpdateFilter.java     |   0
 .../system/spring-framework-db-system-context.xml  |   0
 framework/db/{ => src}/test/db.properties          |   0
 .../test/java}/com/cloud/utils/DbUtilTest.java     |   0
 .../java}/com/cloud/utils/db/DbAnnotatedBase.java  |   0
 .../com/cloud/utils/db/DbAnnotatedBaseDerived.java |   0
 .../test/java}/com/cloud/utils/db/DbTestDao.java   |   0
 .../test/java}/com/cloud/utils/db/DbTestUtils.java |   0
 .../test/java}/com/cloud/utils/db/DbTestVO.java    |   0
 .../java}/com/cloud/utils/db/DummyComponent.java   |   0
 .../com/cloud/utils/db/ElementCollectionTest.java  |   0
 .../test/java}/com/cloud/utils/db/FilterTest.java  |   0
 .../com/cloud/utils/db/GenericDaoBaseTest.java     |   0
 .../java}/com/cloud/utils/db/GlobalLockTest.java   |   0
 .../test/java}/com/cloud/utils/db/GroupByTest.java |   0
 .../java}/com/cloud/utils/db/Merovingian2Test.java |   0
 .../java}/com/cloud/utils/db/TestTransaction.java  |   0
 .../utils/db/TransactionContextBuilderTest.java    |   0
 .../db/{ => src}/test/resources/db.properties      |   0
 .../direct/download/DirectDownloadService.java     |   0
 .../apache/cloudstack/framework/events/Event.java  |   0
 .../cloudstack/framework/events/EventBus.java      |   0
 .../framework/events/EventBusException.java        |   0
 .../framework/events/EventSubscriber.java          |   0
 .../cloudstack/framework/events/EventTopic.java    |   0
 .../java}/com/cloud/agent/manager/Commands.java    |   0
 .../framework/async/AsyncCallFuture.java           |   0
 .../framework/async/AsyncCallbackDispatcher.java   |   0
 .../framework/async/AsyncCallbackDriver.java       |   0
 .../framework/async/AsyncCompletionCallback.java   |   0
 .../framework/async/AsyncRpcContext.java           |   0
 .../async/InplaceAsyncCallbackDriver.java          |   0
 .../framework/client/ClientMessageBus.java         |   0
 .../client/ClientTransportConnection.java          |   0
 .../framework/client/ClientTransportEndpoint.java  |   0
 .../client/ClientTransportEndpointSite.java        |   0
 .../framework/client/ClientTransportProvider.java  |   0
 .../framework/messagebus/MessageBus.java           |   0
 .../framework/messagebus/MessageBusBase.java       |   0
 .../framework/messagebus/MessageBusEndpoint.java   |   0
 .../framework/messagebus/MessageDetector.java      |   0
 .../framework/messagebus/MessageDispatcher.java    |   0
 .../framework/messagebus/MessageHandler.java       |   0
 .../framework/messagebus/MessageSubscriber.java    |   0
 .../framework/messagebus/PublishScope.java         |   0
 .../framework/rpc/RpcCallRequestPdu.java           |   0
 .../framework/rpc/RpcCallResponsePdu.java          |   0
 .../framework/rpc/RpcCallbackDispatcher.java       |   0
 .../framework/rpc/RpcCallbackListener.java         |   0
 .../cloudstack/framework/rpc/RpcClientCall.java    |   0
 .../framework/rpc/RpcClientCallImpl.java           |   0
 .../cloudstack/framework/rpc/RpcException.java     |   0
 .../cloudstack/framework/rpc/RpcIOException.java   |   0
 .../cloudstack/framework/rpc/RpcProvider.java      |   0
 .../cloudstack/framework/rpc/RpcProviderImpl.java  |   0
 .../cloudstack/framework/rpc/RpcServerCall.java    |   0
 .../framework/rpc/RpcServerCallImpl.java           |   0
 .../framework/rpc/RpcServiceDispatcher.java        |   0
 .../framework/rpc/RpcServiceEndpoint.java          |   0
 .../framework/rpc/RpcServiceHandler.java           |   0
 .../framework/rpc/RpcTimeoutException.java         |   0
 .../serializer/JsonMessageSerializer.java          |   0
 .../framework/serializer/MessageSerializer.java    |   0
 .../framework/serializer/OnwireClassRegistry.java  |   0
 .../framework/serializer/OnwireName.java           |   0
 .../framework/server/ServerMessageBus.java         |   0
 .../framework/server/ServerTransportProvider.java  |   0
 .../framework/transport/TransportAddress.java      |   0
 .../transport/TransportAddressMapper.java          |   0
 .../transport/TransportAttachRequestPdu.java       |   0
 .../transport/TransportAttachResponsePdu.java      |   0
 .../transport/TransportConnectRequestPdu.java      |   0
 .../transport/TransportConnectResponsePdu.java     |   0
 .../framework/transport/TransportDataPdu.java      |   0
 .../framework/transport/TransportEndpoint.java     |   0
 .../framework/transport/TransportEndpointSite.java |   0
 .../framework/transport/TransportMultiplexier.java |   0
 .../framework/transport/TransportPdu.java          |   0
 .../framework/transport/TransportProvider.java     |   0
 .../core/spring-framework-ipc-core-context.xml     |   0
 .../framework/codestyle/AsyncSampleCallee.java     |   0
 .../AsyncSampleEventDrivenStyleCaller.java         |   0
 .../codestyle/AsyncSampleListenerStyleCaller.java  |   0
 .../sampleserver/SampleManagementServer.java       |   0
 .../sampleserver/SampleManagementServerApp.java    |   0
 .../sampleserver/SampleManagerComponent.java       |   0
 .../sampleserver/SampleManagerComponent2.java      |   0
 .../sampleserver/SampleStoragePrepareAnswer.java   |   0
 .../sampleserver/SampleStoragePrepareCommand.java  |   0
 .../cloudstack/messagebus/TestMessageBus.java      |   0
 .../test/resources/MessageBusTestContext.xml       |   0
 .../resources/SampleManagementServerAppContext.xml |   0
 .../ipc/{ => src}/test/resources/log4j-cloud.xml   |   0
 .../apache/cloudstack/framework/jobs/AsyncJob.java |   0
 .../framework/jobs/AsyncJobDispatcher.java         |   0
 .../framework/jobs/AsyncJobExecutionContext.java   |   0
 .../cloudstack/framework/jobs/AsyncJobMBean.java   |   0
 .../cloudstack/framework/jobs/AsyncJobManager.java |   0
 .../apache/cloudstack/framework/jobs/Outcome.java  |   0
 .../cloudstack/framework/jobs/dao/AsyncJobDao.java |   0
 .../framework/jobs/dao/AsyncJobDaoImpl.java        |   0
 .../framework/jobs/dao/AsyncJobJoinMapDao.java     |   0
 .../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java |   0
 .../framework/jobs/dao/AsyncJobJournalDao.java     |   0
 .../framework/jobs/dao/AsyncJobJournalDaoImpl.java |   0
 .../framework/jobs/dao/SyncQueueDao.java           |   0
 .../framework/jobs/dao/SyncQueueDaoImpl.java       |   0
 .../framework/jobs/dao/SyncQueueItemDao.java       |   0
 .../framework/jobs/dao/SyncQueueItemDaoImpl.java   |   0
 .../framework/jobs/dao/VmWorkJobDao.java           |   0
 .../framework/jobs/dao/VmWorkJobDaoImpl.java       |   0
 .../framework/jobs/impl/AsyncJobJoinMapVO.java     |   0
 .../framework/jobs/impl/AsyncJobJournalVO.java     |   0
 .../framework/jobs/impl/AsyncJobMBeanImpl.java     |   0
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |   0
 .../framework/jobs/impl/AsyncJobMonitor.java       |   0
 .../cloudstack/framework/jobs/impl/AsyncJobVO.java |   0
 .../framework/jobs/impl/JobSerializerHelper.java   |   0
 .../framework/jobs/impl/OutcomeImpl.java           |   0
 .../framework/jobs/impl/SyncQueueItem.java         |   0
 .../framework/jobs/impl/SyncQueueItemVO.java       |   0
 .../framework/jobs/impl/SyncQueueManager.java      |   0
 .../framework/jobs/impl/SyncQueueManagerImpl.java  |   0
 .../framework/jobs/impl/SyncQueueVO.java           |   0
 .../framework/jobs/impl/VmWorkJobVO.java           |   0
 .../core/spring-framework-jobs-core-context.xml    |   0
 .../framework/jobs/AsyncJobManagerTest.java        |   0
 .../jobs/AsyncJobManagerTestConfiguration.java     |   0
 .../framework/jobs/AsyncJobTestDashboard.java      |   0
 .../framework/jobs/AsyncJobTestDispatcher.java     |   0
 .../test/resources/AsyncJobManagerTestContext.xml  |   0
 .../{ => src}/test/resources/commonContext.xml     |   0
 .../jobs/src}/test/resources/db.properties         |   0
 .../jobs/{ => src}/test/resources/log4j.properties |   0
 framework/managed-context/pom.xml                  |   4 +-
 .../apache/cloudstack/quota/QuotaAlertManager.java |   0
 .../cloudstack/quota/QuotaAlertManagerImpl.java    |   0
 .../org/apache/cloudstack/quota/QuotaManager.java  |   0
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |   0
 .../apache/cloudstack/quota/QuotaStatement.java    |   0
 .../cloudstack/quota/QuotaStatementImpl.java       |   0
 .../cloudstack/quota/constant/QuotaConfig.java     |   0
 .../cloudstack/quota/constant/QuotaTypes.java      |   0
 .../cloudstack/quota/dao/QuotaAccountDao.java      |   0
 .../cloudstack/quota/dao/QuotaAccountDaoImpl.java  |   0
 .../cloudstack/quota/dao/QuotaBalanceDao.java      |   0
 .../cloudstack/quota/dao/QuotaBalanceDaoImpl.java  |   0
 .../cloudstack/quota/dao/QuotaCreditsDao.java      |   0
 .../cloudstack/quota/dao/QuotaCreditsDaoImpl.java  |   0
 .../quota/dao/QuotaEmailTemplatesDao.java          |   0
 .../quota/dao/QuotaEmailTemplatesDaoImpl.java      |   0
 .../cloudstack/quota/dao/QuotaTariffDao.java       |   0
 .../cloudstack/quota/dao/QuotaTariffDaoImpl.java   |   0
 .../apache/cloudstack/quota/dao/QuotaUsageDao.java |   0
 .../cloudstack/quota/dao/QuotaUsageDaoImpl.java    |   0
 .../cloudstack/quota/dao/ServiceOfferingDao.java   |   0
 .../quota/dao/ServiceOfferingDaoImpl.java          |   0
 .../cloudstack/quota/dao/UserVmDetailsDao.java     |   0
 .../cloudstack/quota/dao/UserVmDetailsDaoImpl.java |   0
 .../apache/cloudstack/quota/vo/QuotaAccountVO.java |   0
 .../apache/cloudstack/quota/vo/QuotaBalanceVO.java |   0
 .../apache/cloudstack/quota/vo/QuotaCreditsVO.java |   0
 .../cloudstack/quota/vo/QuotaEmailTemplatesVO.java |   0
 .../apache/cloudstack/quota/vo/QuotaTariffVO.java  |   0
 .../apache/cloudstack/quota/vo/QuotaUsageVO.java   |   0
 .../cloudstack/quota/vo/ServiceOfferingVO.java     |   0
 .../apache/cloudstack/quota/vo/UserVmDetailVO.java |   0
 .../quota/spring-framework-quota-context.xml       |   0
 .../quota/QuotaAlertManagerImplTest.java           |   0
 .../cloudstack/quota/QuotaManagerImplTest.java     |   0
 .../cloudstack/quota/QuotaStatementTest.java       |   0
 .../cloudstack/quota/constant/QuotaTypesTest.java  |   0
 .../jackson/CSJacksonAnnotationIntrospector.java   |   0
 .../ws/jackson/CSJacksonAnnotationModule.java      |   0
 .../framework/ws/jackson/UriSerializer.java        |   0
 .../framework/ws/jackson/UrisSerializer.java       |   0
 .../cloudstack/framework/ws/jackson/Url.java       |   0
 .../ws/jackson/CSJacksonAnnotationTest.java        |   0
 .../framework/security/keys/KeysManager.java       |   0
 .../framework/security/keys/KeysManagerImpl.java   |   0
 .../framework/security/keystore/KeystoreDao.java   |   0
 .../security/keystore/KeystoreDaoImpl.java         |   0
 .../security/keystore/KeystoreManager.java         |   0
 .../security/keystore/KeystoreManagerImpl.java     |   0
 .../framework/security/keystore/KeystoreVO.java    |   0
 .../spring-framework-security-core-context.xml     |   0
 framework/spring/lifecycle/pom.xml                 |   4 +-
 framework/spring/module/pom.xml                    |   4 +-
 maven-standard/pom.xml                             |  48 -----------
 packaging/centos63/cloud.spec                      |   2 +-
 packaging/centos7/cloud.spec                       |   2 +-
 .../acl/DynamicRoleBasedAPIAccessChecker.java      |   0
 .../acl-dynamic-role-based/module.properties       |   0
 .../spring-acl-dynamic-role-based-context.xml      |   0
 .../acl/DynamicRoleBasedAPIAccessCheckerTest.java  |   0
 .../acl/StaticRoleBasedAPIAccessChecker.java       |   0
 .../acl-static-role-based/module.properties        |   0
 .../spring-acl-static-role-based-context.xml       |   0
 .../explicit-dedication/pom.xml                    |   1 -
 .../affinity/ExplicitDedicationProcessor.java      |   0
 .../explicit-dedication/module.properties          |   0
 .../spring-explicit-dedication-context.xml         |   0
 .../host-anti-affinity/pom.xml                     |   1 -
 .../affinity/HostAntiAffinityProcessor.java        |   0
 .../host-anti-affinity/module.properties           |   0
 .../spring-host-anti-affinity-context.xml          |   0
 .../cloudstack/alert/snmp/CsSnmpConstants.java     |   0
 .../alert/snmp/SnmpEnhancedPatternLayout.java      |   0
 .../apache/cloudstack/alert/snmp/SnmpHelper.java   |   0
 .../cloudstack/alert/snmp/SnmpTrapAppender.java    |   0
 .../apache/cloudstack/alert/snmp/SnmpTrapInfo.java |   0
 .../alert/snmp/SnmpEnhancedPatternLayoutTest.java  |   0
 .../alert/snmp/SnmpTrapAppenderTest.java           |   0
 .../cloudstack/syslog/AlertsSyslogAppender.java    |   0
 .../syslog/AlertsSyslogAppenderTest.java           |   0
 .../api/command/user/discovery/ListApisCmd.java    |   0
 .../api/response/ApiDiscoveryResponse.java         |   0
 .../api/response/ApiParameterResponse.java         |   0
 .../api/response/ApiResponseResponse.java          |   0
 .../cloudstack/discovery/ApiDiscoveryService.java  |   0
 .../discovery/ApiDiscoveryServiceImpl.java         |   0
 .../cloudstack/discovery/ApiDiscoveryTest.java     |   0
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |   0
 .../api/command/user/ratelimit/GetApiLimitCmd.java |   0
 .../cloudstack/api/response/ApiLimitResponse.java  |   0
 .../cloudstack/ratelimit/ApiRateLimitService.java  |   0
 .../ratelimit/ApiRateLimitServiceImpl.java         |   0
 .../cloudstack/ratelimit/EhcacheLimitStore.java    |   0
 .../apache/cloudstack/ratelimit/LimitStore.java    |   0
 .../apache/cloudstack/ratelimit/StoreEntry.java    |   0
 .../cloudstack/ratelimit/StoreEntryImpl.java       |   0
 .../cloudstack/rate-limit/module.properties        |   0
 .../rate-limit/spring-rate-limit-context.xml       |   0
 .../cloudstack/ratelimit/ApiRateLimitTest.java     |   0
 .../cloudstack/ratelimit/integration/APITest.java  |   0
 .../ratelimit/integration/LoginResponse.java       |   0
 .../integration/RateLimitIntegrationTest.java      |   0
 .../admin/solidfire/GetPathForVolumeCmd.java       |   0
 .../admin/solidfire/GetSolidFireAccountIdCmd.java  |   0
 .../GetSolidFireVolumeAccessGroupIdCmd.java        |   0
 .../admin/solidfire/GetSolidFireVolumeSizeCmd.java |   0
 .../solidfire/GetVolumeSnapshotDetailsCmd.java     |   0
 .../admin/solidfire/GetVolumeiScsiNameCmd.java     |   0
 .../solidfire/ApiPathForVolumeResponse.java        |   0
 .../solidfire/ApiSolidFireAccountIdResponse.java   |   0
 .../ApiSolidFireVolumeAccessGroupIdResponse.java   |   0
 .../solidfire/ApiSolidFireVolumeSizeResponse.java  |   0
 .../ApiVolumeSnapshotDetailsResponse.java          |   0
 .../solidfire/ApiVolumeiScsiNameResponse.java      |   0
 .../ApiSolidFireIntegrationTestService.java        |   0
 .../ApiSolidFireIntegrationTestServiceImpl.java    |   0
 .../solidfire/SolidFireIntegrationTestManager.java |   0
 .../SolidFireIntegrationTestManagerImpl.java       |   0
 .../solidfire/SolidFireIntegrationTestUtil.java    |   0
 .../solidfire-intg-test/module.properties          |   0
 .../spring-solidfire-intg-test-context.xml         |   0
 .../api/command/admin/sioc/UpdateSiocInfoCmd.java  |   0
 .../response/sioc/ApiUpdateSiocInfoResponse.java   |   0
 .../apache/cloudstack/api/sioc/ApiSiocService.java |   0
 .../cloudstack/api/sioc/ApiSiocServiceImpl.java    |   0
 .../org/apache/cloudstack/sioc/SiocManager.java    |   0
 .../apache/cloudstack/sioc/SiocManagerImpl.java    |   0
 .../org/apache/cloudstack/util/LoginInfo.java      |   0
 .../apache/cloudstack/util/vmware/VMwareUtil.java  |   0
 .../cloudstack/vmware-sioc/module.properties       |   0
 .../cloudstack/vmware-sioc/spring-sioc-context.xml |   0
 .../ca/provider/RootCACustomTrustManager.java      |   0
 .../cloudstack/ca/provider/RootCAProvider.java     |   0
 .../META-INF/cloudstack/root-ca/module.properties  |   0
 .../cloudstack/root-ca/spring-root-ca-context.xml  |   0
 .../ca/provider/RootCACustomTrustManagerTest.java  |   0
 .../cloudstack/ca/provider/RootCAProviderTest.java |   0
 .../java}/com/cloud/utils/db/StaticStrategy.java   |   0
 .../cloudstack/api/command/QuotaBalanceCmd.java    |   0
 .../cloudstack/api/command/QuotaCreditsCmd.java    |   0
 .../api/command/QuotaEmailTemplateListCmd.java     |   0
 .../api/command/QuotaEmailTemplateUpdateCmd.java   |   0
 .../cloudstack/api/command/QuotaEnabledCmd.java    |   0
 .../cloudstack/api/command/QuotaStatementCmd.java  |   0
 .../cloudstack/api/command/QuotaSummaryCmd.java    |   0
 .../cloudstack/api/command/QuotaTariffListCmd.java |   0
 .../api/command/QuotaTariffUpdateCmd.java          |   0
 .../cloudstack/api/command/QuotaUpdateCmd.java     |   0
 .../api/response/QuotaBalanceResponse.java         |   0
 .../api/response/QuotaCreditsResponse.java         |   0
 .../api/response/QuotaEmailTemplateResponse.java   |   0
 .../api/response/QuotaEnabledResponse.java         |   0
 .../api/response/QuotaResponseBuilder.java         |   0
 .../api/response/QuotaResponseBuilderImpl.java     |   0
 .../api/response/QuotaStatementItemResponse.java   |   0
 .../api/response/QuotaStatementResponse.java       |   0
 .../api/response/QuotaSummaryResponse.java         |   0
 .../api/response/QuotaTariffResponse.java          |   0
 .../cloudstack/api/response/QuotaTypeResponse.java |   0
 .../api/response/QuotaUpdateResponse.java          |   0
 .../org/apache/cloudstack/quota/QuotaService.java  |   0
 .../apache/cloudstack/quota/QuotaServiceImpl.java  |   0
 .../META-INF/cloudstack/quota/module.properties    |   0
 .../cloudstack/quota/spring-quota-context.xml      |   0
 .../api/command/QuotaBalanceCmdTest.java           |   0
 .../api/command/QuotaCreditsCmdTest.java           |   0
 .../api/command/QuotaEmailTemplateListCmdTest.java |   0
 .../command/QuotaEmailTemplateUpdateCmdTest.java   |   0
 .../api/command/QuotaStatementCmdTest.java         |   0
 .../api/command/QuotaTariffListCmdTest.java        |   0
 .../api/command/QuotaTariffUpdateCmdTest.java      |   0
 .../api/response/QuotaResponseBuilderImplTest.java |   0
 .../cloudstack/quota/QuotaServiceImplTest.java     |   0
 .../api/commands/DedicateClusterCmd.java           |   0
 .../cloudstack/api/commands/DedicateHostCmd.java   |   0
 .../cloudstack/api/commands/DedicatePodCmd.java    |   0
 .../cloudstack/api/commands/DedicateZoneCmd.java   |   0
 .../api/commands/ListDedicatedClustersCmd.java     |   0
 .../api/commands/ListDedicatedHostsCmd.java        |   0
 .../api/commands/ListDedicatedPodsCmd.java         |   0
 .../api/commands/ListDedicatedZonesCmd.java        |   0
 .../api/commands/ReleaseDedicatedClusterCmd.java   |   0
 .../api/commands/ReleaseDedicatedHostCmd.java      |   0
 .../api/commands/ReleaseDedicatedPodCmd.java       |   0
 .../api/commands/ReleaseDedicatedZoneCmd.java      |   0
 .../api/response/DedicateClusterResponse.java      |   0
 .../api/response/DedicateHostResponse.java         |   0
 .../api/response/DedicatePodResponse.java          |   0
 .../api/response/DedicateZoneResponse.java         |   0
 .../dedicated/DedicatedResourceManagerImpl.java    |   0
 .../cloudstack/dedicated/DedicatedService.java     |   0
 .../spring-dedicated-resources-core-context.xml    |   0
 .../dedicated/manager/DedicatedApiUnitTest.java    |   0
 .../test/resources}/dedicatedContext.xml           |   0
 .../cloud/deploy/ImplicitDedicationPlanner.java    |   0
 .../implicit-dedication/module.properties          |   0
 .../spring-implicit-dedication-context.xml         |   0
 .../implicitplanner/ImplicitPlannerTest.java       |   0
 .../cloud/deploy/UserConcentratedPodPlanner.java   |   0
 .../user-concentrated-pod/module.properties        |   0
 .../spring-user-concentrated-pod-context.xml       |   0
 .../com/cloud/deploy/UserDispersingPlanner.java    |   0
 .../cloudstack/mom/inmemory/InMemoryEventBus.java  |   0
 .../mom/inmemory/InMemoryEventBusTest.java         |   0
 .../apache/cloudstack/mom/kafka/KafkaEventBus.java |   0
 .../cloudstack/mom/rabbitmq/RabbitMQEventBus.java  |   0
 .../cloud/api/commands/netapp/AssociateLunCmd.java |   0
 .../cloud/api/commands/netapp/CreateLunCmd.java    |   0
 .../commands/netapp/CreateVolumeOnFilerCmd.java    |   0
 .../api/commands/netapp/CreateVolumePoolCmd.java   |   0
 .../api/commands/netapp/DeleteVolumePoolCmd.java   |   0
 .../cloud/api/commands/netapp/DestroyLunCmd.java   |   0
 .../commands/netapp/DestroyVolumeOnFilerCmd.java   |   0
 .../api/commands/netapp/DissociateLunCmd.java      |   0
 .../com/cloud/api/commands/netapp/ListLunsCmd.java |   0
 .../api/commands/netapp/ListVolumePoolsCmd.java    |   0
 .../api/commands/netapp/ListVolumesOnFilerCmd.java |   0
 .../api/commands/netapp/ModifyVolumePoolCmd.java   |   0
 .../{ => main/java}/com/cloud/netapp/LunVO.java    |   0
 .../java}/com/cloud/netapp/NetappAllocator.java    |   0
 .../cloud/netapp/NetappDefaultAllocatorImpl.java   |   0
 .../java}/com/cloud/netapp/NetappManager.java      |   0
 .../java}/com/cloud/netapp/NetappManagerImpl.java  |   0
 .../java}/com/cloud/netapp/NetappVolumeVO.java     |   0
 .../{ => main/java}/com/cloud/netapp/PoolVO.java   |   0
 .../java}/com/cloud/netapp/dao/LunDao.java         |   0
 .../java}/com/cloud/netapp/dao/LunDaoImpl.java     |   0
 .../java}/com/cloud/netapp/dao/PoolDao.java        |   0
 .../java}/com/cloud/netapp/dao/PoolDaoImpl.java    |   0
 .../java}/com/cloud/netapp/dao/VolumeDao.java      |   0
 .../java}/com/cloud/netapp/dao/VolumeDaoImpl.java  |   0
 .../com/cloud/deploy/SkipHeuresticsPlanner.java    |   0
 .../cloudstack/skip-heurestics/module.properties   |   0
 .../spring-skip-heurestics-context.xml             |   0
 .../manager/allocator/impl/RandomAllocator.java    |   0
 .../host-allocator-random/module.properties        |   0
 .../spring-host-allocator-random-context.xml       |   0
 .../cloud/baremetal/database/BaremetalDhcpDao.java |   0
 .../baremetal/database/BaremetalDhcpDaoImpl.java   |   0
 .../cloud/baremetal/database/BaremetalDhcpVO.java  |   0
 .../cloud/baremetal/database/BaremetalPxeDao.java  |   0
 .../baremetal/database/BaremetalPxeDaoImpl.java    |   0
 .../cloud/baremetal/database/BaremetalPxeVO.java   |   0
 .../cloud/baremetal/database/BaremetalRctDao.java  |   0
 .../baremetal/database/BaremetalRctDaoImpl.java    |   0
 .../cloud/baremetal/database/BaremetalRctVO.java   |   0
 .../baremetal/manager/BareMetalDiscoverer.java     |   0
 .../com/cloud/baremetal/manager/BareMetalGuru.java |   0
 .../cloud/baremetal/manager/BareMetalPlanner.java  |   0
 .../manager/BareMetalTemplateAdapter.java          |   0
 .../cloud/baremetal/manager/BaremetalManager.java  |   0
 .../baremetal/manager/BaremetalManagerImpl.java    |   0
 .../com/cloud/baremetal/manager/BaremetalRct.java  |   0
 .../baremetal/manager/BaremetalVlanManager.java    |   0
 .../manager/BaremetalVlanManagerImpl.java          |   0
 .../networkservice/BareMetalPingServiceImpl.java   |   0
 .../networkservice/BareMetalPxeServiceBase.java    |   0
 .../networkservice/BareMetalResourceBase.java      |   0
 .../networkservice/BaremetaNetworkGuru.java        |   0
 .../networkservice/BaremetalDhcpElement.java       |   0
 .../networkservice/BaremetalDhcpManager.java       |   0
 .../networkservice/BaremetalDhcpManagerImpl.java   |   0
 .../networkservice/BaremetalDhcpResourceBase.java  |   0
 .../networkservice/BaremetalDhcpResponse.java      |   0
 .../networkservice/BaremetalDhcpdResource.java     |   0
 .../networkservice/BaremetalDnsmasqResource.java   |   0
 .../BaremetalKickStartPxeResource.java             |   0
 .../BaremetalKickStartServiceImpl.java             |   0
 .../networkservice/BaremetalPingPxeResource.java   |   0
 .../networkservice/BaremetalPxeElement.java        |   0
 .../BaremetalPxeKickStartResponse.java             |   0
 .../networkservice/BaremetalPxeManager.java        |   0
 .../networkservice/BaremetalPxeManagerImpl.java    |   0
 .../networkservice/BaremetalPxePingResponse.java   |   0
 .../networkservice/BaremetalPxeResourceBase.java   |   0
 .../networkservice/BaremetalPxeResponse.java       |   0
 .../networkservice/BaremetalPxeService.java        |   0
 .../networkservice/BaremetalRctResponse.java       |   0
 .../networkservice/BaremetalSwitchBackend.java     |   0
 .../networkservice/BaremetalUserdataElement.java   |   0
 .../BaremetalVirtualRouterCommands.java            |   0
 .../networkservice/BaremetalVlanStruct.java        |   0
 .../Force10BaremetalSwitchBackend.java             |   0
 .../PrepareKickstartPxeServerCommand.java          |   0
 .../networkservice/SecurityGroupHttpClient.java    |   0
 .../networkservice/schema/ObjectFactory.java       |   0
 .../networkservice/schema/SecurityGroupRule.java   |   0
 .../schema/SecurityGroupVmRuleSet.java             |   0
 .../apache/cloudstack/api/AddBaremetalDhcpCmd.java |   0
 .../apache/cloudstack/api/AddBaremetalHostCmd.java |   0
 .../api/AddBaremetalKickStartPxeCmd.java           |   0
 .../apache/cloudstack/api/AddBaremetalPxeCmd.java  |   0
 .../api/AddBaremetalPxePingServerCmd.java          |   0
 .../apache/cloudstack/api/AddBaremetalRctCmd.java  |   0
 .../api/BaremetalProvisionDoneNotificationCmd.java |   0
 .../cloudstack/api/DeleteBaremetalRctCmd.java      |   0
 .../cloudstack/api/ListBaremetalDhcpCmd.java       |   0
 .../cloudstack/api/ListBaremetalPxeServersCmd.java |   0
 .../apache/cloudstack/api/ListBaremetalRctCmd.java |   0
 .../cloudstack/baremetal-compute/module.properties |   0
 .../spring-baremetal-compute-context.xml           |   0
 .../baremetal-discoverer/module.properties         |   0
 .../spring-baremetal-discoverer-context.xml        |   0
 .../cloudstack/baremetal-network/module.properties |   0
 .../spring-baremetal-network-context.xml           |   0
 .../cloudstack/baremetal-planner/module.properties |   0
 .../spring-baremetal-planner-context.xml           |   0
 .../cloudstack/baremetal-storage/module.properties |   0
 .../spring-baremetal-storage-context.xml           |   0
 .../core/spring-baremetal-core-context.xml         |   0
 .../resources/security_group_agent/cs-sgagent      |   0
 .../security_group_agent/__init__.py               |   0
 .../security_group_agent/cs_sg_agent.py            |   0
 .../security_group_agent/sglib.py                  |   0
 .../security_group_agent/xmlobject.py              |   0
 .../main}/resources/security_group_agent/setup.py  |   0
 plugins/hypervisors/hyperv/pom.xml                 |  11 ---
 .../java}/com/cloud/ha/HypervInvestigator.java     |   0
 .../hyperv/discoverer/HypervServerDiscoverer.java  |   0
 .../cloud/hypervisor/hyperv/guru/HypervGuru.java   |   0
 .../hypervisor/hyperv/manager/HypervManager.java   |   0
 .../hyperv/manager/HypervManagerImpl.java          |   0
 .../resource/HypervDirectConnectResource.java      |   0
 .../motion/HypervStorageMotionStrategy.java        |   0
 .../cloudstack/core/spring-hyperv-core-context.xml |   0
 .../cloudstack/hyperv-compute/module.properties    |   0
 .../spring-hyperv-compute-context.xml              |   0
 .../cloudstack/hyperv-discoverer/module.properties |   0
 .../spring-hyperv-discoverer-context.xml           |   0
 .../{conf => src/main/resources}/agent.properties  |   0
 .../test/HypervDirectConnectResourceTest.java      |   0
 plugins/hypervisors/kvm/pom.xml                    |   3 -
 .../wrapper/LibvirtReplugNicCommandWrapper.java    |   0
 .../java}/com/cloud/ha/KVMInvestigator.java        |   0
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |   0
 .../hypervisor/kvm/resource/DirectVifDriver.java   |   0
 .../hypervisor/kvm/resource/IvsVifDriver.java      |   0
 .../hypervisor/kvm/resource/KVMGuestOsMapper.java  |   0
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |   0
 .../hypervisor/kvm/resource/KVMHAChecker.java      |   0
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |   0
 .../kvm/resource/KVMHAVMActivityChecker.java       |   0
 .../kvm/resource/LibvirtCapXMLParser.java          |   0
 .../kvm/resource/LibvirtComputingResource.java     |   0
 .../hypervisor/kvm/resource/LibvirtConnection.java |   0
 .../kvm/resource/LibvirtDomainXMLParser.java       |   0
 .../hypervisor/kvm/resource/LibvirtNetworkDef.java |   0
 .../hypervisor/kvm/resource/LibvirtSecretDef.java  |   0
 .../kvm/resource/LibvirtStoragePoolDef.java        |   0
 .../kvm/resource/LibvirtStoragePoolXMLParser.java  |   0
 .../kvm/resource/LibvirtStorageVolumeDef.java      |   0
 .../resource/LibvirtStorageVolumeXMLParser.java    |   0
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   0
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |   0
 .../hypervisor/kvm/resource/MigrateKVMAsync.java   |   0
 .../hypervisor/kvm/resource/OvsVifDriver.java      |   0
 .../cloud/hypervisor/kvm/resource/VifDriver.java   |   0
 .../hypervisor/kvm/resource/VifDriverBase.java     |   0
 .../wrapper/LibvirtAttachIsoCommandWrapper.java    |   0
 .../LibvirtBackupSnapshotCommandWrapper.java       |   0
 ...LibvirtCheckConsoleProxyLoadCommandWrapper.java |   0
 .../wrapper/LibvirtCheckHealthCommandWrapper.java  |   0
 .../wrapper/LibvirtCheckNetworkCommandWrapper.java |   0
 .../wrapper/LibvirtCheckOnHostCommandWrapper.java  |   0
 .../wrapper/LibvirtCheckSshCommandWrapper.java     |   0
 .../resource/wrapper/LibvirtCheckUrlCommand.java   |   0
 ...CheckVMActivityOnStoragePoolCommandWrapper.java |   0
 .../LibvirtCheckVirtualMachineCommandWrapper.java  |   0
 .../LibvirtCleanupNetworkRulesCommandWrapper.java  |   0
 .../LibvirtConsoleProxyLoadCommandWrapper.java     |   0
 .../wrapper/LibvirtCopyVolumeCommandWrapper.java   |   0
 .../wrapper/LibvirtCreateCommandWrapper.java       |   0
 ...ePrivateTemplateFromSnapshotCommandWrapper.java |   0
 ...atePrivateTemplateFromVolumeCommandWrapper.java |   0
 .../LibvirtCreateStoragePoolCommandWrapper.java    |   0
 .../LibvirtCreateVMSnapshotCommandWrapper.java     |   0
 ...virtCreateVolumeFromSnapshotCommandWrapper.java |   0
 .../LibvirtDeleteStoragePoolCommandWrapper.java    |   0
 .../LibvirtDeleteVMSnapshotCommandWrapper.java     |   0
 .../wrapper/LibvirtDestroyCommandWrapper.java      |   0
 .../wrapper/LibvirtFenceCommandWrapper.java        |   0
 .../wrapper/LibvirtGetHostStatsCommandWrapper.java |   0
 .../LibvirtGetStorageStatsCommandWrapper.java      |   0
 .../LibvirtGetVmDiskStatsCommandWrapper.java       |   0
 .../LibvirtGetVmIpAddressCommandWrapper.java       |   0
 .../LibvirtGetVmNetworkStatsCommandWrapper.java    |   0
 .../wrapper/LibvirtGetVmStatsCommandWrapper.java   |   0
 .../wrapper/LibvirtGetVncPortCommandWrapper.java   |   0
 .../LibvirtGetVolumeStatsCommandWrapper.java       |   0
 .../wrapper/LibvirtMaintainCommandWrapper.java     |   0
 .../LibvirtManageSnapshotCommandWrapper.java       |   0
 .../wrapper/LibvirtMigrateCommandWrapper.java      |   0
 .../LibvirtMigrateVolumeCommandWrapper.java        |   0
 .../LibvirtModifySshKeysCommandWrapper.java        |   0
 .../LibvirtModifyStoragePoolCommandWrapper.java    |   0
 .../LibvirtModifyTargetsCommandWrapper.java        |   0
 .../LibvirtNetworkElementCommandWrapper.java       |   0
 .../LibvirtNetworkRulesSystemVmCommandWrapper.java |   0
 ...irtNetworkRulesVmSecondaryIpCommandWrapper.java |   0
 .../wrapper/LibvirtNetworkUsageCommandWrapper.java |   0
 .../LibvirtOvsCreateTunnelCommandWrapper.java      |   0
 .../LibvirtOvsDestroyBridgeCommandWrapper.java     |   0
 .../LibvirtOvsDestroyTunnelCommandWrapper.java     |   0
 .../LibvirtOvsFetchInterfaceCommandWrapper.java    |   0
 .../LibvirtOvsSetupBridgeCommandWrapper.java       |   0
 ...OvsVpcPhysicalTopologyConfigCommandWrapper.java |   0
 ...irtOvsVpcRoutingPolicyConfigCommandWrapper.java |   0
 .../wrapper/LibvirtPingTestCommandWrapper.java     |   0
 .../wrapper/LibvirtPlugNicCommandWrapper.java      |   0
 .../LibvirtPrepareForMigrationCommandWrapper.java  |   0
 ...ibvirtPrimaryStorageDownloadCommandWrapper.java |   0
 .../wrapper/LibvirtPvlanSetupCommandWrapper.java   |   0
 .../wrapper/LibvirtReadyCommandWrapper.java        |   0
 .../wrapper/LibvirtRebootCommandWrapper.java       |   0
 .../wrapper/LibvirtRebootRouterCommandWrapper.java |   0
 .../resource/wrapper/LibvirtRequestWrapper.java    |   0
 .../wrapper/LibvirtResizeVolumeCommandWrapper.java |   0
 .../LibvirtRestoreVMSnapshotCommandWrapper.java    |   0
 .../LibvirtRevertSnapshotCommandWrapper.java       |   0
 .../LibvirtRevertToVMSnapshotCommandWrapper.java   |   0
 .../LibvirtSecurityGroupRulesCommandWrapper.java   |   0
 .../LibvirtSetHostParamsCommandWrapper.java        |   0
 .../wrapper/LibvirtStartCommandWrapper.java        |   0
 .../wrapper/LibvirtStopCommandWrapper.java         |   0
 .../LibvirtStorageSubSystemCommandWrapper.java     |   0
 .../wrapper/LibvirtUnPlugNicCommandWrapper.java    |   0
 .../LibvirtUpdateHostPasswordCommandWrapper.java   |   0
 .../LibvirtUpgradeSnapshotCommandWrapper.java      |   0
 .../resource/wrapper/LibvirtUtilitiesHelper.java   |   0
 ...LibvirtWatchConsoleProxyLoadCommandWrapper.java |   0
 .../kvm/storage/IscsiAdmStorageAdaptor.java        |   0
 .../kvm/storage/IscsiAdmStoragePool.java           |   0
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java    |   0
 .../hypervisor/kvm/storage/KVMStoragePool.java     |   0
 .../kvm/storage/KVMStoragePoolManager.java         |   0
 .../kvm/storage/KVMStorageProcessor.java           |   0
 .../hypervisor/kvm/storage/KVMStorageResource.java |   0
 .../hypervisor/kvm/storage/KVMVirtualDisk.java     |   0
 .../kvm/storage/LibvirtStorageAdaptor.java         |   0
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |   0
 .../kvm/storage/ManagedNfsStorageAdaptor.java      |   0
 .../hypervisor/kvm/storage/StorageAdaptor.java     |   0
 .../hypervisor/kvm/storage/StorageAdaptorInfo.java |   0
 .../org/apache/cloudstack/kvm/ha/KVMHAConfig.java  |   0
 .../apache/cloudstack/kvm/ha/KVMHAProvider.java    |   0
 .../cloudstack/kvm/ha/KVMHostActivityChecker.java  |   0
 .../org/apache/cloudstack/utils/linux/CPUStat.java |   0
 .../org/apache/cloudstack/utils/linux/MemStat.java |   0
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |   0
 .../cloudstack/utils/qemu/QemuImgException.java    |   0
 .../apache/cloudstack/utils/qemu/QemuImgFile.java  |   0
 .../cloudstack/kvm-compute/module.properties       |   0
 .../kvm-compute/spring-kvm-compute-context.xml     |   0
 .../kvm/resource/LibvirtComputingResourceTest.java |   0
 .../kvm/resource/LibvirtDomainXMLParserTest.java   |   0
 .../kvm/resource/LibvirtSecretDefTest.java         |   0
 .../kvm/resource/LibvirtStoragePoolDefTest.java    |   0
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   0
 .../kvm/resource/LibvirtVifDriverTest.java         |   0
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  |   0
 .../LibvirtNetworkElementCommandWrapperTest.java   |   0
 .../LibvirtReplugNicCommandWrapperTest.java        |   0
 .../wrapper/LibvirtUtilitiesHelperTest.java        |   0
 .../kvm/storage/KVMPhysicalDiskTest.java           |   0
 .../kvm/storage/KVMStorageProcessorTest.java       |   0
 .../kvm/storage/LibvirtStoragePoolTest.java        |   0
 .../apache/cloudstack/kvm/ha/KVMHostHATest.java    |   0
 .../apache/cloudstack/utils/linux/MemStatTest.java |   0
 .../cloudstack/utils/qemu/QemuImgFileTest.java     |   0
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |   0
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java    |   0
 .../java}/com/cloud/ovm/hypervisor/OvmFencer.java  |   0
 .../java}/com/cloud/ovm/hypervisor/OvmGuru.java    |   0
 .../java}/com/cloud/ovm/hypervisor/OvmHelper.java  |   0
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  |   0
 .../java}/com/cloud/ovm/object/Coder.java          |   0
 .../java}/com/cloud/ovm/object/Connection.java     |   0
 .../java}/com/cloud/ovm/object/OvmBridge.java      |   0
 .../java}/com/cloud/ovm/object/OvmDisk.java        |   0
 .../java}/com/cloud/ovm/object/OvmHost.java        |   0
 .../java}/com/cloud/ovm/object/OvmObject.java      |   0
 .../com/cloud/ovm/object/OvmSecurityGroup.java     |   0
 .../java}/com/cloud/ovm/object/OvmStoragePool.java |   0
 .../java}/com/cloud/ovm/object/OvmVif.java         |   0
 .../java}/com/cloud/ovm/object/OvmVlan.java        |   0
 .../java}/com/cloud/ovm/object/OvmVm.java          |   0
 .../java}/com/cloud/ovm/object/OvmVolume.java      |   0
 .../{ => main/java}/com/cloud/ovm/object/Test.java |   0
 .../cloudstack/ovm-compute/module.properties       |   0
 .../ovm-compute/spring-ovm-compute-context.xml     |   0
 .../cloudstack/ovm-discoverer/module.properties    |   0
 .../spring-ovm-discoverer-context.xml              |   0
 .../scripts/vm/hypervisor/ovm/ConfigFileOps.py     |   0
 .../scripts/vm/hypervisor/ovm/OvmCommonModule.py   |   0
 .../scripts/vm/hypervisor/ovm/OvmDiskModule.py     |   0
 .../scripts/vm/hypervisor/ovm/OvmDispatcher.py     |   0
 .../scripts/vm/hypervisor/ovm/OvmFaultConstants.py |   0
 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py      |   0
 .../scripts/vm/hypervisor/ovm/OvmHostModule.py     |   0
 .../scripts/vm/hypervisor/ovm/OvmLoggerModule.py   |   0
 .../scripts/vm/hypervisor/ovm/OvmNetworkModule.py  |   0
 .../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py    |   0
 .../scripts/vm/hypervisor/ovm/OvmObjectModule.py   |   0
 .../vm/hypervisor/ovm/OvmSecurityGroupModule.py    |   0
 .../vm/hypervisor/ovm/OvmStoragePoolModule.py      |   0
 .../scripts/vm/hypervisor/ovm/OvmVifModule.py      |   0
 .../main}/scripts/vm/hypervisor/ovm/OvmVmModule.py |   0
 .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |   0
 .../scripts/vm/hypervisor/ovm/configureOvm.sh      |   0
 plugins/hypervisors/ovm3/pom.xml                   |  17 ----
 .../ovm3/resources/Ovm3HypervisorResourceTest.java |   3 -
 plugins/hypervisors/simulator/pom.xml              |   1 -
 .../com/cloud/agent/manager/MockAgentManager.java  |   0
 .../cloud/agent/manager/MockAgentManagerImpl.java  |   0
 .../cloud/agent/manager/MockNetworkManager.java    |   0
 .../agent/manager/MockNetworkManagerImpl.java      |   0
 .../cloud/agent/manager/MockStorageManager.java    |   0
 .../agent/manager/MockStorageManagerImpl.java      |   0
 .../com/cloud/agent/manager/MockVmManager.java     |   0
 .../com/cloud/agent/manager/MockVmManagerImpl.java |   0
 .../com/cloud/agent/manager/SimulatorInfo.java     |   0
 .../com/cloud/agent/manager/SimulatorManager.java  |   0
 .../cloud/agent/manager/SimulatorManagerImpl.java  |   0
 .../api/commands/CleanupSimulatorMockCmd.java      |   0
 .../cloud/api/commands/ConfigureSimulatorCmd.java  |   0
 .../ConfigureSimulatorHAProviderState.java         |   0
 .../commands/ListSimulatorHAStateTransitions.java  |   0
 .../cloud/api/commands/QuerySimulatorMockCmd.java  |   0
 .../api/commands/SimulatorAddSecondaryAgent.java   |   0
 .../java}/com/cloud/api/response/MockResponse.java |   0
 .../api/response/SimulatorHAStateResponse.java     |   0
 .../java}/com/cloud/ha/SimulatorFencer.java        |   0
 .../java}/com/cloud/ha/SimulatorInvestigator.java  |   0
 .../com/cloud/resource/AgentResourceBase.java      |   0
 .../com/cloud/resource/AgentRoutingResource.java   |   0
 .../com/cloud/resource/AgentStorageResource.java   |   0
 .../com/cloud/resource/SimulatorDiscoverer.java    |   0
 .../resource/SimulatorSecondaryDiscoverer.java     |   0
 .../cloud/resource/SimulatorStorageProcessor.java  |   0
 .../com/cloud/simulator/MockConfigurationVO.java   |   0
 .../java}/com/cloud/simulator/MockHost.java        |   0
 .../java}/com/cloud/simulator/MockHostVO.java      |   0
 .../com/cloud/simulator/MockSecStorageVO.java      |   0
 .../com/cloud/simulator/MockSecurityRulesVO.java   |   0
 .../com/cloud/simulator/MockStoragePoolVO.java     |   0
 .../java}/com/cloud/simulator/MockVMVO.java        |   0
 .../java}/com/cloud/simulator/MockVm.java          |   0
 .../java}/com/cloud/simulator/MockVolumeVO.java    |   0
 .../java}/com/cloud/simulator/SimulatorGuru.java   |   0
 .../cloud/simulator/SimulatorRuntimeException.java |   0
 .../cloud/simulator/dao/MockConfigurationDao.java  |   0
 .../simulator/dao/MockConfigurationDaoImpl.java    |   0
 .../java}/com/cloud/simulator/dao/MockHostDao.java |   0
 .../com/cloud/simulator/dao/MockHostDaoImpl.java   |   0
 .../com/cloud/simulator/dao/MockSecStorageDao.java |   0
 .../cloud/simulator/dao/MockSecStorageDaoImpl.java |   0
 .../cloud/simulator/dao/MockSecurityRulesDao.java  |   0
 .../simulator/dao/MockSecurityRulesDaoImpl.java    |   0
 .../cloud/simulator/dao/MockStoragePoolDao.java    |   0
 .../simulator/dao/MockStoragePoolDaoImpl.java      |   0
 .../java}/com/cloud/simulator/dao/MockVMDao.java   |   0
 .../com/cloud/simulator/dao/MockVMDaoImpl.java     |   0
 .../com/cloud/simulator/dao/MockVolumeDao.java     |   0
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |   0
 .../apache/cloudstack/ha/SimulatorHAProvider.java  |   0
 .../org/apache/cloudstack/ha/SimulatorHAState.java |   0
 .../driver/SimulatorImageStoreDriverImpl.java      |   0
 .../SimulatorImageStoreLifeCycleImpl.java          |   0
 .../provider/SimulatorImageStoreProviderImpl.java  |   0
 .../motion/SimulatorDataMotionStrategy.java        |   0
 .../SimulatorSecondaryStorageResource.java         |   0
 .../core/spring-simulator-core-context.xml         |   0
 .../cloudstack/simulator-compute/module.properties |   0
 .../spring-simulator-compute-context.xml           |   0
 .../simulator-discoverer/module.properties         |   0
 .../spring-simulator-discover-context.xml          |   0
 .../cloudstack/simulator-storage/module.properties |   0
 .../spring-simulator-storage-context.xml           |   0
 plugins/hypervisors/ucs/pom.xml                    |   0
 .../java}/com/cloud/ucs/database/UcsBladeDao.java  |   0
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java    |   0
 .../java}/com/cloud/ucs/database/UcsBladeVO.java   |   0
 .../com/cloud/ucs/database/UcsManagerDao.java      |   0
 .../com/cloud/ucs/database/UcsManagerDaoImpl.java  |   0
 .../java}/com/cloud/ucs/database/UcsManagerVO.java |   0
 .../com/cloud/ucs/manager/StringTemplate.java      |   0
 .../java}/com/cloud/ucs/manager/UcsCommands.java   |   0
 .../java}/com/cloud/ucs/manager/UcsHttpClient.java |   0
 .../java}/com/cloud/ucs/manager/UcsManager.java    |   0
 .../com/cloud/ucs/manager/UcsManagerImpl.java      |   0
 .../com/cloud/ucs/structure/ComputeBlade.java      |   0
 .../java}/com/cloud/ucs/structure/UcsCookie.java   |   0
 .../java}/com/cloud/ucs/structure/UcsProfile.java  |   0
 .../apache/cloudstack/api/AddUcsManagerCmd.java    |   0
 .../api/AssociateUcsProfileToBladeCmd.java         |   0
 .../apache/cloudstack/api/DeleteUcsManagerCmd.java |   0
 .../org/apache/cloudstack/api/ListUcsBladeCmd.java |   0
 .../apache/cloudstack/api/ListUcsManagerCmd.java   |   0
 .../apache/cloudstack/api/ListUcsProfileCmd.java   |   0
 .../cloudstack/api/response/UcsBladeResponse.java  |   0
 .../api/response/UcsManagerResponse.java           |   0
 .../api/response/UcsProfileResponse.java           |   0
 .../cloudstack/core/spring-ucs-core-context.xml    |   0
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |   0
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   0
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   0
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |   0
 .../cloud/api/response/CiscoNexusVSMResponse.java  |   0
 .../{ => main/java}/com/cloud/ha/VmwareFencer.java |   0
 .../java}/com/cloud/ha/VmwareInvestigator.java     |   0
 .../com/cloud/hypervisor/guru/VMwareGuru.java      |   0
 .../com/cloud/hypervisor/vmware/LegacyZone.java    |   0
 .../com/cloud/hypervisor/vmware/LegacyZoneVO.java  |   0
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |   0
 .../cloud/hypervisor/vmware/VmwareDatacenter.java  |   0
 .../hypervisor/vmware/VmwareDatacenterService.java |   0
 .../hypervisor/vmware/VmwareDatacenterVO.java      |   0
 .../hypervisor/vmware/VmwareDatacenterZoneMap.java |   0
 .../vmware/VmwareDatacenterZoneMapVO.java          |   0
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   0
 .../cloud/hypervisor/vmware/dao/LegacyZoneDao.java |   0
 .../hypervisor/vmware/dao/LegacyZoneDaoImpl.java   |   0
 .../hypervisor/vmware/dao/VmwareDatacenterDao.java |   0
 .../vmware/dao/VmwareDatacenterDaoImpl.java        |   0
 .../vmware/dao/VmwareDatacenterZoneMapDao.java     |   0
 .../vmware/dao/VmwareDatacenterZoneMapDaoImpl.java |   0
 .../manager/CleanupFullyClonedTemplatesTask.java   |   0
 .../vmware/manager/VmwareHostService.java          |   0
 .../hypervisor/vmware/manager/VmwareManager.java   |   0
 .../vmware/manager/VmwareManagerImpl.java          |   0
 .../vmware/manager/VmwareStorageManager.java       |   0
 .../vmware/manager/VmwareStorageManagerImpl.java   |   0
 .../vmware/manager/VmwareStorageMount.java         |   0
 .../vmware/resource/VmwareContextFactory.java      |   0
 .../hypervisor/vmware/resource/VmwareResource.java |   0
 .../com/cloud/network/CiscoNexusVSMDevice.java     |   0
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |   0
 .../com/cloud/network/CiscoNexusVSMDeviceVO.java   |   0
 .../com/cloud/network/VmwareTrafficLabel.java      |   0
 .../cloud/network/dao/CiscoNexusVSMDeviceDao.java  |   0
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java    |   0
 .../network/element/CiscoNexusVSMElement.java      |   0
 .../element/CiscoNexusVSMElementService.java       |   0
 .../resource/PremiumSecondaryStorageResource.java  |   0
 .../VmwareSecondaryStorageContextFactory.java      |   0
 .../VmwareSecondaryStorageResourceHandler.java     |   0
 .../resource/VmwareStorageLayoutHelper.java        |   0
 .../storage/resource/VmwareStorageLayoutType.java  |   0
 .../storage/resource/VmwareStorageProcessor.java   |   0
 .../VmwareStorageSubsystemCommandHandler.java      |   0
 .../api/command/admin/zone/AddVmwareDcCmd.java     |   0
 .../api/command/admin/zone/ListVmwareDcsCmd.java   |   0
 .../api/command/admin/zone/RemoveVmwareDcCmd.java  |   0
 .../api/response/VmwareDatacenterResponse.java     |   0
 .../motion/VmwareStorageMotionStrategy.java        |   0
 .../cloudstack/core/spring-vmware-core-context.xml |   0
 .../cloudstack/vmware-compute/module.properties    |   0
 .../spring-vmware-compute-context.xml              |   0
 .../vmware-compute/vmware-defaults.properties      |   0
 .../cloudstack/vmware-discoverer/module.properties |   0
 .../spring-vmware-discoverer-context.xml           |   0
 .../cloudstack/vmware-network/module.properties    |   0
 .../spring-vmware-network-context.xml              |   0
 .../cloudstack/vmware-storage/module.properties    |   0
 .../spring-vmware-storage-context.xml              |   0
 .../com/cloud/hypervisor/guru/VMwareGuruTest.java  |   0
 .../vmware/VmwareDatacenterApiUnitTest.java        |   0
 .../vmware/resource/VmwareResourceTest.java        |   0
 .../motion/VmwareStorageMotionStrategyTest.java    |   0
 .../java}/com/cloud/ha/XenServerFencer.java        |   0
 .../java}/com/cloud/hypervisor/XenServerGuru.java  |   0
 .../xenserver/discoverer/XcpServerDiscoverer.java  |   0
 .../xenserver/resource/CitrixHelper.java           |   0
 .../xenserver/resource/CitrixResourceBase.java     |   0
 .../xenserver/resource/XcpOssResource.java         |   0
 .../xenserver/resource/XcpServerResource.java      |   0
 .../xenserver/resource/XenServer56FP1Resource.java |   0
 .../xenserver/resource/XenServer56Resource.java    |   0
 .../xenserver/resource/XenServer56SP2Resource.java |   0
 .../xenserver/resource/XenServer600Resource.java   |   0
 .../xenserver/resource/XenServer610Resource.java   |   0
 .../xenserver/resource/XenServer620Resource.java   |   0
 .../resource/XenServer620SP1Resource.java          |   0
 .../xenserver/resource/XenServer650Resource.java   |   0
 .../resource/XenServerConnectionPool.java          |   0
 .../resource/XenServerStorageProcessor.java        |   0
 .../xenserver/resource/Xenserver625Resource.java   |   0
 .../resource/Xenserver625StorageProcessor.java     |   0
 .../hypervisor/xenserver/resource/XsHost.java      |   0
 .../xenserver/resource/XsLocalNetwork.java         |   0
 .../xcp/XcpServerNetworkUsageCommandWrapper.java   |   0
 .../XenServer56CheckOnHostCommandWrapper.java      |   0
 .../xen56/XenServer56FenceCommandWrapper.java      |   0
 .../XenServer56NetworkUsageCommandWrapper.java     |   0
 .../xen56p1/XenServer56FP1FenceCommandWrapper.java |   0
 .../XenServer610MigrateVolumeCommandWrapper.java   |   0
 ...nServer610MigrateWithStorageCommandWrapper.java |   0
 ...10MigrateWithStorageCompleteCommandWrapper.java |   0
 ...610MigrateWithStorageReceiveCommandWrapper.java |   0
 ...ver610MigrateWithStorageSendCommandWrapper.java |   0
 .../XenServer620SP1GetGPUStatsCommandWrapper.java  |   0
 .../xenbase/CitrixAttachIsoCommandWrapper.java     |   0
 ...ixAttachOrDettachConfigDriveCommandWrapper.java |   0
 .../CitrixCheckConsoleProxyLoadCommandWrapper.java |   0
 .../xenbase/CitrixCheckHealthCommandWrapper.java   |   0
 .../xenbase/CitrixCheckNetworkCommandWrapper.java  |   0
 .../xenbase/CitrixCheckOnHostCommandWrapper.java   |   0
 .../xenbase/CitrixCheckSshCommandWrapper.java      |   0
 .../CitrixCheckVirtualMachineCommandWrapper.java   |   0
 .../CitrixCleanupNetworkRulesCmdWrapper.java       |   0
 .../CitrixClusterVMMetaDataSyncCommandWrapper.java |   0
 .../CitrixConsoleProxyLoadCommandWrapper.java      |   0
 .../xenbase/CitrixCreateCommandWrapper.java        |   0
 .../CitrixCreateStoragePoolCommandWrapper.java     |   0
 .../CitrixCreateVMSnapshotCommandWrapper.java      |   0
 .../CitrixDeleteStoragePoolCommandWrapper.java     |   0
 .../CitrixDeleteVMSnapshotCommandWrapper.java      |   0
 .../xenbase/CitrixDestroyCommandWrapper.java       |   0
 .../xenbase/CitrixGetHostStatsCommandWrapper.java  |   0
 .../CitrixGetStorageStatsCommandWrapper.java       |   0
 .../CitrixGetVmDiskStatsCommandWrapper.java        |   0
 .../CitrixGetVmIpAddressCommandWrapper.java        |   0
 .../CitrixGetVmNetworkStatsCommandWrapper.java     |   0
 .../xenbase/CitrixGetVmStatsCommandWrapper.java    |   0
 .../xenbase/CitrixGetVncPortCommandWrapper.java    |   0
 .../CitrixGetVolumeStatsCommandWrapper.java        |   0
 .../xenbase/CitrixMaintainCommandWrapper.java      |   0
 .../xenbase/CitrixMigrateCommandWrapper.java       |   0
 .../xenbase/CitrixModifySshKeysCommandWrapper.java |   0
 .../CitrixModifyStoragePoolCommandWrapper.java     |   0
 .../CitrixNetworkElementCommandWrapper.java        |   0
 .../CitrixNetworkRulesSystemVmCommandWrapper.java  |   0
 ...rixNetworkRulesVmSecondaryIpCommandWrapper.java |   0
 .../CitrixOvsCreateGreTunnelCommandWrapper.java    |   0
 .../CitrixOvsCreateTunnelCommandWrapper.java       |   0
 .../xenbase/CitrixOvsDeleteFlowCommandWrapper.java |   0
 .../CitrixOvsDestroyBridgeCommandWrapper.java      |   0
 .../CitrixOvsDestroyTunnelCommandWrapper.java      |   0
 .../CitrixOvsFetchInterfaceCommandWrapper.java     |   0
 .../CitrixOvsSetTagAndFlowCommandWrapper.java      |   0
 .../CitrixOvsSetupBridgeCommandWrapper.java        |   0
 ...OvsVpcPhysicalTopologyConfigCommandWrapper.java |   0
 ...rixOvsVpcRoutingPolicyConfigCommandWrapper.java |   0
 .../CitrixPerformanceMonitorCommandWrapper.java    |   0
 .../xenbase/CitrixPingTestCommandWrapper.java      |   0
 .../xenbase/CitrixPlugNicCommandWrapper.java       |   0
 .../CitrixPrepareForMigrationCommandWrapper.java   |   0
 ...CitrixPrimaryStorageDownloadCommandWrapper.java |   0
 .../xenbase/CitrixPvlanSetupCommandWrapper.java    |   0
 .../wrapper/xenbase/CitrixReadyCommandWrapper.java |   0
 .../xenbase/CitrixRebootCommandWrapper.java        |   0
 .../xenbase/CitrixRebootRouterCommandWrapper.java  |   0
 .../wrapper/xenbase/CitrixRequestWrapper.java      |   0
 .../xenbase/CitrixResizeVolumeCommandWrapper.java  |   0
 .../CitrixRevertToVMSnapshotCommandWrapper.java    |   0
 .../xenbase/CitrixScaleVmCommandWrapper.java       |   0
 .../CitrixSecurityGroupRulesCommandWrapper.java    |   0
 .../wrapper/xenbase/CitrixSetupCommandWrapper.java |   0
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |   0
 .../wrapper/xenbase/CitrixStopCommandWrapper.java  |   0
 .../CitrixStorageSubSystemCommandWrapper.java      |   0
 .../xenbase/CitrixUnPlugNicCommandWrapper.java     |   0
 .../CitrixUpdateHostPasswordCommandWrapper.java    |   0
 .../CitrixUpgradeSnapshotCommandWrapper.java       |   0
 .../CitrixWatchConsoleProxyLoadCommandWrapper.java |   0
 .../wrapper/xenbase/XenServerUtilitiesHelper.java  |   0
 .../xenserver/XenServerResourceNewBase.java        |   0
 .../hypervisor/xenserver/XenserverConfigs.java     |   0
 .../motion/XenServerStorageMotionStrategy.java     |   0
 .../cloudstack/xenserver-compute/module.properties |   0
 .../spring-xenserver-compute-context.xml           |   0
 .../xenserver-discoverer/module.properties         |   0
 .../spring-xenserver-discoverer-context.xml        |   0
 .../cloud}/cloud/hypervisor/XenServerGuruTest.java |   0
 .../xenserver/resource/CitrixHelperTest.java       |   0
 .../xenserver/resource/CitrixResourceBaseTest.java |   0
 .../xenserver/resource/XcpOssResourceTest.java     |   0
 .../xenserver/resource/XcpServerResourceTest.java  |   0
 .../resource/XenServer56FP1ResourceTest.java       |   0
 .../resource/XenServer56ResourceTest.java          |   0
 .../resource/XenServer56SP2ResourceTest.java       |   0
 .../resource/XenServer600ResourceTest.java         |   0
 .../resource/XenServer625ResourceTest.java         |   0
 .../resource/XenServer650ResourceTest.java         |   0
 .../wrapper/xenbase/CitrixRequestWrapperTest.java  |   0
 .../wrapper/xenbase/XcpServerWrapperTest.java      |   0
 .../wrapper/xenbase/XenServer56FP1WrapperTest.java |   0
 .../wrapper/xenbase/XenServer56WrapperTest.java    |   0
 .../wrapper/xenbase/XenServer610WrapperTest.java   |   0
 .../xenbase/XenServer620SP1WrapperTest.java        |   0
 .../wrapper/xenbase/XenServer620WrapperTest.java   |   0
 .../cloudstack/cloudian/CloudianConnector.java     |   0
 .../cloudstack/cloudian/CloudianConnectorImpl.java |   0
 .../cloudian/api/CloudianIsEnabledCmd.java         |   0
 .../cloudian/api/CloudianSsoLoginCmd.java          |   0
 .../cloudstack/cloudian/client/CloudianClient.java |   0
 .../cloudstack/cloudian/client/CloudianGroup.java  |   0
 .../cloudstack/cloudian/client/CloudianUser.java   |   0
 .../cloudstack/cloudian/client/CloudianUtils.java  |   0
 .../cloudian/response/CloudianEnabledResponse.java |   0
 .../response/CloudianSsoLoginResponse.java         |   0
 .../META-INF/cloudstack/cloudian/module.properties |   0
 .../cloudian/spring-cloudian-context.xml           |   0
 .../cloudstack/cloudian/CloudianClientTest.java    |   0
 .../cloudstack/metrics/PrometheusExporter.java     |   0
 .../cloudstack/metrics/PrometheusExporterImpl.java |   0
 .../metrics/PrometheusExporterServer.java          |   0
 .../metrics/PrometheusExporterServerImpl.java      |   0
 .../cloudstack/prometheus/module.properties        |   0
 .../prometheus/spring-prometheus-context.xml       |   0
 .../cloudstack/api/ListClustersMetricsCmd.java     |   0
 .../apache/cloudstack/api/ListHostsMetricsCmd.java |   0
 .../cloudstack/api/ListInfrastructureCmd.java      |   0
 .../cloudstack/api/ListStoragePoolsMetricsCmd.java |   0
 .../apache/cloudstack/api/ListVMsMetricsCmd.java   |   0
 .../cloudstack/api/ListVolumesMetricsCmd.java      |   0
 .../apache/cloudstack/api/ListZonesMetricsCmd.java |   0
 .../apache/cloudstack/metrics/MetricsService.java  |   0
 .../cloudstack/metrics/MetricsServiceImpl.java     |   0
 .../response/ClusterMetricsResponse.java           |   0
 .../cloudstack/response/HostMetricsResponse.java   |   0
 .../response/InfrastructureResponse.java           |   0
 .../response/StoragePoolMetricsResponse.java       |   0
 .../cloudstack/response/VmMetricsResponse.java     |   0
 .../cloudstack/response/VolumeMetricsResponse.java |   0
 .../cloudstack/response/ZoneMetricsResponse.java   |   0
 .../META-INF/cloudstack/metrics/module.properties  |   0
 .../cloudstack/metrics/spring-metrics-context.xml  |   0
 .../java}/com/cloud/agent/api/BcfAnswer.java       |   0
 .../java}/com/cloud/agent/api/BcfCommand.java      |   0
 .../cloud/agent/api/CacheBcfTopologyCommand.java   |   0
 .../agent/api/CreateBcfAttachmentCommand.java      |   0
 .../cloud/agent/api/CreateBcfRouterCommand.java    |   0
 .../agent/api/CreateBcfRouterInterfaceCommand.java |   0
 .../cloud/agent/api/CreateBcfSegmentCommand.java   |   0
 .../cloud/agent/api/CreateBcfStaticNatCommand.java |   0
 .../agent/api/DeleteBcfAttachmentCommand.java      |   0
 .../cloud/agent/api/DeleteBcfSegmentCommand.java   |   0
 .../cloud/agent/api/DeleteBcfStaticNatCommand.java |   0
 .../cloud/agent/api/GetControllerDataAnswer.java   |   0
 .../cloud/agent/api/GetControllerDataCommand.java  |   0
 .../cloud/agent/api/GetControllerHostsAnswer.java  |   0
 .../cloud/agent/api/GetControllerHostsCommand.java |   0
 .../agent/api/StartupBigSwitchBcfCommand.java      |   0
 .../cloud/agent/api/SyncBcfTopologyCommand.java    |   0
 .../agent/api/UpdateBcfAttachmentCommand.java      |   0
 .../cloud/agent/api/UpdateBcfRouterCommand.java    |   0
 .../api/commands/AddBigSwitchBcfDeviceCmd.java     |   0
 .../java}/com/cloud/api/commands/BcfConstants.java |   0
 .../api/commands/DeleteBigSwitchBcfDeviceCmd.java  |   0
 .../api/commands/ListBigSwitchBcfDevicesCmd.java   |   0
 .../api/response/BigSwitchBcfDeviceResponse.java   |   0
 .../com/cloud/network/BigSwitchBcfDeviceVO.java    |   0
 .../java}/com/cloud/network/bigswitch/AclData.java |   0
 .../cloud/network/bigswitch/AttachmentData.java    |   0
 .../cloud/network/bigswitch/BigSwitchBcfApi.java   |   0
 .../bigswitch/BigSwitchBcfApiException.java        |   0
 .../cloud/network/bigswitch/BigSwitchBcfUtils.java |   0
 .../cloud/network/bigswitch/BigSwitchStatus.java   |   0
 .../com/cloud/network/bigswitch/Capabilities.java  |   0
 .../network/bigswitch/ControlClusterData.java      |   0
 .../network/bigswitch/ControlClusterStatus.java    |   0
 .../cloud/network/bigswitch/ControllerData.java    |   0
 .../cloud/network/bigswitch/FloatingIpData.java    |   0
 .../com/cloud/network/bigswitch/NetworkData.java   |   0
 .../com/cloud/network/bigswitch/RouterData.java    |   0
 .../network/bigswitch/RouterInterfaceData.java     |   0
 .../com/cloud/network/bigswitch/TopologyData.java  |   0
 .../bigswitch/TrustingProtocolSocketFactory.java   |   0
 .../com/cloud/network/dao/BigSwitchBcfDao.java     |   0
 .../com/cloud/network/dao/BigSwitchBcfDaoImpl.java |   0
 .../cloud/network/element/BigSwitchBcfElement.java |   0
 .../element/BigSwitchBcfElementService.java        |   0
 .../network/guru/BigSwitchBcfGuestNetworkGuru.java |   0
 .../network/resource/BigSwitchBcfResource.java     |   0
 .../cloudstack/bigswitch/module.properties         |   0
 .../bigswitch/spring-bigswitch-context.xml         |   0
 .../cloud/network/bigswitch/BigSwitchApiTest.java  |   0
 .../network/bigswitch/BigSwitchBcfUtilsTest.java   |   0
 .../network/resource/BigSwitchBcfResourceTest.java |   0
 plugins/network-elements/brocade-vcs/pom.xml       |  12 +--
 .../agent/api/AssociateMacToNetworkAnswer.java     |   0
 .../agent/api/AssociateMacToNetworkCommand.java    |   0
 .../com/cloud/agent/api/CreateNetworkAnswer.java   |   0
 .../com/cloud/agent/api/CreateNetworkCommand.java  |   0
 .../com/cloud/agent/api/DeleteNetworkAnswer.java   |   0
 .../com/cloud/agent/api/DeleteNetworkCommand.java  |   0
 .../api/DisassociateMacFromNetworkAnswer.java      |   0
 .../api/DisassociateMacFromNetworkCommand.java     |   0
 .../cloud/agent/api/StartupBrocadeVcsCommand.java  |   0
 .../cloud/api/commands/AddBrocadeVcsDeviceCmd.java |   0
 .../api/commands/DeleteBrocadeVcsDeviceCmd.java    |   0
 .../commands/ListBrocadeVcsDeviceNetworksCmd.java  |   0
 .../api/commands/ListBrocadeVcsDevicesCmd.java     |   0
 .../api/response/BrocadeVcsDeviceResponse.java     |   0
 .../com/cloud/network/BrocadeVcsDeviceVO.java      |   0
 .../network/BrocadeVcsNetworkVlanMappingVO.java    |   0
 .../com/cloud/network/brocade/BrocadeVcsApi.java   |   0
 .../network/brocade/BrocadeVcsApiException.java    |   0
 .../java}/com/cloud/network/brocade/Constants.java |   0
 .../java}/com/cloud/network/dao/BrocadeVcsDao.java |   0
 .../com/cloud/network/dao/BrocadeVcsDaoImpl.java   |   0
 .../dao/BrocadeVcsNetworkVlanMappingDao.java       |   0
 .../dao/BrocadeVcsNetworkVlanMappingDaoImpl.java   |   0
 .../cloud/network/element/BrocadeVcsElement.java   |   0
 .../network/element/BrocadeVcsElementService.java  |   0
 .../network/guru/BrocadeVcsGuestNetworkGuru.java   |   0
 .../cloud/network/resource/BrocadeVcsResource.java |   0
 .../main}/resources/BrocadeInterfaceSchema.xsd     |   0
 .../main}/resources/BrocadePortProfileSchema.xsd   |   0
 .../main}/resources/BrocadeShowVcsSchema.xsd       |   0
 .../META-INF/cloudstack/vcs/module.properties      |   0
 .../META-INF/cloudstack/vcs/spring-vcs-context.xml |   0
 .../cloud/network/brocade/BrocadeVcsApiTest.java   |   0
 .../guru/BrocadeVcsGuestNetworkGuruTest.java       |   0
 .../network/resource/BrocadeVcsResourceTest.java   |   0
 ...AssociateAsaWithLogicalEdgeFirewallCommand.java |   0
 .../api/CleanupLogicalEdgeFirewallCommand.java     |   0
 .../agent/api/ConfigureNexusVsmForAsaCommand.java  |   0
 .../api/CreateLogicalEdgeFirewallCommand.java      |   0
 .../api/commands/AddCiscoAsa1000vResourceCmd.java  |   0
 .../api/commands/AddCiscoVnmcResourceCmd.java      |   0
 .../commands/DeleteCiscoAsa1000vResourceCmd.java   |   0
 .../api/commands/DeleteCiscoVnmcResourceCmd.java   |   0
 .../commands/ListCiscoAsa1000vResourcesCmd.java    |   0
 .../api/commands/ListCiscoVnmcResourcesCmd.java    |   0
 .../response/CiscoAsa1000vResourceResponse.java    |   0
 .../api/response/CiscoVnmcResourceResponse.java    |   0
 .../cloud/network/cisco/CiscoAsa1000vDevice.java   |   0
 .../cloud/network/cisco/CiscoAsa1000vDeviceVO.java |   0
 .../cloud/network/cisco/CiscoVnmcConnection.java   |   0
 .../network/cisco/CiscoVnmcConnectionImpl.java     |   0
 .../cloud/network/cisco/CiscoVnmcController.java   |   0
 .../cloud/network/cisco/CiscoVnmcControllerVO.java |   0
 .../cloud/network/cisco/NetworkAsa1000vMap.java    |   0
 .../cloud/network/cisco/NetworkAsa1000vMapVO.java  |   0
 .../com/cloud/network/dao/CiscoAsa1000vDao.java    |   0
 .../cloud/network/dao/CiscoAsa1000vDaoImpl.java    |   0
 .../java}/com/cloud/network/dao/CiscoVnmcDao.java  |   0
 .../com/cloud/network/dao/CiscoVnmcDaoImpl.java    |   0
 .../cloud/network/dao/NetworkAsa1000vMapDao.java   |   0
 .../network/dao/NetworkAsa1000vMapDaoImpl.java     |   0
 .../network/element/CiscoAsa1000vService.java      |   0
 .../cloud/network/element/CiscoVnmcElement.java    |   0
 .../network/element/CiscoVnmcElementService.java   |   0
 .../cloud/network/resource/CiscoVnmcResource.java  |   0
 .../cloudstack/cisco-vnmc/module.properties        |   0
 .../cisco-vnmc/spring-cisco-vnmc-context.xml       |   0
 .../main}/scripts/network/cisco/assoc-asa1000v.xml |   0
 .../network/cisco/associate-acl-policy-set.xml     |   0
 .../network/cisco/associate-dhcp-policy.xml        |   0
 .../network/cisco/associate-dhcp-server.xml        |   0
 .../network/cisco/associate-nat-policy-set.xml     |   0
 .../network/cisco/associate-route-policy.xml       |   0
 .../network/cisco/create-acl-policy-ref.xml        |   0
 .../network/cisco/create-acl-policy-set.xml        |   0
 .../scripts/network/cisco/create-acl-policy.xml    |   0
 .../network/cisco/create-acl-rule-for-dnat.xml     |   0
 .../network/cisco/create-acl-rule-for-pf.xml       |   0
 .../scripts/network/cisco/create-dhcp-policy.xml   |   0
 .../scripts/network/cisco/create-dnat-rule.xml     |   0
 .../network/cisco/create-edge-device-profile.xml   |   0
 .../cisco/create-edge-device-route-policy.xml      |   0
 .../network/cisco/create-edge-device-route.xml     |   0
 .../scripts/network/cisco/create-edge-firewall.xml |   0
 .../network/cisco/create-edge-security-profile.xml |   0
 .../network/cisco/create-egress-acl-rule.xml       |   0
 .../create-generic-egress-acl-no-protocol-rule.xml |   0
 .../cisco/create-generic-egress-acl-rule.xml       |   0
 .../cisco/create-generic-ingress-acl-rule.xml      |   0
 .../network/cisco/create-ingress-acl-rule.xml      |   0
 .../main}/scripts/network/cisco/create-ip-pool.xml |   0
 .../network/cisco/create-nat-policy-ref.xml        |   0
 .../network/cisco/create-nat-policy-set.xml        |   0
 .../scripts/network/cisco/create-nat-policy.xml    |   0
 .../main}/scripts/network/cisco/create-pf-rule.xml |   0
 .../scripts/network/cisco/create-port-pool.xml     |   0
 .../network/cisco/create-source-nat-pool.xml       |   0
 .../network/cisco/create-source-nat-rule.xml       |   0
 .../main}/scripts/network/cisco/create-tenant.xml  |   0
 .../main}/scripts/network/cisco/create-vdc.xml     |   0
 .../network/cisco/delete-acl-policy-set.xml        |   0
 .../scripts/network/cisco/delete-acl-policy.xml    |   0
 .../scripts/network/cisco/delete-edge-firewall.xml |   0
 .../network/cisco/delete-edge-security-profile.xml |   0
 .../network/cisco/delete-nat-policy-set.xml        |   0
 .../scripts/network/cisco/delete-nat-policy.xml    |   0
 .../main}/scripts/network/cisco/delete-rule.xml    |   0
 .../main}/scripts/network/cisco/delete-tenant.xml  |   0
 .../main}/scripts/network/cisco/delete-vdc.xml     |   0
 .../scripts/network/cisco/disassoc-asa1000v.xml    |   0
 .../scripts/network/cisco/list-acl-policies.xml    |   0
 .../main}/scripts/network/cisco/list-children.xml  |   0
 .../scripts/network/cisco/list-nat-policies.xml    |   0
 .../network/cisco/list-policyrefs-in-policyset.xml |   0
 .../main}/scripts/network/cisco/list-tenants.xml   |   0
 .../network/cisco/list-unassigned-asa1000v.xml     |   0
 .../{ => src/main}/scripts/network/cisco/login.xml |   0
 .../network/cisco/CiscoVnmcConnectionTest.java     |   0
 .../network/element/CiscoVnmcElementTest.java      |   0
 .../network/resource/CiscoVnmcResourceTest.java    |   0
 plugins/network-elements/dns-notifier/pom.xml      |  92 ++++++++++-----------
 .../cloudstack/network/element/DnsNotifier.java    |   0
 .../main}/resources/components-example.xml         |   0
 .../java}/com/cloud/network/ElasticLbVmMapVO.java  |   0
 .../element/ElasticLoadBalancerElement.java        |   0
 .../network/lb/ElasticLoadBalancerManager.java     |   0
 .../network/lb/ElasticLoadBalancerManagerImpl.java |   0
 .../cloud/network/lb/LoadBalanceRuleHandler.java   |   0
 .../cloud/network/lb/dao/ElasticLbVmMapDao.java    |   0
 .../network/lb/dao/ElasticLbVmMapDaoImpl.java      |   0
 .../META-INF/cloudstack/elb/module.properties      |   0
 .../META-INF/cloudstack/elb/spring-elb-context.xml |   0
 .../lb/ElasticLoadBalancerManagerImplTest.java     |   0
 .../network/lb/LoadBalanceRuleHandlerTest.java     |   0
 .../api/commands/AddExternalLoadBalancerCmd.java   |   0
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |   0
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |   0
 .../commands/DeleteExternalLoadBalancerCmd.java    |   0
 .../api/commands/DeleteF5LoadBalancerCmd.java      |   0
 .../api/commands/ListExternalLoadBalancersCmd.java |   0
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   0
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |   0
 .../cloud/api/response/F5LoadBalancerResponse.java |   0
 .../element/F5ExternalLoadBalancerElement.java     |   0
 .../F5ExternalLoadBalancerElementService.java      |   0
 .../cloud/network/resource/F5BigIpResource.java    |   0
 .../META-INF/cloudstack/f5/module.properties       |   0
 .../META-INF/cloudstack/f5/spring-f5-context.xml   |   0
 .../cloudstack/api/AddGloboDnsHostCmd.java         |   0
 .../commands/CreateOrUpdateDomainCommand.java      |   0
 .../CreateOrUpdateRecordAndReverseCommand.java     |   0
 .../cloudstack/commands/RemoveDomainCommand.java   |   0
 .../cloudstack/commands/RemoveRecordCommand.java   |   0
 .../cloudstack/commands/SignInCommand.java         |   0
 .../cloudstack/element/GloboDnsElement.java        |   0
 .../cloudstack/element/GloboDnsElementService.java |   0
 .../cloudstack/resource/GloboDnsResource.java      |   0
 .../response/GloboDnsDomainListResponse.java       |   0
 .../response/GloboDnsDomainResponse.java           |   0
 .../response/GloboDnsExportResponse.java           |   0
 .../response/GloboDnsRecordListResponse.java       |   0
 .../response/GloboDnsRecordResponse.java           |   0
 .../META-INF/cloudstack/globodns/module.properties |   0
 .../globodns/spring-globodns-context.xml           |   0
 .../cloudstack/element/GloboDnsElementTest.java    |   0
 .../cloudstack/resource/GloboDnsResourceTest.java  |   0
 .../{ => src}/test/resources/db.properties         |   0
 .../{ => src}/test/resources/log4j.properties      |   0
 .../network-elements/internal-loadbalancer/pom.xml |  21 -----
 .../element/InternalLoadBalancerElement.java       |   0
 .../network/lb/InternalLoadBalancerVMManager.java  |   0
 .../lb/InternalLoadBalancerVMManagerImpl.java      |   0
 .../core/spring-internallb-core-context.xml        |   0
 .../ElementChildTestConfiguration.java             |   0
 .../InternalLbElementServiceTest.java              |   0
 .../internallbelement/InternalLbElementTest.java   |   0
 .../internallbvmmgr/InternalLBVMManagerTest.java   |   0
 .../internallbvmmgr/InternalLBVMServiceTest.java   |   0
 .../internallbvmmgr/LbChildTestConfiguration.java  |   0
 .../{ => src}/test/resources/lb_element.xml        |   0
 .../{ => src}/test/resources/lb_mgr.xml            |   0
 .../{ => src}/test/resources/lb_svc.xml            |   0
 plugins/network-elements/juniper-contrail/pom.xml  |  16 +---
 .../api/command/CreateServiceInstanceCmd.java      |   0
 .../api/response/ServiceInstanceResponse.java      |   0
 .../contrail/management/ContrailElement.java       |   0
 .../contrail/management/ContrailElementImpl.java   |   0
 .../network/contrail/management/ContrailGuru.java  |   0
 .../contrail/management/ContrailManager.java       |   0
 .../contrail/management/ContrailManagerImpl.java   |   0
 .../management/ContrailVpcElementImpl.java         |   0
 .../network/contrail/management/DBSyncGeneric.java |   0
 .../network/contrail/management/EventUtils.java    |   0
 .../contrail/management/ManagementNetworkGuru.java |   0
 .../network/contrail/management/ModelDatabase.java |   0
 .../network/contrail/management/ServerDBSync.java  |   0
 .../contrail/management/ServerDBSyncImpl.java      |   0
 .../contrail/management/ServerEventHandler.java    |   0
 .../management/ServerEventHandlerImpl.java         |   0
 .../contrail/management/ServiceManager.java        |   0
 .../contrail/management/ServiceManagerImpl.java    |   0
 .../contrail/management/ServiceVirtualMachine.java |   0
 .../network/contrail/model/FloatingIpModel.java    |   0
 .../contrail/model/FloatingIpPoolModel.java        |   0
 .../network/contrail/model/InstanceIpModel.java    |   0
 .../network/contrail/model/ModelController.java    |   0
 .../network/contrail/model/ModelObject.java        |   0
 .../network/contrail/model/ModelObjectBase.java    |   0
 .../network/contrail/model/NetworkPolicyModel.java |   0
 .../contrail/model/ServiceInstanceModel.java       |   0
 .../network/contrail/model/VMInterfaceModel.java   |   0
 .../contrail/model/VirtualMachineModel.java        |   0
 .../contrail/model/VirtualNetworkModel.java        |   0
 .../META-INF/cloudstack/contrail/module.properties |   0
 .../contrail/spring-contrail-context.xml           |   0
 .../spring-contrail-system-context-inheritable.xml |   0
 .../contrail/management/ApiConnectorMockito.java   |   0
 .../management/IntegrationTestConfiguration.java   |   0
 .../contrail/management/ManagementServerMock.java  |   0
 .../contrail/management/MockAccountManager.java    |   0
 .../contrail/management/NetworkProviderTest.java   |   0
 .../management/ProviderTestConfiguration.java      |   0
 .../contrail/management/PublicNetworkTest.java     |   0
 .../management/PublicNetworkTestConfiguration.java |   0
 .../network/contrail/management/TestDbSetup.java   |   0
 .../contrail/model/InstanceIpModelTest.java        |   0
 .../contrail/model/VMInterfaceModelTest.java       |   0
 .../contrail/model/VirtualMachineModelTest.java    |   0
 .../contrail/model/VirtualNetworkModelTest.java    |   0
 .../{ => src}/test/resources/commonContext.xml     |   0
 .../{ => src}/test/resources/contrail.properties   |   0
 .../src}/test/resources/db.properties              |   0
 .../{ => src}/test/resources/log4j.properties      |   0
 .../{ => src}/test/resources/mysql_db_start.sh     |   0
 .../{ => src}/test/resources/mysql_db_stop.sh      |   0
 .../{ => src}/test/resources/providerContext.xml   |   0
 .../test/resources/publicNetworkContext.xml        |   0
 .../cloud/api/commands/AddExternalFirewallCmd.java |   0
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |   0
 .../api/commands/ConfigureSrxFirewallCmd.java      |   0
 .../api/commands/DeleteExternalFirewallCmd.java    |   0
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   0
 .../api/commands/ListExternalFirewallsCmd.java     |   0
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   0
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |   0
 .../cloud/api/response/SrxFirewallResponse.java    |   0
 .../element/JuniperSRXExternalFirewallElement.java |   0
 .../element/JuniperSRXFirewallElementService.java  |   0
 .../cloud/network/resource/JuniperSrxResource.java |   0
 .../META-INF/cloudstack/srx/module.properties      |   0
 .../META-INF/cloudstack/srx/spring-srx-context.xml |   0
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   0
 .../ConfigureNetscalerLoadBalancerCmd.java         |   0
 .../commands/DeleteNetscalerControlCenterCmd.java  |   0
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |   0
 .../commands/DeleteServicePackageOfferingCmd.java  |   0
 .../cloud/api/commands/DeployNetscalerVpxCmd.java  |   0
 .../commands/ListNetscalerControlCenterCmd.java    |   0
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   0
 .../commands/ListNetscalerLoadBalancersCmd.java    |   0
 .../commands/ListRegisteredServicePackageCmd.java  |   0
 .../RegisterNetscalerControlCenterCmd.java         |   0
 .../api/commands/RegisterServicePackageCmd.java    |   0
 .../com/cloud/api/commands/StopNetScalerVMCmd.java |   0
 .../response/NetScalerServicePackageResponse.java  |   0
 .../response/NetscalerControlCenterResponse.java   |   0
 .../response/NetscalerLoadBalancerResponse.java    |   0
 .../cloud/network/NetScalerControlCenterVO.java    |   0
 .../java}/com/cloud/network/NetScalerPodVO.java    |   0
 .../cloud/network/NetScalerServicePackageVO.java   |   0
 .../network/dao/NetScalerControlCenterDao.java     |   0
 .../network/dao/NetScalerControlCenterDaoImpl.java |   0
 .../com/cloud/network/dao/NetScalerPodDao.java     |   0
 .../com/cloud/network/dao/NetScalerPodDaoImpl.java |   0
 .../network/dao/NetScalerServicePackageDao.java    |   0
 .../dao/NetScalerServicePackageDaoImpl.java        |   0
 .../cloud/network/element/NetscalerElement.java    |   0
 .../NetscalerLoadBalancerElementService.java       |   0
 .../resource/NetScalerControlCenterResource.java   |   0
 .../cloud/network/resource/NetscalerResource.java  |   0
 .../com/cloud/network/vm/NetScalerVMManager.java   |   0
 .../cloud/network/vm/NetScalerVMManagerImpl.java   |   0
 .../cloudstack/netscaler/module.properties         |   0
 .../netscaler/spring-netscaler-context.xml         |   0
 plugins/network-elements/nicira-nvp/pom.xml        |  15 ----
 .../java}/com/cloud/agent/api/CmdBuilder.java      |   0
 .../com/cloud/agent/api/PingNuageVspCommand.java   |   0
 .../com/cloud/agent/api/StartupVspCommand.java     |   0
 .../agent/api/element/ApplyAclRuleVspCommand.java  |   0
 .../api/element/ApplyStaticNatVspCommand.java      |   0
 .../api/element/ExtraDhcpOptionsVspCommand.java    |   0
 .../agent/api/element/ImplementVspCommand.java     |   0
 .../agent/api/element/ShutDownVpcVspCommand.java   |   0
 .../agent/api/element/ShutDownVspCommand.java      |   0
 .../agent/api/guru/DeallocateVmVspCommand.java     |   0
 .../agent/api/guru/ImplementNetworkVspCommand.java |   0
 .../api/guru/ReserveVmInterfaceVspCommand.java     |   0
 .../agent/api/guru/TrashNetworkVspCommand.java     |   0
 .../agent/api/guru/UpdateDhcpOptionVspCommand.java |   0
 .../agent/api/manager/CleanUpDomainCommand.java    |   0
 .../agent/api/manager/EntityExistsCommand.java     |   0
 .../agent/api/manager/GetApiDefaultsAnswer.java    |   0
 .../agent/api/manager/GetApiDefaultsCommand.java   |   0
 .../api/manager/ImplementNetworkVspAnswer.java     |   0
 .../api/manager/ListVspDomainTemplatesAnswer.java  |   0
 .../api/manager/ListVspDomainTemplatesCommand.java |   0
 .../api/manager/SupportedApiVersionCommand.java    |   0
 .../api/manager/UpdateNuageVspDeviceCommand.java   |   0
 .../com/cloud/agent/api/sync/SyncDomainAnswer.java |   0
 .../cloud/agent/api/sync/SyncDomainCommand.java    |   0
 .../agent/api/sync/SyncNuageVspCmsIdAnswer.java    |   0
 .../agent/api/sync/SyncNuageVspCmsIdCommand.java   |   0
 .../cloud/api/commands/AddNuageVspDeviceCmd.java   |   0
 .../AssociateNuageVspDomainTemplateCmd.java        |   0
 .../api/commands/DeleteNuageVspDeviceCmd.java      |   0
 .../DisableNuageUnderlayVlanIpRangeCmd.java        |   0
 .../EnableNuageUnderlayVlanIpRangeCmd.java         |   0
 .../commands/ListNuageUnderlayVlanIpRangesCmd.java |   0
 .../cloud/api/commands/ListNuageVspDevicesCmd.java |   0
 .../commands/ListNuageVspDomainTemplatesCmd.java   |   0
 .../ListNuageVspGlobalDomainTemplateCmd.java       |   0
 .../api/commands/UpdateNuageVspDeviceCmd.java      |   0
 .../java}/com/cloud/api/commands/VspConstants.java |   0
 .../api/response/NuageVlanIpRangeResponse.java     |   0
 .../cloud/api/response/NuageVspDeviceResponse.java |   0
 .../response/NuageVspDomainTemplateResponse.java   |   0
 .../api/response/NuageVspResourceResponse.java     |   0
 .../java}/com/cloud/network/NuageVspDeviceVO.java  |   0
 .../java}/com/cloud/network/dao/NuageVspDao.java   |   0
 .../com/cloud/network/dao/NuageVspDaoImpl.java     |   0
 .../com/cloud/network/element/NuageVspElement.java |   0
 .../network/guru/NuageVspGuestNetworkGuru.java     |   0
 .../cloud/network/manager/AbstractListener.java    |   0
 .../com/cloud/network/manager/NuageVspManager.java |   0
 .../cloud/network/manager/NuageVspManagerImpl.java |   0
 .../network/resource/NuageVspRequestWrapper.java   |   0
 .../cloud/network/resource/NuageVspResource.java   |   0
 .../resource/NuageVspResourceConfiguration.java    |   0
 .../cloud/network/resource/VspStatisticsMBean.java |   0
 .../network/resource/VspStatisticsMBeanImpl.java   |   0
 .../wrapper/NuageVspApiSupportCommandWrapper.java  |   0
 .../NuageVspApplyAclRulesCommandWrapper.java       |   0
 .../NuageVspApplyStaticNatCommandWrapper.java      |   0
 .../NuageVspCleanupDomainCommandWrapper.java       |   0
 .../resource/wrapper/NuageVspCommandWrapper.java   |   0
 ...uageVspDeallocateVmInterfaceCommandWrapper.java |   0
 .../NuageVspEntityExistsCommandWrapper.java        |   0
 .../NuageVspGetApiDefaultsCommandWrapper.java      |   0
 ...NuageVspGuruImplementNetworkCommandWrapper.java |   0
 .../NuageVspGuruTrashNetworkCommandWrapper.java    |   0
 .../NuageVspImplementNetworkCommandWrapper.java    |   0
 .../NuageVspListDomainTemplatesCommandWrapper.java |   0
 .../wrapper/NuageVspMaintainCommandWrapper.java    |   0
 .../wrapper/NuageVspReadyCommandWrapper.java       |   0
 .../NuageVspReserveVmInterfaceCommandWrapper.java  |   0
 .../NuageVspShutdownNetworkCommandWrapper.java     |   0
 .../wrapper/NuageVspShutdownVpcCommandWrapper.java |   0
 .../wrapper/NuageVspSyncCmsIdCommandWrapper.java   |   0
 .../wrapper/NuageVspSyncDomainCommandWrapper.java  |   0
 .../NuageVspUpdateDhcpOptionsCommandWrapper.java   |   0
 .../UpdateNuageVspDeviceCommandWrapper.java        |   0
 .../com/cloud/util/NuageVspEntityBuilder.java      |   0
 .../java}/com/cloud/util/NuageVspUtil.java         |   0
 .../wrapper/NuageVspCheckHealthCommandWrapper.java |   0
 .../NuageVspExtraDhcpOptionsCommandWrapper.java    |   0
 .../META-INF/cloudstack/vsp/module.properties      |   0
 .../META-INF/cloudstack/vsp/spring-vsp-context.xml |   0
 .../test/java}/com/cloud/NuageTest.java            |   0
 .../java}/com/cloud/agent/api/CommandsTest.java    |   0
 .../cloud/network/element/NuageVspElementTest.java |   0
 .../network/guru/NuageVspGuestNetworkGuruTest.java |   0
 .../cloud/network/manager/NuageVspManagerTest.java |   0
 .../network/resource/NuageVspResourceTest.java     |   0
 .../com/cloud/util/NuageVspEntityBuilderTest.java  |   0
 .../java}/com/cloud/util/NuageVspUtilTest.java     |   0
 plugins/network-elements/opendaylight/pom.xml      |  16 ----
 .../cloud/agent/api/OvsCreateGreTunnelAnswer.java  |   0
 .../cloud/agent/api/OvsCreateGreTunnelCommand.java |   0
 .../com/cloud/agent/api/OvsCreateTunnelAnswer.java |   0
 .../cloud/agent/api/OvsCreateTunnelCommand.java    |   0
 .../com/cloud/agent/api/OvsDeleteFlowCommand.java  |   0
 .../cloud/agent/api/OvsDestroyBridgeCommand.java   |   0
 .../cloud/agent/api/OvsDestroyTunnelCommand.java   |   0
 .../cloud/agent/api/OvsFetchInterfaceAnswer.java   |   0
 .../cloud/agent/api/OvsFetchInterfaceCommand.java  |   0
 .../cloud/agent/api/OvsSetTagAndFlowAnswer.java    |   0
 .../cloud/agent/api/OvsSetTagAndFlowCommand.java   |   0
 .../com/cloud/agent/api/OvsSetupBridgeCommand.java |   0
 .../api/OvsVpcPhysicalTopologyConfigCommand.java   |   0
 .../api/OvsVpcRoutingPolicyConfigCommand.java      |   0
 .../com/cloud/agent/api/StartupOvsCommand.java     |   0
 .../com/cloud/network/element/OvsElement.java      |   0
 .../cloud/network/element/OvsElementService.java   |   0
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |   0
 .../com/cloud/network/ovs/GreTunnelException.java  |   0
 .../cloud/network/ovs/OvsNetworkTopologyGuru.java  |   0
 .../network/ovs/OvsNetworkTopologyGuruImpl.java    |   0
 .../com/cloud/network/ovs/OvsTunnelManager.java    |   0
 .../cloud/network/ovs/OvsTunnelManagerImpl.java    |   0
 .../java}/com/cloud/network/ovs/dao/OvsTunnel.java |   0
 .../network/ovs/dao/OvsTunnelInterfaceDao.java     |   0
 .../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java |   0
 .../network/ovs/dao/OvsTunnelInterfaceVO.java      |   0
 .../cloud/network/ovs/dao/OvsTunnelNetworkDao.java |   0
 .../network/ovs/dao/OvsTunnelNetworkDaoImpl.java   |   0
 .../cloud/network/ovs/dao/OvsTunnelNetworkVO.java  |   0
 .../ovs/dao/VpcDistributedRouterSeqNoDao.java      |   0
 .../ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java  |   0
 .../ovs/dao/VpcDistributedRouterSeqNoVO.java       |   0
 .../META-INF/cloudstack/ovs/module.properties      |   0
 .../META-INF/cloudstack/ovs/spring-ovs-context.xml |   0
 .../cloud/api/commands/AddPaloAltoFirewallCmd.java |   0
 .../api/commands/ConfigurePaloAltoFirewallCmd.java |   0
 .../api/commands/DeletePaloAltoFirewallCmd.java    |   0
 .../commands/ListPaloAltoFirewallNetworksCmd.java  |   0
 .../api/commands/ListPaloAltoFirewallsCmd.java     |   0
 .../api/response/PaloAltoFirewallResponse.java     |   0
 .../element/PaloAltoExternalFirewallElement.java   |   0
 .../element/PaloAltoFirewallElementService.java    |   0
 .../cloud/network/resource/PaloAltoResource.java   |   0
 .../com/cloud/network/utils/HttpClientWrapper.java |   0
 .../META-INF/cloudstack/paloalto/module.properties |   0
 .../paloalto/spring-paloalto-context.xml           |   0
 .../network/resource/MockablePaloAltoResource.java |   0
 .../network/resource/PaloAltoResourceTest.java     |   0
 .../apache/cloudstack/api/commands/AddSspCmd.java  |   0
 .../cloudstack/api/commands/DeleteSspCmd.java      |   0
 .../cloudstack/api/response/SspResponse.java       |   0
 .../cloudstack/network/dao/SspCredentialDao.java   |   0
 .../network/dao/SspCredentialDaoImpl.java          |   0
 .../cloudstack/network/dao/SspCredentialVO.java    |   0
 .../cloudstack/network/dao/SspTenantDao.java       |   0
 .../cloudstack/network/dao/SspTenantDaoImpl.java   |   0
 .../apache/cloudstack/network/dao/SspTenantVO.java |   0
 .../apache/cloudstack/network/dao/SspUuidDao.java  |   0
 .../cloudstack/network/dao/SspUuidDaoImpl.java     |   0
 .../apache/cloudstack/network/dao/SspUuidVO.java   |   0
 .../cloudstack/network/element/SspClient.java      |   0
 .../cloudstack/network/element/SspElement.java     |   0
 .../cloudstack/network/element/SspManager.java     |   0
 .../cloudstack/network/element/SspService.java     |   0
 .../network/guru/SspGuestNetworkGuru.java          |   0
 .../META-INF/cloudstack/ssp/module.properties      |   0
 .../META-INF/cloudstack/ssp/spring-ssp-context.xml |   0
 .../cloudstack/network/element/SspClientTest.java  |   0
 .../cloudstack/network/element/SspElementTest.java |   0
 .../cloud/network/guru/VxlanGuestNetworkGuru.java  |   0
 .../META-INF/cloudstack/vxlan/module.properties    |   0
 .../cloudstack/vxlan/spring-vxlan-context.xml      |   0
 .../network/guru/VxlanGuestNetworkGuruTest.java    |   0
 .../IpmitoolOutOfBandManagementDriver.java         |   0
 .../driver/ipmitool/IpmitoolWrapper.java           |   0
 .../META-INF/cloudstack/ipmitool/module.properties |   0
 .../ipmitool/spring-ipmitool-context.xml           |   0
 .../driver/ipmitool/IpmitoolWrapperTest.java       |   0
 .../NestedCloudStackOutOfBandManagementDriver.java |   0
 .../cloudstack/nested-cloudstack/module.properties |   0
 .../spring-nested-cloudstack-context.xml           |   0
 ...tedCloudStackOutOfBandManagementDriverTest.java |   0
 .../allocator/RandomStoragePoolAllocator.java      |   0
 .../driver/CloudStackImageStoreDriverImpl.java     |   0
 .../CloudStackImageStoreLifeCycleImpl.java         |   0
 .../provider/CloudStackImageStoreProviderImpl.java |   0
 .../storage-image-default/module.properties        |   0
 .../spring-storage-image-default-context.xml       |   0
 .../datastore/driver/S3ImageStoreDriverImpl.java   |   0
 .../lifecycle/S3ImageStoreLifeCycleImpl.java       |   0
 .../provider/S3ImageStoreProviderImpl.java         |   0
 .../cloudstack/storage-image-s3/module.properties  |   0
 .../spring-storage-image-s3-context.xml            |   0
 .../driver/SampleImageStoreDriverImpl.java         |   0
 .../lifecycle/SampleImageStoreLifeCycleImpl.java   |   0
 .../provider/SampleImageStoreProviderImpl.java     |   0
 .../driver/SwiftImageStoreDriverImpl.java          |   0
 .../lifecycle/SwiftImageStoreLifeCycleImpl.java    |   0
 .../provider/SwiftImageStoreProviderImpl.java      |   0
 .../storage-image-swift/module.properties          |   0
 .../spring-storage-image-swift-context.xml         |   0
 plugins/storage/volume/cloudbyte/pom.xml           |   2 -
 .../driver/ElastistorPrimaryDataStoreDriver.java   |   0
 .../ElastistorPrimaryDataStoreLifeCycle.java       |   0
 .../datastore/provider/ElastistorHostListener.java |   0
 .../ElastistorPrimaryDataStoreProvider.java        |   0
 .../storage/datastore/util/ElastistorUtil.java     |   0
 .../datastore/util/ElastistorVolumeApiService.java |   0
 .../util/ElastistorVolumeApiServiceImpl.java       |   0
 .../datastore/util/ListElastistorInterfaceCmd.java |   0
 .../util/ListElastistorInterfaceResponse.java      |   0
 .../datastore/util/ListElastistorPoolCmd.java      |   0
 .../datastore/util/ListElastistorPoolResponse.java |   0
 .../datastore/util/ListElastistorVolumeCmd.java    |   0
 .../util/ListElastistorVolumeResponse.java         |   0
 .../storage-volume-cloudbyte/module.properties     |   0
 .../spring-storage-volume-cloudbyte-context.xml    |   0
 .../CloudStackPrimaryDataStoreDriverImpl.java      |   0
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |   0
 .../CloudStackPrimaryDataStoreProviderImpl.java    |   0
 .../storage-volume-default/module.properties       |   0
 .../spring-storage-volume-default-context.xml      |   0
 ...loudStackPrimaryDataStoreLifeCycleImplTest.java |   0
 .../driver/NexentaPrimaryDataStoreDriver.java      |   0
 .../NexentaPrimaryDataStoreLifeCycle.java          |   0
 .../datastore/provider/NexentaHostListener.java    |   0
 .../provider/NexentaPrimaryDataStoreProvider.java  |   0
 .../storage/datastore/util/NexentaNmsClient.java   |   0
 .../storage/datastore/util/NexentaNmsUrl.java      |   0
 .../datastore/util/NexentaStorAppliance.java       |   0
 .../storage/datastore/util/NexentaUtil.java        |   0
 .../module.properties                              |   0
 .../spring-storage-volume-nexenta-context.xml      |   0
 .../datastore/util/NexentaStorApplianceTest.java   |   0
 .../storage/datastore/util/NexentaUtilTest.java    |   0
 .../driver/SamplePrimaryDataStoreDriverImpl.java   |   0
 .../SamplePrimaryDataStoreLifeCycleImpl.java       |   0
 .../SamplePrimaryDatastoreProviderImpl.java        |   0
 .../driver/SolidFirePrimaryDataStoreDriver.java    |   0
 .../SolidFireSharedPrimaryDataStoreDriver.java     |   0
 .../SolidFirePrimaryDataStoreLifeCycle.java        |   0
 .../SolidFireSharedPrimaryDataStoreLifeCycle.java  |   0
 .../datastore/provider/SolidFireHostListener.java  |   0
 .../SolidFirePrimaryDataStoreProvider.java         |   0
 .../provider/SolidFireSharedHostListener.java      |   0
 .../SolidFireSharedPrimaryDataStoreProvider.java   |   0
 .../storage/datastore/util/SolidFireUtil.java      |   0
 .../storage-volume-solidfire/module.properties     |   0
 .../spring-storage-volume-solidfire-context.xml    |   0
 .../cloudstack/storage/test/AopTestAdvice.java     |   0
 .../storage/test/ChildTestConfiguration.java       |   0
 .../cloudstack/storage/test/TestConfiguration.java |   0
 .../apache/cloudstack/storage/test/VolumeTest.java |   0
 .../{ => src}/test/resource/storageContext.xml     |   0
 .../api}/api/command/LinkAccountToLdapCmd.java     |   0
 .../api/response/LinkAccountToLdapResponse.java    |   0
 .../cloudstack/api/command/LDAPConfigCmd.java      |   0
 .../cloudstack/api/command/LDAPRemoveCmd.java      |   0
 .../api/command/LdapAddConfigurationCmd.java       |   0
 .../api/command/LdapCreateAccountCmd.java          |   0
 .../api/command/LdapDeleteConfigurationCmd.java    |   0
 .../cloudstack/api/command/LdapImportUsersCmd.java |   0
 .../api/command/LdapListConfigurationCmd.java      |   0
 .../cloudstack/api/command/LdapListUsersCmd.java   |   0
 .../cloudstack/api/command/LdapUserSearchCmd.java  |   0
 .../api/command/LinkDomainToLdapCmd.java           |   0
 .../api/response/LDAPConfigResponse.java           |   0
 .../api/response/LDAPRemoveResponse.java           |   0
 .../api/response/LdapConfigurationResponse.java    |   0
 .../cloudstack/api/response/LdapUserResponse.java  |   0
 .../api/response/LinkDomainToLdapResponse.java     |   0
 .../cloudstack/ldap/ADLdapUserManagerImpl.java     |   0
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |   0
 .../apache/cloudstack/ldap/LdapConfiguration.java  |   0
 .../cloudstack/ldap/LdapConfigurationVO.java       |   0
 .../apache/cloudstack/ldap/LdapContextFactory.java |   0
 .../org/apache/cloudstack/ldap/LdapManager.java    |   0
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |   0
 .../org/apache/cloudstack/ldap/LdapTrustMapVO.java |   0
 .../java}/org/apache/cloudstack/ldap/LdapUser.java |   0
 .../apache/cloudstack/ldap/LdapUserManager.java    |   0
 .../cloudstack/ldap/LdapUserManagerFactory.java    |   0
 .../org/apache/cloudstack/ldap/LdapUtils.java      |   0
 .../ldap/NoLdapUserMatchingQueryException.java     |   0
 .../cloudstack/ldap/OpenLdapUserManagerImpl.java   |   0
 .../cloudstack/ldap/dao/LdapConfigurationDao.java  |   0
 .../ldap/dao/LdapConfigurationDaoImpl.java         |   0
 .../cloudstack/ldap/dao/LdapTrustMapDao.java       |   0
 .../cloudstack/ldap/dao/LdapTrustMapDaoImpl.java   |   0
 .../META-INF/cloudstack/ldap/module.properties     |   0
 .../cloudstack/ldap/spring-ldap-context.xml        |   0
 .../ldap/ADLdapUserManagerImplSpec.groovy          |   0
 .../ldap/BasicNamingEnumerationImpl.groovy         |   0
 .../ldap/LdapAddConfigurationCmdSpec.groovy        |   0
 .../cloudstack/ldap/LdapAuthenticatorSpec.groovy   |   0
 .../ldap/LdapConfigurationDaoImplSpec.groovy       |   0
 .../ldap/LdapConfigurationResponseSpec.groovy      |   0
 .../cloudstack/ldap/LdapConfigurationSpec.groovy   |   0
 .../cloudstack/ldap/LdapConfigurationVOSpec.groovy |   0
 .../cloudstack/ldap/LdapContextFactorySpec.groovy  |   0
 .../ldap/LdapCreateAccountCmdSpec.groovy           |   0
 .../ldap/LdapDeleteConfigurationCmdSpec.groovy     |   0
 .../cloudstack/ldap/LdapImportUsersCmdSpec.groovy  |   0
 .../ldap/LdapListConfigurationCmdSpec.groovy       |   0
 .../cloudstack/ldap/LdapListUsersCmdSpec.groovy    |   0
 .../cloudstack/ldap/LdapManagerImplSpec.groovy     |   0
 .../cloudstack/ldap/LdapSearchUserCmdSpec.groovy   |   0
 .../ldap/LdapUserManagerFactorySpec.groovy         |   0
 .../cloudstack/ldap/LdapUserResponseSpec.groovy    |   0
 .../org/apache/cloudstack/ldap/LdapUserSpec.groovy |   0
 .../apache/cloudstack/ldap/LdapUtilsSpec.groovy    |   0
 .../cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy |   0
 .../NoLdapUserMatchingQueryExceptionSpec.groovy    |   0
 .../cloudstack/ldap/OpenLdapUserManagerSpec.groovy |   0
 .../api/command/LdapConfigurationChanger.java      |   0
 .../api/command/LdapCreateAccountCmdTest.java      |   0
 .../api/command/LdapImportUsersCmdTest.java        |   0
 .../api/command/LinkAccountToLdapCmdTest.java      |   0
 .../api/command/LinkDomainToLdapCmdTest.java       |   0
 .../cloudstack/ldap/LdapConfigurationTest.java     |   0
 .../{ => src}/test/resources/cloudstack.org.ldif   |   0
 .../cloud/server/auth/MD5UserAuthenticator.java    |   0
 .../META-INF/cloudstack/md5/module.properties      |   0
 .../META-INF/cloudstack/md5/spring-md5-context.xml |   0
 .../server/auth/MD5UserAuthenticatorTest.java      |   0
 .../server/auth/PBKDF2UserAuthenticator.java       |   0
 .../META-INF/cloudstack/pbkdf2/module.properties   |   0
 .../cloudstack/pbkdf2/spring-pbkdf2-context.xml    |   0
 .../server/auth/PBKD2UserAuthenticatorTest.java    |   0
 .../server/auth/PlainTextUserAuthenticator.java    |   0
 .../cloudstack/plaintext/module.properties         |   0
 .../plaintext/spring-plaintext-context.xml         |   0
 .../api/command/AuthorizeSAMLSSOCmd.java           |   0
 .../api/command/GetServiceProviderMetaDataCmd.java |   0
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |   0
 .../apache/cloudstack/api/command/ListIdpsCmd.java |   0
 .../api/command/ListSamlAuthorizationCmd.java      |   0
 .../api/command/SAML2LoginAPIAuthenticatorCmd.java |   0
 .../command/SAML2LogoutAPIAuthenticatorCmd.java    |   0
 .../cloudstack/api/response/IdpResponse.java       |   0
 .../api/response/SAMLMetaDataResponse.java         |   0
 .../api/response/SamlAuthorizationResponse.java    |   0
 .../api/response/SamlUserAccountResponse.java      |   0
 .../apache/cloudstack/saml/SAML2AuthManager.java   |   0
 .../cloudstack/saml/SAML2AuthManagerImpl.java      |   0
 .../cloudstack/saml/SAML2UserAuthenticator.java    |   0
 .../cloudstack/saml/SAMLPluginConstants.java       |   0
 .../cloudstack/saml/SAMLProviderMetadata.java      |   0
 .../org/apache/cloudstack/saml/SAMLTokenDao.java   |   0
 .../apache/cloudstack/saml/SAMLTokenDaoImpl.java   |   0
 .../org/apache/cloudstack/saml/SAMLTokenVO.java    |   0
 .../org/apache/cloudstack/saml/SAMLUtils.java      |   0
 .../META-INF/cloudstack/saml2/module.properties    |   0
 .../cloudstack/saml2/spring-saml2-context.xml      |   0
 .../GetServiceProviderMetaDataCmdTest.java         |   0
 .../cloudstack/SAML2AuthManagerImplTest.java       |   0
 .../cloudstack/SAML2UserAuthenticatorTest.java     |   0
 .../java}/org/apache/cloudstack/SAMLUtilsTest.java |   0
 .../command/ListAndSwitchSAMLAccountCmdTest.java   |   0
 .../command/SAML2LoginAPIAuthenticatorCmdTest.java |   0
 .../SAML2LogoutAPIAuthenticatorCmdTest.java        |   0
 .../cloudstack/saml/SAML2AuthManagerImplTest.java  |   0
 .../server/auth/SHA256SaltedUserAuthenticator.java |   0
 .../cloudstack/sha256salted/module.properties      |   0
 .../sha256salted/spring-sha256salted-context.xml   |   0
 .../cloud/server/auth/test/AuthenticatorTest.java  |   2 +-
 pom.xml                                            |  15 ----
 quickcloud/pom.xml                                 |   4 +-
 server/pom.xml                                     |   8 --
 .../java}/com/cloud/account/SecurityManager.java   |   0
 .../com/cloud/acl/AffinityGroupAccessChecker.java  |   0
 .../java}/com/cloud/acl/DomainChecker.java         |   0
 .../manager/allocator/impl/FirstFitAllocator.java  |   0
 .../allocator/impl/FirstFitRoutingAllocator.java   |   0
 .../allocator/impl/RecreateHostAllocator.java      |   0
 .../manager/allocator/impl/TestingAllocator.java   |   0
 .../allocator/impl/UserConcentratedAllocator.java  |   0
 .../agent/manager/authn/AgentAuthnException.java   |   0
 .../cloud/agent/manager/authn/AgentAuthorizer.java |   0
 .../manager/authn/impl/BasicAgentAuthManager.java  |   0
 .../java}/com/cloud/alert/AlertManagerImpl.java    |   0
 .../java}/com/cloud/alert/ClusterAlertAdapter.java |   0
 .../com/cloud/alert/ConsoleProxyAlertAdapter.java  |   0
 .../alert/SecondaryStorageVmAlertAdapter.java      |   0
 .../java}/com/cloud/api/ApiAsyncJobDispatcher.java |   0
 .../{ => main/java}/com/cloud/api/ApiDBUtils.java  |   0
 .../java}/com/cloud/api/ApiDispatcher.java         |   0
 .../java}/com/cloud/api/ApiGsonHelper.java         |   0
 .../java}/com/cloud/api/ApiResponseGsonHelper.java |   0
 .../java}/com/cloud/api/ApiResponseHelper.java     |   0
 .../java}/com/cloud/api/ApiSerializerHelper.java   |   0
 .../{ => main/java}/com/cloud/api/ApiServer.java   |   0
 .../{ => main/java}/com/cloud/api/ApiServlet.java  |   0
 .../com/cloud/api/EncodedStringTypeAdapter.java    |   0
 .../com/cloud/api/ResponseObjectTypeAdapter.java   |   0
 .../java}/com/cloud/api/SerializationContext.java  |   0
 .../java}/com/cloud/api/StringMapTypeAdapter.java  |   0
 .../api/auth/APIAuthenticationManagerImpl.java     |   0
 .../api/auth/DefaultLoginAPIAuthenticatorCmd.java  |   0
 .../api/auth/DefaultLogoutAPIAuthenticatorCmd.java |   0
 .../cloud/api/dispatch/CommandCreationWorker.java  |   0
 .../com/cloud/api/dispatch/DispatchChain.java      |   0
 .../cloud/api/dispatch/DispatchChainFactory.java   |   0
 .../java}/com/cloud/api/dispatch/DispatchTask.java |   0
 .../com/cloud/api/dispatch/DispatchWorker.java     |   0
 .../api/dispatch/ParamGenericValidationWorker.java |   0
 .../com/cloud/api/dispatch/ParamProcessWorker.java |   0
 .../com/cloud/api/dispatch/ParamUnpackWorker.java  |   0
 .../api/dispatch/SpecificCmdValidationWorker.java  |   0
 .../{ => main/java}/com/cloud/api/doc/Alert.java   |   0
 .../java}/com/cloud/api/doc/ApiXmlDocReader.java   |   0
 .../java}/com/cloud/api/doc/ApiXmlDocWriter.java   |   0
 .../java}/com/cloud/api/doc/Argument.java          |   0
 .../{ => main/java}/com/cloud/api/doc/Command.java |   0
 .../api/query/MutualExclusiveIdsManagerBase.java   |   0
 .../com/cloud/api/query/QueryManagerImpl.java      |   0
 .../com/cloud/api/query/ViewResponseHelper.java    |   0
 .../com/cloud/api/query/dao/AccountJoinDao.java    |   0
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |   0
 .../cloud/api/query/dao/AffinityGroupJoinDao.java  |   0
 .../api/query/dao/AffinityGroupJoinDaoImpl.java    |   0
 .../com/cloud/api/query/dao/AsyncJobJoinDao.java   |   0
 .../cloud/api/query/dao/AsyncJobJoinDaoImpl.java   |   0
 .../com/cloud/api/query/dao/DataCenterJoinDao.java |   0
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |   0
 .../cloud/api/query/dao/DiskOfferingJoinDao.java   |   0
 .../api/query/dao/DiskOfferingJoinDaoImpl.java     |   0
 .../com/cloud/api/query/dao/DomainJoinDao.java     |   0
 .../com/cloud/api/query/dao/DomainJoinDaoImpl.java |   0
 .../cloud/api/query/dao/DomainRouterJoinDao.java   |   0
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |   0
 .../dao/GenericDaoBaseWithTagInformation.java      |   0
 .../java}/com/cloud/api/query/dao/HostJoinDao.java |   0
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |   0
 .../java}/com/cloud/api/query/dao/HostTagDao.java  |   0
 .../com/cloud/api/query/dao/HostTagDaoImpl.java    |   0
 .../com/cloud/api/query/dao/ImageStoreJoinDao.java |   0
 .../cloud/api/query/dao/ImageStoreJoinDaoImpl.java |   0
 .../cloud/api/query/dao/InstanceGroupJoinDao.java  |   0
 .../api/query/dao/InstanceGroupJoinDaoImpl.java    |   0
 .../cloud/api/query/dao/ProjectAccountJoinDao.java |   0
 .../api/query/dao/ProjectAccountJoinDaoImpl.java   |   0
 .../api/query/dao/ProjectInvitationJoinDao.java    |   0
 .../query/dao/ProjectInvitationJoinDaoImpl.java    |   0
 .../com/cloud/api/query/dao/ProjectJoinDao.java    |   0
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java    |   0
 .../cloud/api/query/dao/ResourceTagJoinDao.java    |   0
 .../api/query/dao/ResourceTagJoinDaoImpl.java      |   0
 .../cloud/api/query/dao/SecurityGroupJoinDao.java  |   0
 .../api/query/dao/SecurityGroupJoinDaoImpl.java    |   0
 .../api/query/dao/ServiceOfferingJoinDao.java      |   0
 .../api/query/dao/ServiceOfferingJoinDaoImpl.java  |   0
 .../cloud/api/query/dao/StoragePoolJoinDao.java    |   0
 .../api/query/dao/StoragePoolJoinDaoImpl.java      |   0
 .../com/cloud/api/query/dao/TemplateJoinDao.java   |   0
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |   0
 .../cloud/api/query/dao/UserAccountJoinDao.java    |   0
 .../api/query/dao/UserAccountJoinDaoImpl.java      |   0
 .../com/cloud/api/query/dao/UserVmJoinDao.java     |   0
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   0
 .../com/cloud/api/query/dao/VolumeJoinDao.java     |   0
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |   0
 .../com/cloud/api/query/vo/AccountJoinVO.java      |   0
 .../cloud/api/query/vo/AffinityGroupJoinVO.java    |   0
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java     |   0
 .../java}/com/cloud/api/query/vo/BaseViewVO.java   |   0
 .../api/query/vo/BaseViewWithTagInformationVO.java |   0
 .../cloud/api/query/vo/ControlledViewEntity.java   |   0
 .../com/cloud/api/query/vo/DataCenterJoinVO.java   |   0
 .../com/cloud/api/query/vo/DiskOfferingJoinVO.java |   0
 .../java}/com/cloud/api/query/vo/DomainJoinVO.java |   0
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |   0
 .../java}/com/cloud/api/query/vo/EventJoinVO.java  |   0
 .../java}/com/cloud/api/query/vo/HostJoinVO.java   |   0
 .../java}/com/cloud/api/query/vo/HostTagVO.java    |   0
 .../com/cloud/api/query/vo/ImageStoreJoinVO.java   |   0
 .../cloud/api/query/vo/InstanceGroupJoinVO.java    |   0
 .../cloud/api/query/vo/ProjectAccountJoinVO.java   |   0
 .../api/query/vo/ProjectInvitationJoinVO.java      |   0
 .../com/cloud/api/query/vo/ProjectJoinVO.java      |   0
 .../com/cloud/api/query/vo/ResourceTagJoinVO.java  |   0
 .../cloud/api/query/vo/SecurityGroupJoinVO.java    |   0
 .../cloud/api/query/vo/ServiceOfferingJoinVO.java  |   0
 .../com/cloud/api/query/vo/StoragePoolJoinVO.java  |   0
 .../com/cloud/api/query/vo/TemplateJoinVO.java     |   0
 .../com/cloud/api/query/vo/UserAccountJoinVO.java  |   0
 .../java}/com/cloud/api/query/vo/UserVmJoinVO.java |   0
 .../java}/com/cloud/api/query/vo/VolumeJoinVO.java |   0
 .../cloud/api/response/ApiResponseSerializer.java  |   0
 .../api/response/EmptyFieldExclusionStrategy.java  |   0
 .../api/response/SecurityGroupResultObject.java    |   0
 .../response/SecurityGroupRuleResultObject.java    |   0
 .../java}/com/cloud/async/AsyncJobResult.java      |   0
 .../com/cloud/capacity/CapacityManagerImpl.java    |   0
 .../cloud/capacity/ComputeCapacityListener.java    |   0
 .../cloud/capacity/StorageCapacityListener.java    |   0
 .../cloud/network/NetworkMigrationManager.java     |   0
 .../cloud/network/NetworkMigrationManagerImpl.java |   0
 .../java}/com/cloud/configuration/Config.java      |   0
 .../configuration/ConfigurationManagerImpl.java    |   0
 .../java}/com/cloud/configuration/ZoneConfig.java  |   0
 .../AgentBasedConsoleProxyManager.java             |   0
 .../AgentBasedStandaloneConsoleProxyManager.java   |   0
 .../java}/com/cloud/consoleproxy/AgentHook.java    |   0
 .../com/cloud/consoleproxy/AgentHookBase.java      |   0
 .../consoleproxy/ConsoleProxyAlertEventArgs.java   |   0
 .../consoleproxy/ConsoleProxyBalanceAllocator.java |   0
 .../cloud/consoleproxy/ConsoleProxyListener.java   |   0
 .../consoleproxy/ConsoleProxyManagementState.java  |   0
 .../cloud/consoleproxy/ConsoleProxyManager.java    |   0
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   0
 .../cloud/consoleproxy/ConsoleProxyService.java    |   0
 .../consoleproxy/StaticConsoleProxyManager.java    |   0
 .../java}/com/cloud/dc/DedicatedResourceVO.java    |   0
 .../com/cloud/dc/dao/DedicatedResourceDao.java     |   0
 .../com/cloud/dc/dao/DedicatedResourceDaoImpl.java |   0
 .../deploy/DeploymentPlanningManagerImpl.java      |   0
 .../java}/com/cloud/deploy/FirstFitPlanner.java    |   0
 .../com/cloud/deploy/PlannerHostReservationVO.java |   0
 .../deploy/dao/PlannerHostReservationDao.java      |   0
 .../deploy/dao/PlannerHostReservationDaoImpl.java  |   0
 .../com/cloud/event/ActionEventInterceptor.java    |   0
 .../java}/com/cloud/event/ActionEventUtils.java    |   0
 .../java}/com/cloud/event/AlertGenerator.java      |   0
 .../java}/com/cloud/event/dao/EventJoinDao.java    |   0
 .../com/cloud/event/dao/EventJoinDaoImpl.java      |   0
 .../com/cloud/ha/AbstractInvestigatorImpl.java     |   0
 .../com/cloud/ha/CheckOnAgentInvestigator.java     |   0
 .../src/{ => main/java}/com/cloud/ha/HaWorkVO.java |   0
 .../cloud/ha/HighAvailabilityManagerExtImpl.java   |   0
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   0
 .../{ => main/java}/com/cloud/ha/KVMFencer.java    |   0
 .../cloud/ha/ManagementIPSystemVMInvestigator.java |   0
 .../java}/com/cloud/ha/RecreatableFencer.java      |   0
 .../java}/com/cloud/ha/UserVmDomRInvestigator.java |   0
 .../java}/com/cloud/ha/XenServerInvestigator.java  |   0
 .../com/cloud/ha/dao/HighAvailabilityDao.java      |   0
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |   0
 .../hypervisor/CloudZonesStartupProcessor.java     |   0
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   0
 .../hypervisor/HypervisorGuruManagerImpl.java      |   0
 .../java}/com/cloud/hypervisor/KVMGuru.java        |   0
 .../java}/com/cloud/hypervisor/LXCGuru.java        |   0
 .../kvm/discoverer/KvmDummyResourceBase.java       |   0
 .../kvm/discoverer/KvmServerDiscoverer.java        |   0
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |   0
 .../kvm/discoverer/LxcServerDiscoverer.java        |   0
 .../cloud/metadata/ResourceMetaDataManager.java    |   0
 .../metadata/ResourceMetaDataManagerImpl.java      |   0
 .../cloud/network/ExternalDeviceUsageManager.java  |   0
 .../network/ExternalDeviceUsageManagerImpl.java    |   0
 .../network/ExternalFirewallDeviceManager.java     |   0
 .../network/ExternalFirewallDeviceManagerImpl.java |   0
 .../cloud/network/ExternalIpAddressAllocator.java  |   0
 .../network/ExternalLoadBalancerDeviceManager.java |   0
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   0
 .../network/ExternalNetworkDeviceManagerImpl.java  |   0
 .../java}/com/cloud/network/IpAddrAllocator.java   |   0
 .../com/cloud/network/IpAddressManagerImpl.java    |   0
 .../com/cloud/network/Ipv6AddressManager.java      |   0
 .../com/cloud/network/Ipv6AddressManagerImpl.java  |   0
 .../java}/com/cloud/network/NetworkModelImpl.java  |   0
 .../com/cloud/network/NetworkServiceImpl.java      |   0
 .../com/cloud/network/NetworkUsageManager.java     |   0
 .../com/cloud/network/NetworkUsageManagerImpl.java |   0
 .../com/cloud/network/PortProfileManagerImpl.java  |   0
 .../com/cloud/network/SshKeysDistriMonitor.java    |   0
 .../com/cloud/network/StorageNetworkManager.java   |   0
 .../cloud/network/StorageNetworkManagerImpl.java   |   0
 .../com/cloud/network/as/AutoScaleManager.java     |   0
 .../com/cloud/network/as/AutoScaleManagerImpl.java |   0
 .../network/element/CloudZonesNetworkElement.java  |   0
 .../network/element/ConfigDriveNetworkElement.java |   0
 .../network/element/SecurityGroupElement.java      |   0
 .../network/element/VirtualRouterElement.java      |   0
 .../network/element/VpcVirtualRouterElement.java   |   0
 .../network/firewall/FirewallManagerImpl.java      |   0
 .../com/cloud/network/guru/ControlNetworkGuru.java |   0
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   0
 .../network/guru/DirectPodBasedNetworkGuru.java    |   0
 .../network/guru/ExternalGuestNetworkGuru.java     |   0
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   0
 .../cloud/network/guru/PodBasedNetworkGuru.java    |   0
 .../com/cloud/network/guru/PrivateNetworkGuru.java |   0
 .../com/cloud/network/guru/PublicNetworkGuru.java  |   0
 .../com/cloud/network/guru/StorageNetworkGuru.java |   0
 .../com/cloud/network/lb/LBHealthCheckManager.java |   0
 .../cloud/network/lb/LBHealthCheckManagerImpl.java |   0
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   0
 .../cloud/network/router/CommandSetupHelper.java   |   0
 .../com/cloud/network/router/NetworkHelper.java    |   0
 .../cloud/network/router/NetworkHelperImpl.java    |   0
 .../com/cloud/network/router/NicProfileHelper.java |   0
 .../cloud/network/router/NicProfileHelperImpl.java |   0
 .../cloud/network/router/RouterControlHelper.java  |   0
 .../router/VirtualNetworkApplianceManager.java     |   0
 .../router/VirtualNetworkApplianceManagerImpl.java |   0
 .../cloud/network/router/VpcNetworkHelperImpl.java |   0
 .../router/VpcVirtualNetworkApplianceManager.java  |   0
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   0
 .../com/cloud/network/rules/AdvancedVpnRules.java  |   0
 .../com/cloud/network/rules/BasicVpnRules.java     |   0
 .../com/cloud/network/rules/DhcpEntryRules.java    |   0
 .../com/cloud/network/rules/DhcpPvlanRules.java    |   0
 .../com/cloud/network/rules/DhcpSubNetRules.java   |   0
 .../com/cloud/network/rules/FirewallRules.java     |   0
 .../cloud/network/rules/IpAssociationRules.java    |   0
 .../cloud/network/rules/LoadBalancingRules.java    |   0
 .../com/cloud/network/rules/NetworkAclsRules.java  |   0
 .../com/cloud/network/rules/NicPlugInOutRules.java |   0
 .../cloud/network/rules/PasswordToRouterRules.java |   0
 .../cloud/network/rules/PrivateGatewayRules.java   |   0
 .../java}/com/cloud/network/rules/RuleApplier.java |   0
 .../cloud/network/rules/RuleApplierWrapper.java    |   0
 .../com/cloud/network/rules/RulesManagerImpl.java  |   0
 .../cloud/network/rules/SshKeyToRouterRules.java   |   0
 .../com/cloud/network/rules/StaticNatImpl.java     |   0
 .../com/cloud/network/rules/StaticNatRules.java    |   0
 .../com/cloud/network/rules/StaticRoutesRules.java |   0
 .../com/cloud/network/rules/UserdataPwdRules.java  |   0
 .../cloud/network/rules/UserdataToRouterRules.java |   0
 .../rules/VirtualNetworkApplianceFactory.java      |   0
 .../cloud/network/rules/VpcIpAssociationRules.java |   0
 .../security/LocalSecurityGroupWorkQueue.java      |   0
 .../com/cloud/network/security/RuleUpdateLog.java  |   0
 .../network/security/SecurityGroupListener.java    |   0
 .../network/security/SecurityGroupManager.java     |   0
 .../network/security/SecurityGroupManagerImpl.java |   0
 .../security/SecurityGroupManagerImpl2.java        |   0
 .../security/SecurityGroupManagerMBean.java        |   0
 .../network/security/SecurityGroupWorkQueue.java   |   0
 .../network/security/SecurityGroupWorkTracker.java |   0
 .../network/security/SecurityManagerMBeanImpl.java |   0
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |   0
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |   0
 .../cloud/network/vpc/PrivateGatewayProfile.java   |   0
 .../com/cloud/network/vpc/PrivateIpAddress.java    |   0
 .../com/cloud/network/vpc/VpcManagerImpl.java      |   0
 .../vpc/VpcPrivateGatewayTransactionCallable.java  |   0
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   0
 .../com/cloud/network/vpn/Site2SiteVpnManager.java |   0
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |   0
 .../java}/com/cloud/projects/ProjectManager.java   |   0
 .../com/cloud/projects/ProjectManagerImpl.java     |   0
 .../java}/com/cloud/resource/DiscovererBase.java   |   0
 .../com/cloud/resource/DummyHostDiscoverer.java    |   0
 .../cloud/resource/DummyHostServerResource.java    |   0
 .../com/cloud/resource/ResourceManagerImpl.java    |   0
 .../resourcelimit/ResourceLimitManagerImpl.java    |   0
 .../com/cloud/server/ConfigurationServer.java      |   0
 .../com/cloud/server/ConfigurationServerImpl.java  |   0
 .../{ => main/java}/com/cloud/server/Criteria.java |   0
 .../java}/com/cloud/server/LockMasterListener.java |   0
 .../java}/com/cloud/server/ManagementServer.java   |   0
 .../com/cloud/server/ManagementServerImpl.java     |   0
 .../java}/com/cloud/server/StatsCollector.java     |   0
 .../api/response/BaremetalTemplateResponse.java    |   0
 .../server/api/response/NwDeviceDhcpResponse.java  |   0
 .../api/response/NwDevicePxeServerResponse.java    |   0
 .../cloud/server/api/response/PxePingResponse.java |   0
 .../response/netapp/AssociateLunCmdResponse.java   |   0
 .../api/response/netapp/CreateLunCmdResponse.java  |   0
 .../netapp/CreateVolumeOnFilerCmdResponse.java     |   0
 .../netapp/CreateVolumePoolCmdResponse.java        |   0
 .../api/response/netapp/DeleteLUNCmdResponse.java  |   0
 .../netapp/DeleteVolumeOnFilerCmdResponse.java     |   0
 .../netapp/DeleteVolumePoolCmdResponse.java        |   0
 .../response/netapp/DissociateLunCmdResponse.java  |   0
 .../api/response/netapp/ListLunsCmdResponse.java   |   0
 .../netapp/ListVolumePoolsCmdResponse.java         |   0
 .../netapp/ListVolumesOnFilerCmdResponse.java      |   0
 .../netapp/ModifyVolumePoolCmdResponse.java        |   0
 .../com/cloud/server/auth/UserAuthenticator.java   |   0
 .../com/cloud/servlet/CloudStartupServlet.java     |   0
 .../com/cloud/servlet/ConsoleProxyClientParam.java |   0
 .../ConsoleProxyPasswordBasedEncryptor.java        |   0
 .../com/cloud/servlet/ConsoleProxyServlet.java     |   0
 .../com/cloud/storage/CreateSnapshotPayload.java   |   0
 .../com/cloud/storage/ImageStoreDetailsUtil.java   |   0
 .../com/cloud/storage/ImageStoreUploadMonitor.java |   0
 .../cloud/storage/ImageStoreUploadMonitorImpl.java |   0
 .../cloud/storage/LocalStoragePoolListener.java    |   0
 .../java}/com/cloud/storage/OCFS2Manager.java      |   0
 .../java}/com/cloud/storage/OCFS2ManagerImpl.java  |   0
 .../com/cloud/storage/RegisterVolumePayload.java   |   0
 .../com/cloud/storage/ResizeVolumePayload.java     |   0
 .../com/cloud/storage/StorageManagerImpl.java      |   0
 .../com/cloud/storage/StoragePoolAutomation.java   |   0
 .../cloud/storage/StoragePoolAutomationImpl.java   |   0
 .../java}/com/cloud/storage/TemplateProfile.java   |   0
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   0
 .../storage/download/DownloadAbandonedState.java   |   0
 .../storage/download/DownloadActiveState.java      |   0
 .../storage/download/DownloadCompleteState.java    |   0
 .../cloud/storage/download/DownloadErrorState.java |   0
 .../storage/download/DownloadInProgressState.java  |   0
 .../storage/download/DownloadInactiveState.java    |   0
 .../cloud/storage/download/DownloadListener.java   |   0
 .../cloud/storage/download/DownloadMonitor.java    |   0
 .../storage/download/DownloadMonitorImpl.java      |   0
 .../com/cloud/storage/download/DownloadState.java  |   0
 .../cloud/storage/download/NotDownloadedState.java |   0
 .../storage/listener/SnapshotStateListener.java    |   0
 .../cloud/storage/listener/StoragePoolMonitor.java |   0
 .../storage/listener/StorageSyncListener.java      |   0
 .../storage/listener/VolumeStateListener.java      |   0
 .../cloud/storage/monitor/StorageHostMonitor.java  |   0
 .../resource/DummySecondaryStorageResource.java    |   0
 .../secondary/SecStorageVmAlertEventArgs.java      |   0
 .../secondary/SecondaryStorageListener.java        |   0
 .../secondary/SecondaryStorageVmAllocator.java     |   0
 .../SecondaryStorageVmDefaultAllocator.java        |   0
 .../secondary/SecondaryStorageVmManager.java       |   0
 .../cloud/storage/snapshot/SnapshotManager.java    |   0
 .../storage/snapshot/SnapshotManagerImpl.java      |   0
 .../cloud/storage/snapshot/SnapshotScheduler.java  |   0
 .../storage/snapshot/SnapshotSchedulerImpl.java    |   0
 .../com/cloud/storage/upload/NotUploadedState.java |   0
 .../cloud/storage/upload/UploadAbandonedState.java |   0
 .../cloud/storage/upload/UploadActiveState.java    |   0
 .../cloud/storage/upload/UploadCompleteState.java  |   0
 .../com/cloud/storage/upload/UploadErrorState.java |   0
 .../storage/upload/UploadInProgressState.java      |   0
 .../cloud/storage/upload/UploadInactiveState.java  |   0
 .../com/cloud/storage/upload/UploadListener.java   |   0
 .../com/cloud/storage/upload/UploadMonitor.java    |   0
 .../cloud/storage/upload/UploadMonitorImpl.java    |   0
 .../com/cloud/storage/upload/UploadState.java      |   0
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |   0
 .../cloud/template/HypervisorTemplateAdapter.java  |   0
 .../java}/com/cloud/template/TemplateAdapter.java  |   0
 .../com/cloud/template/TemplateAdapterBase.java    |   0
 .../com/cloud/template/TemplateManagerImpl.java    |   0
 .../java}/com/cloud/test/DatabaseConfig.java       |   0
 .../java}/com/cloud/test/IPRangeConfig.java        |   0
 .../java}/com/cloud/test/PodZoneConfig.java        |   0
 .../java}/com/cloud/test/TestAppender.java         |   0
 .../java}/com/cloud/usage/UsageServiceImpl.java    |   0
 .../java}/com/cloud/user/AccountManager.java       |   0
 .../java}/com/cloud/user/AccountManagerImpl.java   |   0
 .../java}/com/cloud/user/DomainManager.java        |   0
 .../java}/com/cloud/user/DomainManagerImpl.java    |   0
 .../com/cloud/uuididentity/UUIDManagerImpl.java    |   0
 .../com/cloud/vm/SystemVmLoadScanHandler.java      |   0
 .../java}/com/cloud/vm/SystemVmLoadScanner.java    |   0
 .../java}/com/cloud/vm/UserVmManager.java          |   0
 .../java}/com/cloud/vm/UserVmManagerImpl.java      |   0
 .../java}/com/cloud/vm/UserVmStateListener.java    |   0
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   0
 .../cloud/vm/snapshot/VmWorkCreateVMSnapshot.java  |   0
 .../vm/snapshot/VmWorkDeleteAllVMSnapshots.java    |   0
 .../cloud/vm/snapshot/VmWorkDeleteVMSnapshot.java  |   0
 .../vm/snapshot/VmWorkRevertToVMSnapshot.java      |   0
 .../org/apache/cloudstack/acl/RoleManagerImpl.java |   0
 .../affinity/AffinityGroupServiceImpl.java         |   0
 .../annotation/AnnotationManagerImpl.java          |   0
 .../org/apache/cloudstack/ca/CAManagerImpl.java    |   0
 .../direct/download/DirectDownloadManagerImpl.java |   0
 .../java}/org/apache/cloudstack/ha/HAManager.java  |   0
 .../org/apache/cloudstack/ha/HAManagerImpl.java    |   0
 .../apache/cloudstack/ha/HAResourceCounter.java    |   0
 .../ha/provider/ActivityCheckerInterface.java      |   0
 .../cloudstack/ha/provider/HACheckerException.java |   0
 .../cloudstack/ha/provider/HAFenceException.java   |   0
 .../apache/cloudstack/ha/provider/HAProvider.java  |   0
 .../ha/provider/HARecoveryException.java           |   0
 .../ha/provider/HealthCheckerInterface.java        |   0
 .../cloudstack/ha/provider/HostHAProvider.java     |   0
 .../ha/provider/host/HAAbstractHostProvider.java   |   0
 .../cloudstack/ha/task/ActivityCheckTask.java      |   0
 .../org/apache/cloudstack/ha/task/BaseHATask.java  |   0
 .../org/apache/cloudstack/ha/task/FenceTask.java   |   0
 .../apache/cloudstack/ha/task/HealthCheckTask.java |   0
 .../apache/cloudstack/ha/task/RecoveryTask.java    |   0
 .../lb/ApplicationLoadBalancerManagerImpl.java     |   0
 .../cloudstack/network/ssl/CertServiceImpl.java    |   0
 .../network/topology/AdvancedNetworkTopology.java  |   0
 .../network/topology/AdvancedNetworkVisitor.java   |   0
 .../network/topology/BasicNetworkTopology.java     |   0
 .../network/topology/BasicNetworkVisitor.java      |   0
 .../network/topology/NetworkTopology.java          |   0
 .../network/topology/NetworkTopologyContext.java   |   0
 .../network/topology/NetworkTopologyVisitor.java   |   0
 .../OutOfBandManagementServiceImpl.java            |   0
 .../outofbandmanagement/PowerOperationTask.java    |   0
 .../cloudstack/poll/BackgroundPollManagerImpl.java |   0
 .../apache/cloudstack/region/RegionAccount.java    |   0
 .../org/apache/cloudstack/region/RegionDomain.java |   0
 .../apache/cloudstack/region/RegionManager.java    |   0
 .../cloudstack/region/RegionManagerImpl.java       |   0
 .../cloudstack/region/RegionServiceImpl.java       |   0
 .../cloudstack/region/RegionServiceProvider.java   |   0
 .../org/apache/cloudstack/region/RegionUser.java   |   0
 .../apache/cloudstack/region/RegionsApiUtil.java   |   0
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |   0
 .../region/gslb/GslbServiceProvider.java           |   0
 .../deployment/RouterDeploymentDefinition.java     |   0
 .../RouterDeploymentDefinitionBuilder.java         |   0
 .../deployment/VpcRouterDeploymentDefinition.java  |   0
 .../core/spring-server-core-managers-context.xml   |   0
 .../core/spring-server-core-misc-context.xml       |   0
 .../server-alert-adapter-backend/module.properties |   0
 ...spring-server-alert-adapter-backend-context.xml |   0
 .../server-alert-adapter-compute/module.properties |   0
 ...spring-server-alert-adapter-compute-context.xml |   0
 .../server-alert-adapter-storage/module.properties |   0
 ...spring-server-alert-adapter-storage-context.xml |   0
 .../cloudstack/server-allocator/module.properties  |   0
 .../spring-server-allocator-context.xml            |   0
 .../cloudstack/server-api/module.properties        |   0
 .../server-api/spring-server-api-context.xml       |   0
 .../cloudstack/server-compute/module.properties    |   0
 .../spring-server-compute-context.xml              |   0
 .../cloudstack/server-discoverer/module.properties |   0
 .../spring-server-discoverer-context.xml           |   0
 .../cloudstack/server-fencer/module.properties     |   0
 .../server-fencer/spring-server-fencer-context.xml |   0
 .../server-investigator/module.properties          |   0
 .../spring-server-investigator-context.xml         |   0
 .../cloudstack/server-network/module.properties    |   0
 .../spring-server-network-context.xml              |   0
 .../cloudstack/server-planner/module.properties    |   0
 .../spring-server-planner-context.xml              |   0
 .../cloudstack/server-storage/module.properties    |   0
 .../spring-server-storage-context.xml              |   0
 .../server-template-adapter/module.properties      |   0
 .../spring-server-template-adapter-context.xml     |   0
 .../system/spring-server-system-context.xml        |   0
 .../com/cloud/upgrade/databaseCreatorContext.xml   |   0
 .../{ => src/main}/scripts/vmops-fix-mysql-config  |   0
 server/{ => src}/test/async-job-component.xml      |   0
 .../com/cloud/alert/AlertControlsUnitTest.java     |   0
 .../com/cloud/alert/MockAlertManagerImpl.java      |   0
 .../test/java}/com/cloud/api/APITest.java          |   0
 .../java}/com/cloud/api/ApiResponseHelperTest.java |   0
 .../test/java}/com/cloud/api/ApiServletTest.java   |   0
 .../test/java}/com/cloud/api/ListPerfTest.java     |   0
 .../test/java}/com/cloud/api/LoginResponse.java    |   0
 .../api/dispatch/CommandCreationWorkerTest.java    |   0
 .../api/dispatch/DispatchChainFactoryTest.java     |   0
 .../dispatch/ParamGenericValidationWorkerTest.java |   0
 .../cloud/api/dispatch/ParamProcessWorkerTest.java |   0
 .../dispatch/SpecificCmdValidationWorkerTest.java  |   0
 .../query/MutualExclusiveIdsManagerBaseTest.java   |   0
 .../GenericDaoBaseWithTagInformationBaseTest.java  |   0
 .../query/dao/SecurityGroupJoinDaoImplTest.java    |   0
 .../api/query/dao/TemplateJoinDaoImplTest.java     |   0
 .../cloud/api/query/dao/UserVmJoinDaoImplTest.java |   0
 .../cloud/api/query/dao/VolumeJoinDaoImplTest.java |   0
 .../com/cloud/capacity/CapacityManagerTest.java    |   0
 .../configuration/ConfigurationManagerTest.java    |   0
 .../cloud/configuration/ValidateIpRangeTest.java   |   0
 .../consoleproxy/ConsoleProxyManagerTest.java      |   0
 .../com/cloud/event/ActionEventUtilsTest.java      |   0
 .../com/cloud/event/EventControlsUnitTest.java     |   0
 .../cloud/ha/HighAvailabilityManagerImplTest.java  |   0
 .../test/java}/com/cloud/ha/KVMFencerTest.java     |   0
 .../java}/com/cloud/keystore/KeystoreTest.java     |   0
 .../metadata/ResourceMetaDataManagerTest.java      |   0
 .../cloud/network/CreatePrivateNetworkTest.java    |   0
 .../cloud/network/DedicateGuestVlanRangesTest.java |   0
 .../ExternalLoadBalancerDeviceManagerImplTest.java |   0
 .../com/cloud/network/IpAddressManagerTest.java    |   0
 .../com/cloud/network/MockFirewallManagerImpl.java |   0
 .../com/cloud/network/MockNetworkModelImpl.java    |   0
 .../NetworkManagerTestComponentLibrary.java        |   0
 .../java}/com/cloud/network/NetworkModelTest.java  |   0
 .../cloud/network/UpdatePhysicalNetworkTest.java   |   0
 .../com/cloud/network/dao/NetworkDaoTest.java      |   0
 .../element/ConfigDriveNetworkElementTest.java     |   0
 .../network/element/VirtualRouterElementTest.java  |   0
 .../element/VpcVirtualRouterElementTest.java       |   0
 .../network/firewall/FirewallManagerTest.java      |   0
 .../cloud/network/lb/AssignLoadBalancerTest.java   |   0
 .../cloud/network/lb/UpdateLoadBalancerTest.java   |   0
 .../network/router/NetworkHelperImplTest.java      |   0
 .../network/router/RouterControlHelperTest.java    |   0
 .../VirtualNetworkApplianceManagerImplTest.java    |   0
 .../security/SecurityGroupManagerImpl2Test.java    |   0
 .../security/SecurityGroupManagerImplTest.java     |   0
 .../SecurityGroupManagerTestConfiguration.java     |   0
 .../network/security/SecurityGroupQueueTest.java   |   0
 .../com/cloud/network/vpc/VpcManagerImplTest.java  |   0
 .../vpn/MockRemoteAccessVPNServiceProvider.java    |   0
 .../com/cloud/network/vpn/RemoteAccessVpnTest.java |   0
 .../com/cloud/projects/MockProjectManagerImpl.java |   0
 .../cloud/resource/MockResourceManagerImpl.java    |   0
 .../ResourceLimitManagerImplTest.java              |   0
 .../cloud/server/ConfigurationServerImplTest.java  |   0
 .../com/cloud/server/ManagementServerImplTest.java |   0
 .../com/cloud/servlet/ConsoleProxyServletTest.java |   0
 .../java}/com/cloud/snapshot/SnapshotDaoTest.java  |   0
 .../snapshot/SnapshotDaoTestConfiguration.java     |   0
 .../cloud/storage/ImageStoreDetailsUtilTest.java   |   0
 .../cloud/storage/VolumeApiServiceImplTest.java    |   0
 .../com/cloud/storage/dao/StoragePoolDaoTest.java  |   0
 .../dao/StoragePoolDaoTestConfiguration.java       |   0
 .../storage/listener/StoragePoolMonitorTest.java   |   0
 .../storage/snapshot/SnapshotManagerTest.java      |   0
 .../template/HypervisorTemplateAdapterTest.java    |   0
 .../cloud/template/TemplateManagerImplTest.java    |   0
 .../com/cloud/user/AccountManagerImplTest.java     |   0
 .../AccountManagerImplVolumeDeleteEventTest.java   |   0
 .../com/cloud/user/AccountManagetImplTestBase.java |   0
 .../com/cloud/user/DomainManagerImplTest.java      |   0
 .../com/cloud/user/MockAccountManagerImpl.java     |   0
 .../com/cloud/user/MockDomainManagerImpl.java      |   0
 .../java}/com/cloud/user/MockUsageEventDao.java    |   0
 .../vm/DeploymentPlanningManagerImplTest.java      |   0
 .../java}/com/cloud/vm/FirstFitPlannerTest.java    |   0
 .../test/java}/com/cloud/vm/UserVmManagerTest.java |   0
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |   0
 .../UserVmCloneSettingDaoTestConfiguration.java    |   0
 .../java}/com/cloud/vm/dao/UserVmDaoImplTest.java  |   0
 .../cloud/vm/dao/UserVmDaoTestConfiguration.java   |   0
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |   0
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   0
 .../com/cloud/vpc/MockNetworkManagerImpl.java      |   0
 .../java}/com/cloud/vpc/MockNetworkModelImpl.java  |   0
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   0
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |   0
 .../cloud/vpc/MockSite2SiteVpnServiceProvider.java |   0
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |   0
 .../java}/com/cloud/vpc/NetworkACLManagerTest.java |   0
 .../java}/com/cloud/vpc/NetworkACLServiceTest.java |   0
 .../test/java}/com/cloud/vpc/Site2SiteVpnTest.java |   0
 .../test/java}/com/cloud/vpc/VpcApiUnitTest.java   |   0
 .../java}/com/cloud/vpc/VpcTestConfiguration.java  |   0
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java    |   0
 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java      |   0
 .../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java  |   0
 .../dao/MockNetworkOfferingServiceMapDaoImpl.java  |   0
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java      |   0
 .../java}/com/cloud/vpc/dao/MockVpcDaoImpl.java    |   0
 .../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java  |   0
 .../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java  |   0
 .../cloud/vpc/dao/MockVpcVirtualRouterElement.java |   0
 .../cloudstack/affinity/AffinityApiUnitTest.java   |   0
 .../affinity/AffinityGroupServiceImplTest.java     |   0
 .../apache/cloudstack/ca/CABackgroundTaskTest.java |   0
 .../apache/cloudstack/ca/CAManagerImplTest.java    |   0
 .../download/DirectDownloadManagerImplTest.java    |   0
 .../network/lb/ApplicationLoadBalancerTest.java    |   0
 .../cloudstack/network/ssl/CertServiceTest.java    |   0
 .../networkoffering/ChildTestConfiguration.java    |   0
 .../networkoffering/CreateNetworkOfferingTest.java |   0
 .../OutOfBandManagementServiceTest.java            |   0
 .../poll/BackgroundPollManagerImplTest.java        |   0
 .../cloudstack/privategw/AclOnPrivateGwTest.java   |   0
 .../cloudstack/region/RegionManagerTest.java       |   0
 .../GlobalLoadBalancingRulesServiceImplTest.java   |   0
 .../cloudstack/service/ServiceOfferingVOTest.java  |   0
 .../deployment/RouterDeploymentDefinitionTest.java |   0
 .../RouterDeploymentDefinitionTestBase.java        |   0
 .../VpcRouterDeploymentDefinitionTest.java         |   0
 .../test/resources/CloneSettingDaoTestContext.xml  |   0
 .../resources/SecurityGroupManagerTestContext.xml  |   0
 .../test/resources/SnapshotDaoTestContext.xml      |   0
 .../test/resources/StoragePoolDaoTestContext.xml   |   0
 .../test/resources/UserVMDaoTestContext.xml        |   0
 .../test/resources/VpcApiUnitTestContext.xml       |   0
 server/{ => src}/test/resources/VpcTestContext.xml |   0
 .../{ => src}/test/resources/appLoadBalancer.xml   |   0
 .../test/resources/certs/bad_format_cert.crt       |   0
 .../test/resources/certs/dsa_self_signed.key       |   0
 .../test/resources/certs/expired_cert.crt          |   0
 server/{ => src}/test/resources/certs/non_root.crt |   0
 server/{ => src}/test/resources/certs/non_root.csr |   0
 server/{ => src}/test/resources/certs/non_root.key |   0
 .../test/resources/certs/non_x509_pem.crt          |   0
 .../{ => src}/test/resources/certs/root_chain.crt  |   0
 .../{ => src}/test/resources/certs/root_chain.csr  |   0
 .../{ => src}/test/resources/certs/root_chain.key  |   0
 .../test/resources/certs/rsa_ca_signed.crt         |   0
 .../test/resources/certs/rsa_ca_signed.csr         |   0
 .../test/resources/certs/rsa_ca_signed.key         |   0
 .../test/resources/certs/rsa_self_signed.crt       |   0
 .../test/resources/certs/rsa_self_signed.csr       |   0
 .../test/resources/certs/rsa_self_signed.key       |   0
 .../resources/certs/rsa_self_signed_with_pwd.crt   |   0
 .../resources/certs/rsa_self_signed_with_pwd.csr   |   0
 .../resources/certs/rsa_self_signed_with_pwd.key   |   0
 server/{ => src}/test/resources/cleanup.sql        |   0
 .../test/resources/createNetworkOffering.xml       |   0
 server/{ => src}/test/resources/db.properties      |   0
 server/{ => src}/test/resources/fake.sql           |   0
 .../test/resources/network-mgr-component.xml       |   0
 server/{ => src}/test/resources/testContext.xml    |   0
 server/{ => src}/test/sync-queue-component.xml     |   0
 services/console-proxy-rdp/rdpconsole/README.txt   |   0
 services/console-proxy-rdp/rdpconsole/pom.xml      |  19 -----
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |   0
 .../consoleproxy/AuthenticationException.java      |   0
 .../java}/com/cloud/consoleproxy/ConsoleProxy.java |   0
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |   0
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |   0
 .../ConsoleProxyAuthenticationResult.java          |   0
 .../ConsoleProxyBaseServerFactoryImpl.java         |   0
 .../com/cloud/consoleproxy/ConsoleProxyClient.java |   0
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |   0
 .../consoleproxy/ConsoleProxyClientListener.java   |   0
 .../consoleproxy/ConsoleProxyClientParam.java      |   0
 .../ConsoleProxyClientStatsCollector.java          |   0
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |   0
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |   0
 .../ConsoleProxyHttpHandlerHelper.java             |   0
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |   0
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |   0
 .../ConsoleProxyPasswordBasedEncryptor.java        |   0
 .../cloud/consoleproxy/ConsoleProxyRdpClient.java  |   0
 .../consoleproxy/ConsoleProxyResourceHandler.java  |   0
 .../ConsoleProxySecureServerFactoryImpl.java       |   0
 .../consoleproxy/ConsoleProxyServerFactory.java    |   0
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |   0
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |   0
 .../com/cloud/consoleproxy/InputEventType.java     |   0
 .../cloud/consoleproxy/rdp/KeysymToKeycode.java    |   0
 .../consoleproxy/rdp/RdpBufferedImageCanvas.java   |   0
 .../cloud/consoleproxy/util/ITileScanListener.java |   0
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   0
 .../java}/com/cloud/consoleproxy/util/Logger.java  |   0
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   0
 .../java}/com/cloud/consoleproxy/util/RawHTTP.java |   0
 .../java}/com/cloud/consoleproxy/util/Region.java  |   0
 .../cloud/consoleproxy/util/RegionClassifier.java  |   0
 .../com/cloud/consoleproxy/util/TileInfo.java      |   0
 .../com/cloud/consoleproxy/util/TileTracker.java   |   0
 .../consoleproxy/vnc/BufferedImageCanvas.java      |   0
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   0
 .../vnc/FrameBufferUpdateListener.java             |   0
 .../vnc/PaintNotificationListener.java             |   0
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |   0
 .../com/cloud/consoleproxy/vnc/VncClient.java      |   0
 .../consoleproxy/vnc/VncClientPacketSender.java    |   0
 .../consoleproxy/vnc/VncScreenDescription.java     |   0
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |   0
 .../vnc/packet/client/ClientPacket.java            |   0
 .../client/FramebufferUpdateRequestPacket.java     |   0
 .../vnc/packet/client/KeyboardEventPacket.java     |   0
 .../vnc/packet/client/MouseEventPacket.java        |   0
 .../vnc/packet/client/SetEncodingsPacket.java      |   0
 .../vnc/packet/client/SetPixelFormatPacket.java    |   0
 .../vnc/packet/server/AbstractRect.java            |   0
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   0
 .../server/FrameBufferSizeChangeRequest.java       |   0
 .../vnc/packet/server/FramebufferUpdatePacket.java |   0
 .../consoleproxy/vnc/packet/server/RawRect.java    |   0
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   0
 .../vnc/packet/server/ServerCutText.java           |   0
 .../consoleproxy/ConsoleProxyRdpClientTest.java    |   0
 .../api/command/iam/AddAccountToIAMGroupCmd.java   |   0
 .../iam/AddIAMPermissionToIAMPolicyCmd.java        |   0
 .../command/iam/AttachIAMPolicyToAccountCmd.java   |   0
 .../command/iam/AttachIAMPolicyToIAMGroupCmd.java  |   0
 .../api/command/iam/CreateIAMGroupCmd.java         |   0
 .../api/command/iam/CreateIAMPolicyCmd.java        |   0
 .../api/command/iam/DeleteIAMGroupCmd.java         |   0
 .../api/command/iam/DeleteIAMPolicyCmd.java        |   0
 .../api/command/iam/ListIAMGroupsCmd.java          |   0
 .../api/command/iam/ListIAMPoliciesCmd.java        |   0
 .../command/iam/RemoveAccountFromIAMGroupCmd.java  |   0
 .../iam/RemoveIAMPermissionFromIAMPolicyCmd.java   |   0
 .../command/iam/RemoveIAMPolicyFromAccountCmd.java |   0
 .../iam/RemoveIAMPolicyFromIAMGroupCmd.java        |   0
 .../api/response/iam/IAMGroupResponse.java         |   0
 .../api/response/iam/IAMPermissionResponse.java    |   0
 .../api/response/iam/IAMPolicyResponse.java        |   0
 .../org/apache/cloudstack/iam/IAMApiService.java   |   0
 .../apache/cloudstack/iam/IAMApiServiceImpl.java   |   0
 .../cloudstack/iam/RoleBasedAPIAccessChecker.java  |   0
 .../iam/RoleBasedEntityAccessChecker.java          |   0
 .../iam/RoleBasedEntityQuerySelector.java          |   0
 .../iam-access-checkers/module.properties          |   0
 .../spring-iam-access-checkers-context.xml         |   0
 .../cloudstack/iam/test/IAMApiServiceTest.java     |   0
 .../plugin/{ => src}/test/resources/db.properties  |   0
 .../org/apache/cloudstack/iam/api/IAMGroup.java    |   0
 .../org/apache/cloudstack/iam/api/IAMPolicy.java   |   0
 .../cloudstack/iam/api/IAMPolicyPermission.java    |   0
 .../org/apache/cloudstack/iam/api/IAMService.java  |   0
 .../iam/server/IAMAccountPolicyMapVO.java          |   0
 .../iam/server/IAMGroupAccountMapVO.java           |   0
 .../cloudstack/iam/server/IAMGroupPolicyMapVO.java |   0
 .../apache/cloudstack/iam/server/IAMGroupVO.java   |   0
 .../iam/server/IAMPolicyPermissionVO.java          |   0
 .../apache/cloudstack/iam/server/IAMPolicyVO.java  |   0
 .../cloudstack/iam/server/IAMServiceImpl.java      |   0
 .../iam/server/dao/IAMAccountPolicyMapDao.java     |   0
 .../iam/server/dao/IAMAccountPolicyMapDaoImpl.java |   0
 .../iam/server/dao/IAMGroupAccountMapDao.java      |   0
 .../iam/server/dao/IAMGroupAccountMapDaoImpl.java  |   0
 .../cloudstack/iam/server/dao/IAMGroupDao.java     |   0
 .../cloudstack/iam/server/dao/IAMGroupDaoImpl.java |   0
 .../iam/server/dao/IAMGroupPolicyMapDao.java       |   0
 .../iam/server/dao/IAMGroupPolicyMapDaoImpl.java   |   0
 .../cloudstack/iam/server/dao/IAMPolicyDao.java    |   0
 .../iam/server/dao/IAMPolicyDaoImpl.java           |   0
 .../iam/server/dao/IAMPolicyPermissionDao.java     |   0
 .../iam/server/dao/IAMPolicyPermissionDaoImpl.java |   0
 .../cloudstack/core/spring-iam-server-context.xml  |   0
 .../apache/cloudstack/iam/IAMServiceUnitTest.java  |   0
 .../server/{ => src}/test/resources/db.properties  |   0
 .../PremiumSecondaryStorageManagerImpl.java        |   0
 .../SecondaryStorageManagerImpl.java               |   0
 ...s-secondary-storage-controller-core-context.xml |   0
 .../SecondaryStorageManagerTest.java               |   0
 .../storage/resource/HttpUploadServerHandler.java  |   0
 .../resource/LocalNfsSecondaryStorageResource.java |   0
 .../resource/LocalSecondaryStorageResource.java    |   0
 .../resource/NfsSecondaryStorageResource.java      |   0
 .../resource/SecondaryStorageDiscoverer.java       |   0
 .../storage/resource/SecondaryStorageResource.java |   0
 .../resource/SecondaryStorageResourceHandler.java  |   0
 .../storage/template/DownloadManager.java          |   0
 .../storage/template/DownloadManagerImpl.java      |   0
 .../cloudstack/storage/template/UploadEntity.java  |   0
 .../cloudstack/storage/template/UploadManager.java |   0
 .../storage/template/UploadManagerImpl.java        |   0
 .../secondary-storage-discoverer/module.properties |   0
 ...spring-secondary-storage-discoverer-context.xml |   0
 .../LocalNfsSecondaryStorageResourceTest.java      |   0
 .../resource/NfsSecondaryStorageResourceTest.java  |   0
 test/pom.xml                                       |   2 -
 .../com/cloud/sample/UserCloudAPIExecutor.java     |   0
 .../com/cloud/test/longrun/BuildGuestNetwork.java  |   0
 .../java}/com/cloud/test/longrun/GuestNetwork.java |   0
 .../com/cloud/test/longrun/PerformanceWithAPI.java |   0
 .../main/java}/com/cloud/test/longrun/User.java    |   0
 .../com/cloud/test/longrun/VirtualMachine.java     |   0
 .../com/cloud/test/regression/ApiCommand.java      |   0
 .../com/cloud/test/regression/ConfigTest.java      |   0
 .../cloud/test/regression/DelegatedAdminTest.java  |   0
 .../java}/com/cloud/test/regression/Deploy.java    |   0
 .../com/cloud/test/regression/EventsApiTest.java   |   0
 .../main/java}/com/cloud/test/regression/HA.java   |   0
 .../cloud/test/regression/LoadBalancingTest.java   |   0
 .../cloud/test/regression/PortForwardingTest.java  |   0
 .../com/cloud/test/regression/SanityTest.java      |   0
 .../main/java}/com/cloud/test/regression/Test.java |   0
 .../java}/com/cloud/test/regression/TestCase.java  |   0
 .../com/cloud/test/regression/TestCaseEngine.java  |   0
 .../java}/com/cloud/test/regression/VMApiTest.java |   0
 .../main/java}/com/cloud/test/stress/SshTest.java  |   0
 .../cloud/test/stress/StressTestDirectAttach.java  |   0
 .../com/cloud/test/stress/TestClientWithAPI.java   |   0
 .../main/java}/com/cloud/test/stress/WgetTest.java |   0
 .../cloud/test/ui/AbstractSeleniumTestCase.java    |   0
 .../java}/com/cloud/test/ui/AddAndDeleteAISO.java  |   0
 .../com/cloud/test/ui/AddAndDeleteATemplate.java   |   0
 .../java}/com/cloud/test/ui/UIScenarioTest.java    |   0
 .../java}/com/cloud/test/utils/ConsoleProxy.java   |   0
 .../java}/com/cloud/test/utils/IpSqlGenerator.java |   0
 .../java}/com/cloud/test/utils/ProxyLoadTemp.java  |   0
 .../main/java}/com/cloud/test/utils/SignEC2.java   |   0
 .../java}/com/cloud/test/utils/SignRequest.java    |   0
 .../com/cloud/test/utils/SqlDataGenerator.java     |   0
 .../java}/com/cloud/test/utils/SubmitCert.java     |   0
 .../java}/com/cloud/test/utils/TestClient.java     |   0
 .../java}/com/cloud/test/utils/UtilsForTest.java   |   0
 tools/apidoc/pom.xml                               |   2 +-
 tools/whisker/LICENSE                              |   4 +-
 tools/whisker/descriptor-for-packaging.xml         |   4 +-
 tools/whisker/descriptor.xml                       |   4 +-
 .../java}/org/apache/cloudstack/wix/HeatMojo.java  |   0
 usage/pom.xml                                      |   5 --
 .../usage/parser/VMSanpshotOnPrimaryParser.java    |   0
 .../java}/com/cloud/usage/StorageTypes.java        |   0
 .../com/cloud/usage/UsageAlertManagerImpl.java     |   0
 .../java}/com/cloud/usage/UsageManager.java        |   0
 .../java}/com/cloud/usage/UsageManagerImpl.java    |   0
 .../java}/com/cloud/usage/UsageSanityChecker.java  |   0
 .../java}/com/cloud/usage/UsageServer.java         |   0
 .../cloud/usage/parser/IPAddressUsageParser.java   |   0
 .../usage/parser/LoadBalancerUsageParser.java      |   0
 .../usage/parser/NetworkOfferingUsageParser.java   |   0
 .../com/cloud/usage/parser/NetworkUsageParser.java |   0
 .../usage/parser/PortForwardingUsageParser.java    |   0
 .../usage/parser/SecurityGroupUsageParser.java     |   0
 .../com/cloud/usage/parser/StorageUsageParser.java |   0
 .../java}/com/cloud/usage/parser/UsageParser.java  |   0
 .../cloud/usage/parser/VMInstanceUsageParser.java  |   0
 .../cloud/usage/parser/VMSnapshotUsageParser.java  |   0
 .../com/cloud/usage/parser/VPNUserUsageParser.java |   0
 .../com/cloud/usage/parser/VmDiskUsageParser.java  |   0
 .../com/cloud/usage/parser/VolumeUsageParser.java  |   0
 .../main}/resources/usageApplicationContext.xml    |   0
 .../java}/com/cloud/usage/UsageManagerTest.java    |   0
 .../cloud/usage/UsageManagerTestConfiguration.java |   0
 .../com/cloud/usage/UsageSanityCheckerIT.java      |   0
 .../com/cloud/usage/UsageSanityCheckerTest.java    |   0
 .../test/resources/UsageManagerTestContext.xml     |   0
 usage/{ => src}/test/resources/cloud1.xml          |   0
 usage/{ => src}/test/resources/cloud2.xml          |   0
 usage/{ => src}/test/resources/cloud3.xml          |   0
 usage/{ => src}/test/resources/cloud_usage1.xml    |   0
 usage/{ => src}/test/resources/cloud_usage2.xml    |   0
 usage/{ => src}/test/resources/cloud_usage3.xml    |   0
 .../src}/test/resources/db.properties              |   0
 utils/pom.xml                                      |  14 ----
 .../com/cloud/hypervisor/vmware/mo/BaseMO.java     |   0
 .../com/cloud/hypervisor/vmware/mo/ClusterMO.java  |   0
 .../hypervisor/vmware/mo/CustomFieldConstants.java |   0
 .../vmware/mo/CustomFieldsManagerMO.java           |   0
 .../cloud/hypervisor/vmware/mo/DatacenterMO.java   |   0
 .../cloud/hypervisor/vmware/mo/DatastoreFile.java  |   0
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java    |   0
 .../hypervisor/vmware/mo/DiskControllerType.java   |   0
 .../vmware/mo/DistributedVirtualSwitchMO.java      |   0
 .../hypervisor/vmware/mo/FeatureKeyConstants.java  |   0
 .../vmware/mo/HostDatastoreBrowserMO.java          |   0
 .../vmware/mo/HostDatastoreSystemMO.java           |   0
 .../hypervisor/vmware/mo/HostFirewallSystemMO.java |   0
 .../com/cloud/hypervisor/vmware/mo/HostMO.java     |   0
 .../hypervisor/vmware/mo/HostNetworkSystemMO.java  |   0
 .../hypervisor/vmware/mo/HostStorageSystemMO.java  |   0
 .../hypervisor/vmware/mo/HostVirtualNicType.java   |   0
 .../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java |   0
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |   0
 .../vmware/mo/LicenseAssignmentManagerMO.java      |   0
 .../hypervisor/vmware/mo/LicenseManagerMO.java     |   0
 .../cloud/hypervisor/vmware/mo/NetworkDetails.java |   0
 .../com/cloud/hypervisor/vmware/mo/NetworkMO.java  |   0
 .../vmware/mo/PerfCounterInfoMapper.java           |   0
 .../cloud/hypervisor/vmware/mo/PerfManagerMO.java  |   0
 .../vmware/mo/ScsiDiskControllerType.java          |   0
 .../hypervisor/vmware/mo/SnapshotDescriptor.java   |   0
 .../com/cloud/hypervisor/vmware/mo/TaskMO.java     |   0
 .../hypervisor/vmware/mo/VersioningContants.java   |   0
 .../hypervisor/vmware/mo/VirtualDiskManagerMO.java |   0
 .../vmware/mo/VirtualEthernetCardType.java         |   0
 .../vmware/mo/VirtualMachineDiskInfoBuilder.java   |   0
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |   0
 .../hypervisor/vmware/mo/VirtualSwitchType.java    |   0
 .../hypervisor/vmware/mo/VmdkAdapterType.java      |   0
 .../hypervisor/vmware/mo/VmdkFileDescriptor.java   |   0
 .../cloud/hypervisor/vmware/mo/VmwareHostType.java |   0
 .../hypervisor/vmware/mo/VmwareHypervisorHost.java |   0
 .../mo/VmwareHypervisorHostNetworkSummary.java     |   0
 .../mo/VmwareHypervisorHostResourceSummary.java    |   0
 .../cloud/hypervisor/vmware/util/VmwareClient.java |   0
 .../hypervisor/vmware/util/VmwareContext.java      |   0
 .../hypervisor/vmware/util/VmwareContextPool.java  |   0
 .../vmware/util/VmwareGuestOsMapper.java           |   0
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |   0
 .../hypervisor/vmware/mo/DatastoreMOTest.java      |   0
 .../vmware/mo/HypervisorHostHelperTest.java        |   0
 .../vmware/mo/TestVmwareContextFactory.java        |   0
 .../hypervisor/vmware/mo/VirtualMachineMOTest.java |   0
 .../cloud/hypervisor/vmware/mo/VmwareMOTest.java   |   0
 .../vmware/util/VmwareContextPoolTest.java         |   0
 .../hypervisor/vmware/util/VmwareContextTest.java  |   0
 5435 files changed, 100 insertions(+), 314 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0dcb45c..48d8526 100644
--- a/LICENSE
+++ b/LICENSE
@@ -612,13 +612,13 @@ Within the ui/lib/qunit directory
             qunit.css  from http://docs.jquery.com/QUnit
             qunit.js  from http://docs.jquery.com/QUnit
 
-Within the utils/src/com/cloud/utils/db directory
+Within the utils/src/main/java/com/cloud/utils/db directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
     Copyright (c) 2004 Clinton Begin
         from Clinton Begin  http://code.google.com/p/mybatis/ 
             ScriptRunner.java  from http://code.google.com/p/mybatis/
 
-Within the utils/src/org/apache/commons/httpclient/contrib/ssl directory
+Within the utils/src/main/java/org/apache/commons/httpclient/contrib/ssl directory
     licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
     Copyright (c) 2007 The Apache Software Foundation
         from The Apache Software Foundation  http://www.apache.org/ 
diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/main/java/com/cloud/agent/Agent.java
similarity index 100%
rename from agent/src/com/cloud/agent/Agent.java
rename to agent/src/main/java/com/cloud/agent/Agent.java
diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/main/java/com/cloud/agent/AgentShell.java
similarity index 100%
rename from agent/src/com/cloud/agent/AgentShell.java
rename to agent/src/main/java/com/cloud/agent/AgentShell.java
diff --git a/agent/src/com/cloud/agent/IAgentShell.java b/agent/src/main/java/com/cloud/agent/IAgentShell.java
similarity index 100%
rename from agent/src/com/cloud/agent/IAgentShell.java
rename to agent/src/main/java/com/cloud/agent/IAgentShell.java
diff --git a/agent/src/com/cloud/agent/direct/download/DirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloader.java
similarity index 100%
rename from agent/src/com/cloud/agent/direct/download/DirectTemplateDownloader.java
rename to agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloader.java
diff --git a/agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImpl.java
similarity index 100%
rename from agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java
rename to agent/src/main/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImpl.java
diff --git a/agent/src/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/HttpDirectTemplateDownloader.java
similarity index 100%
rename from agent/src/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java
rename to agent/src/main/java/com/cloud/agent/agent/direct/download/HttpDirectTemplateDownloader.java
diff --git a/agent/src/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/HttpsDirectTemplateDownloader.java
similarity index 100%
rename from agent/src/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java
rename to agent/src/main/java/com/cloud/agent/agent/direct/download/HttpsDirectTemplateDownloader.java
diff --git a/agent/src/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/MetalinkDirectTemplateDownloader.java
similarity index 100%
rename from agent/src/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java
rename to agent/src/main/java/com/cloud/agent/agent/direct/download/MetalinkDirectTemplateDownloader.java
diff --git a/agent/src/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/agent/direct/download/NfsDirectTemplateDownloader.java
similarity index 100%
rename from agent/src/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java
rename to agent/src/main/java/com/cloud/agent/agent/direct/download/NfsDirectTemplateDownloader.java
diff --git a/agent/src/com/cloud/agent/dao/StorageComponent.java b/agent/src/main/java/com/cloud/agent/dao/StorageComponent.java
similarity index 100%
rename from agent/src/com/cloud/agent/dao/StorageComponent.java
rename to agent/src/main/java/com/cloud/agent/dao/StorageComponent.java
diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java
similarity index 100%
rename from agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
rename to agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java
diff --git a/agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java b/agent/src/main/java/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
similarity index 100%
rename from agent/src/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
rename to agent/src/main/java/com/cloud/agent/dhcp/DhcpProtocolParserServer.java
diff --git a/agent/src/com/cloud/agent/dhcp/DhcpSnooper.java b/agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java
similarity index 100%
rename from agent/src/com/cloud/agent/dhcp/DhcpSnooper.java
rename to agent/src/main/java/com/cloud/agent/dhcp/DhcpSnooper.java
diff --git a/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java b/agent/src/main/java/com/cloud/agent/dhcp/FakeDhcpSnooper.java
similarity index 100%
rename from agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
rename to agent/src/main/java/com/cloud/agent/dhcp/FakeDhcpSnooper.java
diff --git a/agent/src/com/cloud/agent/mockvm/MockVm.java b/agent/src/main/java/com/cloud/agent/mockvm/MockVm.java
similarity index 100%
rename from agent/src/com/cloud/agent/mockvm/MockVm.java
rename to agent/src/main/java/com/cloud/agent/mockvm/MockVm.java
diff --git a/agent/src/com/cloud/agent/mockvm/MockVmMgr.java b/agent/src/main/java/com/cloud/agent/mockvm/MockVmMgr.java
similarity index 100%
rename from agent/src/com/cloud/agent/mockvm/MockVmMgr.java
rename to agent/src/main/java/com/cloud/agent/mockvm/MockVmMgr.java
diff --git a/agent/src/com/cloud/agent/mockvm/VmMgr.java b/agent/src/main/java/com/cloud/agent/mockvm/VmMgr.java
similarity index 100%
rename from agent/src/com/cloud/agent/mockvm/VmMgr.java
rename to agent/src/main/java/com/cloud/agent/mockvm/VmMgr.java
diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/main/java/com/cloud/agent/resource/DummyResource.java
similarity index 100%
rename from agent/src/com/cloud/agent/resource/DummyResource.java
rename to agent/src/main/java/com/cloud/agent/resource/DummyResource.java
diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java
similarity index 100%
rename from agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java
rename to agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyAuthenticationResult.java
diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
similarity index 100%
rename from agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
rename to agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
diff --git a/agent/src/com/cloud/agent/vmdata/VmDataServer.java b/agent/src/main/java/com/cloud/agent/vmdata/VmDataServer.java
similarity index 100%
rename from agent/src/com/cloud/agent/vmdata/VmDataServer.java
rename to agent/src/main/java/com/cloud/agent/vmdata/VmDataServer.java
diff --git a/agent/test/com/cloud/agent/AgentShellTest.java b/agent/src/test/java/com/cloud/agent/AgentShellTest.java
similarity index 100%
rename from agent/test/com/cloud/agent/AgentShellTest.java
rename to agent/src/test/java/com/cloud/agent/AgentShellTest.java
diff --git a/agent/test/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/agent/src/test/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImplTest.java
similarity index 100%
rename from agent/test/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
rename to agent/src/test/java/com/cloud/agent/agent/direct/download/DirectTemplateDownloaderImplTest.java
diff --git a/agent/test/com/cloud/agent/dao/impl/PropertiesStorageTest.java b/agent/src/test/java/com/cloud/agent/dao/impl/PropertiesStorageTest.java
similarity index 100%
rename from agent/test/com/cloud/agent/dao/impl/PropertiesStorageTest.java
rename to agent/src/test/java/com/cloud/agent/dao/impl/PropertiesStorageTest.java
diff --git a/api/src/com/cloud/agent/api/Answer.java b/api/src/main/java/com/cloud/agent/api/Answer.java
similarity index 100%
rename from api/src/com/cloud/agent/api/Answer.java
rename to api/src/main/java/com/cloud/agent/api/Answer.java
diff --git a/api/src/com/cloud/agent/api/BadCommand.java b/api/src/main/java/com/cloud/agent/api/BadCommand.java
similarity index 100%
rename from api/src/com/cloud/agent/api/BadCommand.java
rename to api/src/main/java/com/cloud/agent/api/BadCommand.java
diff --git a/api/src/com/cloud/agent/api/Command.java b/api/src/main/java/com/cloud/agent/api/Command.java
similarity index 100%
rename from api/src/com/cloud/agent/api/Command.java
rename to api/src/main/java/com/cloud/agent/api/Command.java
diff --git a/api/src/com/cloud/agent/api/HostVmStateReportEntry.java b/api/src/main/java/com/cloud/agent/api/HostVmStateReportEntry.java
similarity index 100%
rename from api/src/com/cloud/agent/api/HostVmStateReportEntry.java
rename to api/src/main/java/com/cloud/agent/api/HostVmStateReportEntry.java
diff --git a/api/src/com/cloud/agent/api/LogLevel.java b/api/src/main/java/com/cloud/agent/api/LogLevel.java
similarity index 100%
rename from api/src/com/cloud/agent/api/LogLevel.java
rename to api/src/main/java/com/cloud/agent/api/LogLevel.java
diff --git a/api/src/com/cloud/agent/api/PvlanSetupCommand.java b/api/src/main/java/com/cloud/agent/api/PvlanSetupCommand.java
similarity index 100%
rename from api/src/com/cloud/agent/api/PvlanSetupCommand.java
rename to api/src/main/java/com/cloud/agent/api/PvlanSetupCommand.java
diff --git a/api/src/com/cloud/agent/api/StoragePoolInfo.java b/api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java
similarity index 100%
rename from api/src/com/cloud/agent/api/StoragePoolInfo.java
rename to api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java
diff --git a/api/src/com/cloud/agent/api/UnsupportedAnswer.java b/api/src/main/java/com/cloud/agent/api/UnsupportedAnswer.java
similarity index 100%
rename from api/src/com/cloud/agent/api/UnsupportedAnswer.java
rename to api/src/main/java/com/cloud/agent/api/UnsupportedAnswer.java
diff --git a/api/src/com/cloud/agent/api/VgpuTypesInfo.java b/api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java
similarity index 100%
rename from api/src/com/cloud/agent/api/VgpuTypesInfo.java
rename to api/src/main/java/com/cloud/agent/api/VgpuTypesInfo.java
diff --git a/api/src/com/cloud/agent/api/storage/OVFHelper.java b/api/src/main/java/com/cloud/agent/api/api/storage/OVFHelper.java
similarity index 100%
rename from api/src/com/cloud/agent/api/storage/OVFHelper.java
rename to api/src/main/java/com/cloud/agent/api/api/storage/OVFHelper.java
diff --git a/api/src/com/cloud/agent/api/to/DatadiskTO.java b/api/src/main/java/com/cloud/agent/api/api/to/DatadiskTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/DatadiskTO.java
rename to api/src/main/java/com/cloud/agent/api/api/to/DatadiskTO.java
diff --git a/api/src/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java b/api/src/main/java/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java
similarity index 100%
rename from api/src/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java
rename to api/src/main/java/com/cloud/agent/api/storage/CopyTemplateToPrimaryStorageAnswer.java
diff --git a/api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java b/api/src/main/java/com/cloud/agent/api/storage/CreateVolumeOVACommand.java
similarity index 100%
rename from api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java
rename to api/src/main/java/com/cloud/agent/api/storage/CreateVolumeOVACommand.java
diff --git a/api/src/com/cloud/agent/api/storage/PasswordAuth.java b/api/src/main/java/com/cloud/agent/api/storage/PasswordAuth.java
similarity index 100%
rename from api/src/com/cloud/agent/api/storage/PasswordAuth.java
rename to api/src/main/java/com/cloud/agent/api/storage/PasswordAuth.java
diff --git a/api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java b/api/src/main/java/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java
similarity index 100%
rename from api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java
rename to api/src/main/java/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java
diff --git a/api/src/com/cloud/agent/api/to/DataObjectType.java b/api/src/main/java/com/cloud/agent/api/to/DataObjectType.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/DataObjectType.java
rename to api/src/main/java/com/cloud/agent/api/to/DataObjectType.java
diff --git a/api/src/com/cloud/agent/api/to/DataStoreTO.java b/api/src/main/java/com/cloud/agent/api/to/DataStoreTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/DataStoreTO.java
rename to api/src/main/java/com/cloud/agent/api/to/DataStoreTO.java
diff --git a/api/src/com/cloud/agent/api/to/DataTO.java b/api/src/main/java/com/cloud/agent/api/to/DataTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/DataTO.java
rename to api/src/main/java/com/cloud/agent/api/to/DataTO.java
diff --git a/api/src/com/cloud/agent/api/to/DhcpTO.java b/api/src/main/java/com/cloud/agent/api/to/DhcpTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/DhcpTO.java
rename to api/src/main/java/com/cloud/agent/api/to/DhcpTO.java
diff --git a/api/src/com/cloud/agent/api/to/DiskTO.java b/api/src/main/java/com/cloud/agent/api/to/DiskTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/DiskTO.java
rename to api/src/main/java/com/cloud/agent/api/to/DiskTO.java
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/FirewallRuleTO.java
rename to api/src/main/java/com/cloud/agent/api/to/FirewallRuleTO.java
diff --git a/api/src/com/cloud/agent/api/to/GPUDeviceTO.java b/api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/GPUDeviceTO.java
rename to api/src/main/java/com/cloud/agent/api/to/GPUDeviceTO.java
diff --git a/api/src/com/cloud/agent/api/to/HostTO.java b/api/src/main/java/com/cloud/agent/api/to/HostTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/HostTO.java
rename to api/src/main/java/com/cloud/agent/api/to/HostTO.java
diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/main/java/com/cloud/agent/api/to/IpAddressTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/IpAddressTO.java
rename to api/src/main/java/com/cloud/agent/api/to/IpAddressTO.java
diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/LoadBalancerTO.java
rename to api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java
diff --git a/api/src/com/cloud/agent/api/to/MonitorServiceTO.java b/api/src/main/java/com/cloud/agent/api/to/MonitorServiceTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/MonitorServiceTO.java
rename to api/src/main/java/com/cloud/agent/api/to/MonitorServiceTO.java
diff --git a/api/src/com/cloud/agent/api/to/NetworkACLTO.java b/api/src/main/java/com/cloud/agent/api/to/NetworkACLTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/NetworkACLTO.java
rename to api/src/main/java/com/cloud/agent/api/to/NetworkACLTO.java
diff --git a/api/src/com/cloud/agent/api/to/NetworkTO.java b/api/src/main/java/com/cloud/agent/api/to/NetworkTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/NetworkTO.java
rename to api/src/main/java/com/cloud/agent/api/to/NetworkTO.java
diff --git a/api/src/com/cloud/agent/api/to/NfsTO.java b/api/src/main/java/com/cloud/agent/api/to/NfsTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/NfsTO.java
rename to api/src/main/java/com/cloud/agent/api/to/NfsTO.java
diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/main/java/com/cloud/agent/api/to/NicTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/NicTO.java
rename to api/src/main/java/com/cloud/agent/api/to/NicTO.java
diff --git a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
rename to api/src/main/java/com/cloud/agent/api/to/PortForwardingRuleTO.java
diff --git a/api/src/com/cloud/agent/api/to/S3TO.java b/api/src/main/java/com/cloud/agent/api/to/S3TO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/S3TO.java
rename to api/src/main/java/com/cloud/agent/api/to/S3TO.java
diff --git a/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java b/api/src/main/java/com/cloud/agent/api/to/StaticNatRuleTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/StaticNatRuleTO.java
rename to api/src/main/java/com/cloud/agent/api/to/StaticNatRuleTO.java
diff --git a/api/src/com/cloud/agent/api/to/StorageFilerTO.java b/api/src/main/java/com/cloud/agent/api/to/StorageFilerTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/StorageFilerTO.java
rename to api/src/main/java/com/cloud/agent/api/to/StorageFilerTO.java
diff --git a/api/src/com/cloud/agent/api/to/SwiftTO.java b/api/src/main/java/com/cloud/agent/api/to/SwiftTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/SwiftTO.java
rename to api/src/main/java/com/cloud/agent/api/to/SwiftTO.java
diff --git a/api/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/main/java/com/cloud/agent/api/to/TemplateTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/TemplateTO.java
rename to api/src/main/java/com/cloud/agent/api/to/TemplateTO.java
diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/VirtualMachineTO.java
rename to api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/main/java/com/cloud/agent/api/to/VolumeTO.java
similarity index 100%
rename from api/src/com/cloud/agent/api/to/VolumeTO.java
rename to api/src/main/java/com/cloud/agent/api/to/VolumeTO.java
diff --git a/api/src/com/cloud/agent/manager/allocator/HostAllocator.java b/api/src/main/java/com/cloud/agent/manager/allocator/HostAllocator.java
similarity index 100%
rename from api/src/com/cloud/agent/manager/allocator/HostAllocator.java
rename to api/src/main/java/com/cloud/agent/manager/allocator/HostAllocator.java
diff --git a/api/src/com/cloud/agent/manager/allocator/PodAllocator.java b/api/src/main/java/com/cloud/agent/manager/allocator/PodAllocator.java
similarity index 100%
rename from api/src/com/cloud/agent/manager/allocator/PodAllocator.java
rename to api/src/main/java/com/cloud/agent/manager/allocator/PodAllocator.java
diff --git a/api/src/com/cloud/alert/Alert.java b/api/src/main/java/com/cloud/alert/Alert.java
similarity index 100%
rename from api/src/com/cloud/alert/Alert.java
rename to api/src/main/java/com/cloud/alert/Alert.java
diff --git a/api/src/com/cloud/alert/AlertAdapter.java b/api/src/main/java/com/cloud/alert/AlertAdapter.java
similarity index 100%
rename from api/src/com/cloud/alert/AlertAdapter.java
rename to api/src/main/java/com/cloud/alert/AlertAdapter.java
diff --git a/api/src/com/cloud/api/commands/.gitignore b/api/src/main/java/com/cloud/api/commands/.gitignore
similarity index 100%
rename from api/src/com/cloud/api/commands/.gitignore
rename to api/src/main/java/com/cloud/api/commands/.gitignore
diff --git a/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/api/src/main/java/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
similarity index 100%
rename from api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
rename to api/src/main/java/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
diff --git a/api/src/com/cloud/capacity/Capacity.java b/api/src/main/java/com/cloud/capacity/Capacity.java
similarity index 100%
rename from api/src/com/cloud/capacity/Capacity.java
rename to api/src/main/java/com/cloud/capacity/Capacity.java
diff --git a/api/src/com/cloud/capacity/CapacityState.java b/api/src/main/java/com/cloud/capacity/CapacityState.java
similarity index 100%
rename from api/src/com/cloud/capacity/CapacityState.java
rename to api/src/main/java/com/cloud/capacity/CapacityState.java
diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java
similarity index 100%
rename from api/src/com/cloud/configuration/ConfigurationService.java
rename to api/src/main/java/com/cloud/configuration/ConfigurationService.java
diff --git a/api/src/com/cloud/configuration/Resource.java b/api/src/main/java/com/cloud/configuration/Resource.java
similarity index 100%
rename from api/src/com/cloud/configuration/Resource.java
rename to api/src/main/java/com/cloud/configuration/Resource.java
diff --git a/api/src/com/cloud/configuration/ResourceCount.java b/api/src/main/java/com/cloud/configuration/ResourceCount.java
similarity index 100%
rename from api/src/com/cloud/configuration/ResourceCount.java
rename to api/src/main/java/com/cloud/configuration/ResourceCount.java
diff --git a/api/src/com/cloud/configuration/ResourceLimit.java b/api/src/main/java/com/cloud/configuration/ResourceLimit.java
similarity index 100%
rename from api/src/com/cloud/configuration/ResourceLimit.java
rename to api/src/main/java/com/cloud/configuration/ResourceLimit.java
diff --git a/api/src/com/cloud/consoleproxy/ConsoleProxyAllocator.java b/api/src/main/java/com/cloud/consoleproxy/ConsoleProxyAllocator.java
similarity index 100%
rename from api/src/com/cloud/consoleproxy/ConsoleProxyAllocator.java
rename to api/src/main/java/com/cloud/consoleproxy/ConsoleProxyAllocator.java
diff --git a/api/src/com/cloud/dc/DataCenter.java b/api/src/main/java/com/cloud/dc/DataCenter.java
similarity index 100%
rename from api/src/com/cloud/dc/DataCenter.java
rename to api/src/main/java/com/cloud/dc/DataCenter.java
diff --git a/api/src/com/cloud/dc/DedicatedResources.java b/api/src/main/java/com/cloud/dc/DedicatedResources.java
similarity index 100%
rename from api/src/com/cloud/dc/DedicatedResources.java
rename to api/src/main/java/com/cloud/dc/DedicatedResources.java
diff --git a/api/src/com/cloud/dc/Pod.java b/api/src/main/java/com/cloud/dc/Pod.java
similarity index 100%
rename from api/src/com/cloud/dc/Pod.java
rename to api/src/main/java/com/cloud/dc/Pod.java
diff --git a/api/src/com/cloud/dc/StorageNetworkIpRange.java b/api/src/main/java/com/cloud/dc/StorageNetworkIpRange.java
similarity index 100%
rename from api/src/com/cloud/dc/StorageNetworkIpRange.java
rename to api/src/main/java/com/cloud/dc/StorageNetworkIpRange.java
diff --git a/api/src/com/cloud/dc/Vlan.java b/api/src/main/java/com/cloud/dc/Vlan.java
similarity index 100%
rename from api/src/com/cloud/dc/Vlan.java
rename to api/src/main/java/com/cloud/dc/Vlan.java
diff --git a/api/src/com/cloud/deploy/DataCenterDeployment.java b/api/src/main/java/com/cloud/deploy/DataCenterDeployment.java
similarity index 100%
rename from api/src/com/cloud/deploy/DataCenterDeployment.java
rename to api/src/main/java/com/cloud/deploy/DataCenterDeployment.java
diff --git a/api/src/com/cloud/deploy/DeployDestination.java b/api/src/main/java/com/cloud/deploy/DeployDestination.java
similarity index 100%
rename from api/src/com/cloud/deploy/DeployDestination.java
rename to api/src/main/java/com/cloud/deploy/DeployDestination.java
diff --git a/api/src/com/cloud/deploy/DeploymentClusterPlanner.java b/api/src/main/java/com/cloud/deploy/DeploymentClusterPlanner.java
similarity index 100%
rename from api/src/com/cloud/deploy/DeploymentClusterPlanner.java
rename to api/src/main/java/com/cloud/deploy/DeploymentClusterPlanner.java
diff --git a/api/src/com/cloud/deploy/DeploymentPlan.java b/api/src/main/java/com/cloud/deploy/DeploymentPlan.java
similarity index 100%
rename from api/src/com/cloud/deploy/DeploymentPlan.java
rename to api/src/main/java/com/cloud/deploy/DeploymentPlan.java
diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/main/java/com/cloud/deploy/DeploymentPlanner.java
similarity index 100%
rename from api/src/com/cloud/deploy/DeploymentPlanner.java
rename to api/src/main/java/com/cloud/deploy/DeploymentPlanner.java
diff --git a/api/src/com/cloud/deploy/HAPlanner.java b/api/src/main/java/com/cloud/deploy/HAPlanner.java
similarity index 100%
rename from api/src/com/cloud/deploy/HAPlanner.java
rename to api/src/main/java/com/cloud/deploy/HAPlanner.java
diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/main/java/com/cloud/domain/Domain.java
similarity index 100%
rename from api/src/com/cloud/domain/Domain.java
rename to api/src/main/java/com/cloud/domain/Domain.java
diff --git a/api/src/com/cloud/domain/PartOf.java b/api/src/main/java/com/cloud/domain/PartOf.java
similarity index 100%
rename from api/src/com/cloud/domain/PartOf.java
rename to api/src/main/java/com/cloud/domain/PartOf.java
diff --git a/api/src/com/cloud/event/ActionEvent.java b/api/src/main/java/com/cloud/event/ActionEvent.java
similarity index 100%
rename from api/src/com/cloud/event/ActionEvent.java
rename to api/src/main/java/com/cloud/event/ActionEvent.java
diff --git a/api/src/com/cloud/event/ActionEvents.java b/api/src/main/java/com/cloud/event/ActionEvents.java
similarity index 100%
rename from api/src/com/cloud/event/ActionEvents.java
rename to api/src/main/java/com/cloud/event/ActionEvents.java
diff --git a/api/src/com/cloud/event/Event.java b/api/src/main/java/com/cloud/event/Event.java
similarity index 100%
rename from api/src/com/cloud/event/Event.java
rename to api/src/main/java/com/cloud/event/Event.java
diff --git a/api/src/com/cloud/event/EventCategory.java b/api/src/main/java/com/cloud/event/EventCategory.java
similarity index 100%
rename from api/src/com/cloud/event/EventCategory.java
rename to api/src/main/java/com/cloud/event/EventCategory.java
diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
similarity index 100%
rename from api/src/com/cloud/event/EventTypes.java
rename to api/src/main/java/com/cloud/event/EventTypes.java
diff --git a/api/src/com/cloud/event/UsageEvent.java b/api/src/main/java/com/cloud/event/UsageEvent.java
similarity index 100%
rename from api/src/com/cloud/event/UsageEvent.java
rename to api/src/main/java/com/cloud/event/UsageEvent.java
diff --git a/api/src/com/cloud/exception/AccountLimitException.java b/api/src/main/java/com/cloud/exception/AccountLimitException.java
similarity index 100%
rename from api/src/com/cloud/exception/AccountLimitException.java
rename to api/src/main/java/com/cloud/exception/AccountLimitException.java
diff --git a/api/src/com/cloud/exception/AffinityConflictException.java b/api/src/main/java/com/cloud/exception/AffinityConflictException.java
similarity index 100%
rename from api/src/com/cloud/exception/AffinityConflictException.java
rename to api/src/main/java/com/cloud/exception/AffinityConflictException.java
diff --git a/api/src/com/cloud/exception/AgentControlChannelException.java b/api/src/main/java/com/cloud/exception/AgentControlChannelException.java
similarity index 100%
rename from api/src/com/cloud/exception/AgentControlChannelException.java
rename to api/src/main/java/com/cloud/exception/AgentControlChannelException.java
diff --git a/api/src/com/cloud/exception/AgentUnavailableException.java b/api/src/main/java/com/cloud/exception/AgentUnavailableException.java
similarity index 100%
rename from api/src/com/cloud/exception/AgentUnavailableException.java
rename to api/src/main/java/com/cloud/exception/AgentUnavailableException.java
diff --git a/api/src/com/cloud/exception/CloudAuthenticationException.java b/api/src/main/java/com/cloud/exception/CloudAuthenticationException.java
similarity index 100%
rename from api/src/com/cloud/exception/CloudAuthenticationException.java
rename to api/src/main/java/com/cloud/exception/CloudAuthenticationException.java
diff --git a/api/src/com/cloud/exception/CloudException.java b/api/src/main/java/com/cloud/exception/CloudException.java
similarity index 100%
rename from api/src/com/cloud/exception/CloudException.java
rename to api/src/main/java/com/cloud/exception/CloudException.java
diff --git a/api/src/com/cloud/exception/ConcurrentOperationException.java b/api/src/main/java/com/cloud/exception/ConcurrentOperationException.java
similarity index 100%
rename from api/src/com/cloud/exception/ConcurrentOperationException.java
rename to api/src/main/java/com/cloud/exception/ConcurrentOperationException.java
diff --git a/api/src/com/cloud/exception/ConflictingNetworkSettingsException.java b/api/src/main/java/com/cloud/exception/ConflictingNetworkSettingsException.java
similarity index 100%
rename from api/src/com/cloud/exception/ConflictingNetworkSettingsException.java
rename to api/src/main/java/com/cloud/exception/ConflictingNetworkSettingsException.java
diff --git a/api/src/com/cloud/exception/ConnectionException.java b/api/src/main/java/com/cloud/exception/ConnectionException.java
similarity index 100%
rename from api/src/com/cloud/exception/ConnectionException.java
rename to api/src/main/java/com/cloud/exception/ConnectionException.java
diff --git a/api/src/com/cloud/exception/DiscoveredWithErrorException.java b/api/src/main/java/com/cloud/exception/DiscoveredWithErrorException.java
similarity index 100%
rename from api/src/com/cloud/exception/DiscoveredWithErrorException.java
rename to api/src/main/java/com/cloud/exception/DiscoveredWithErrorException.java
diff --git a/api/src/com/cloud/exception/DiscoveryException.java b/api/src/main/java/com/cloud/exception/DiscoveryException.java
similarity index 100%
rename from api/src/com/cloud/exception/DiscoveryException.java
rename to api/src/main/java/com/cloud/exception/DiscoveryException.java
diff --git a/api/src/com/cloud/exception/HAStateException.java b/api/src/main/java/com/cloud/exception/HAStateException.java
similarity index 100%
rename from api/src/com/cloud/exception/HAStateException.java
rename to api/src/main/java/com/cloud/exception/HAStateException.java
diff --git a/api/src/com/cloud/exception/InsufficientAddressCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientAddressCapacityException.java
similarity index 100%
rename from api/src/com/cloud/exception/InsufficientAddressCapacityException.java
rename to api/src/main/java/com/cloud/exception/InsufficientAddressCapacityException.java
diff --git a/api/src/com/cloud/exception/InsufficientCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientCapacityException.java
similarity index 100%
rename from api/src/com/cloud/exception/InsufficientCapacityException.java
rename to api/src/main/java/com/cloud/exception/InsufficientCapacityException.java
diff --git a/api/src/com/cloud/exception/InsufficientNetworkCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientNetworkCapacityException.java
similarity index 100%
rename from api/src/com/cloud/exception/InsufficientNetworkCapacityException.java
rename to api/src/main/java/com/cloud/exception/InsufficientNetworkCapacityException.java
diff --git a/api/src/com/cloud/exception/InsufficientServerCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientServerCapacityException.java
similarity index 100%
rename from api/src/com/cloud/exception/InsufficientServerCapacityException.java
rename to api/src/main/java/com/cloud/exception/InsufficientServerCapacityException.java
diff --git a/api/src/com/cloud/exception/InsufficientStorageCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientStorageCapacityException.java
similarity index 100%
rename from api/src/com/cloud/exception/InsufficientStorageCapacityException.java
rename to api/src/main/java/com/cloud/exception/InsufficientStorageCapacityException.java
diff --git a/api/src/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java b/api/src/main/java/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java
similarity index 100%
rename from api/src/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java
rename to api/src/main/java/com/cloud/exception/InsufficientVirtualNetworkCapacityException.java
diff --git a/api/src/com/cloud/exception/InternalErrorException.java b/api/src/main/java/com/cloud/exception/InternalErrorException.java
similarity index 100%
rename from api/src/com/cloud/exception/InternalErrorException.java
rename to api/src/main/java/com/cloud/exception/InternalErrorException.java
diff --git a/api/src/com/cloud/exception/InvalidParameterValueException.java b/api/src/main/java/com/cloud/exception/InvalidParameterValueException.java
similarity index 100%
rename from api/src/com/cloud/exception/InvalidParameterValueException.java
rename to api/src/main/java/com/cloud/exception/InvalidParameterValueException.java
diff --git a/api/src/com/cloud/exception/ManagementServerException.java b/api/src/main/java/com/cloud/exception/ManagementServerException.java
similarity index 100%
rename from api/src/com/cloud/exception/ManagementServerException.java
rename to api/src/main/java/com/cloud/exception/ManagementServerException.java
diff --git a/api/src/com/cloud/exception/NetworkRuleConflictException.java b/api/src/main/java/com/cloud/exception/NetworkRuleConflictException.java
similarity index 100%
rename from api/src/com/cloud/exception/NetworkRuleConflictException.java
rename to api/src/main/java/com/cloud/exception/NetworkRuleConflictException.java
diff --git a/api/src/com/cloud/exception/OperationTimedoutException.java b/api/src/main/java/com/cloud/exception/OperationTimedoutException.java
similarity index 100%
rename from api/src/com/cloud/exception/OperationTimedoutException.java
rename to api/src/main/java/com/cloud/exception/OperationTimedoutException.java
diff --git a/api/src/com/cloud/exception/PermissionDeniedException.java b/api/src/main/java/com/cloud/exception/PermissionDeniedException.java
similarity index 100%
rename from api/src/com/cloud/exception/PermissionDeniedException.java
rename to api/src/main/java/com/cloud/exception/PermissionDeniedException.java
diff --git a/api/src/com/cloud/exception/RequestLimitException.java b/api/src/main/java/com/cloud/exception/RequestLimitException.java
similarity index 100%
rename from api/src/com/cloud/exception/RequestLimitException.java
rename to api/src/main/java/com/cloud/exception/RequestLimitException.java
diff --git a/api/src/com/cloud/exception/ResourceAllocationException.java b/api/src/main/java/com/cloud/exception/ResourceAllocationException.java
similarity index 100%
rename from api/src/com/cloud/exception/ResourceAllocationException.java
rename to api/src/main/java/com/cloud/exception/ResourceAllocationException.java
diff --git a/api/src/com/cloud/exception/ResourceInUseException.java b/api/src/main/java/com/cloud/exception/ResourceInUseException.java
similarity index 100%
rename from api/src/com/cloud/exception/ResourceInUseException.java
rename to api/src/main/java/com/cloud/exception/ResourceInUseException.java
diff --git a/api/src/com/cloud/exception/ResourceUnavailableException.java b/api/src/main/java/com/cloud/exception/ResourceUnavailableException.java
similarity index 100%
rename from api/src/com/cloud/exception/ResourceUnavailableException.java
rename to api/src/main/java/com/cloud/exception/ResourceUnavailableException.java
diff --git a/api/src/com/cloud/exception/StorageConflictException.java b/api/src/main/java/com/cloud/exception/StorageConflictException.java
similarity index 100%
rename from api/src/com/cloud/exception/StorageConflictException.java
rename to api/src/main/java/com/cloud/exception/StorageConflictException.java
diff --git a/api/src/com/cloud/exception/StorageUnavailableException.java b/api/src/main/java/com/cloud/exception/StorageUnavailableException.java
similarity index 100%
rename from api/src/com/cloud/exception/StorageUnavailableException.java
rename to api/src/main/java/com/cloud/exception/StorageUnavailableException.java
diff --git a/api/src/com/cloud/exception/UnsupportedServiceException.java b/api/src/main/java/com/cloud/exception/UnsupportedServiceException.java
similarity index 100%
rename from api/src/com/cloud/exception/UnsupportedServiceException.java
rename to api/src/main/java/com/cloud/exception/UnsupportedServiceException.java
diff --git a/api/src/com/cloud/exception/VirtualMachineMigrationException.java b/api/src/main/java/com/cloud/exception/VirtualMachineMigrationException.java
similarity index 100%
rename from api/src/com/cloud/exception/VirtualMachineMigrationException.java
rename to api/src/main/java/com/cloud/exception/VirtualMachineMigrationException.java
diff --git a/api/src/com/cloud/gpu/GPU.java b/api/src/main/java/com/cloud/gpu/GPU.java
similarity index 100%
rename from api/src/com/cloud/gpu/GPU.java
rename to api/src/main/java/com/cloud/gpu/GPU.java
diff --git a/api/src/com/cloud/ha/FenceBuilder.java b/api/src/main/java/com/cloud/ha/FenceBuilder.java
similarity index 100%
rename from api/src/com/cloud/ha/FenceBuilder.java
rename to api/src/main/java/com/cloud/ha/FenceBuilder.java
diff --git a/api/src/com/cloud/ha/Investigator.java b/api/src/main/java/com/cloud/ha/Investigator.java
similarity index 100%
rename from api/src/com/cloud/ha/Investigator.java
rename to api/src/main/java/com/cloud/ha/Investigator.java
diff --git a/api/src/com/cloud/host/Host.java b/api/src/main/java/com/cloud/host/Host.java
similarity index 100%
rename from api/src/com/cloud/host/Host.java
rename to api/src/main/java/com/cloud/host/Host.java
diff --git a/api/src/com/cloud/host/HostEnvironment.java b/api/src/main/java/com/cloud/host/HostEnvironment.java
similarity index 100%
rename from api/src/com/cloud/host/HostEnvironment.java
rename to api/src/main/java/com/cloud/host/HostEnvironment.java
diff --git a/api/src/com/cloud/host/HostStats.java b/api/src/main/java/com/cloud/host/HostStats.java
similarity index 100%
rename from api/src/com/cloud/host/HostStats.java
rename to api/src/main/java/com/cloud/host/HostStats.java
diff --git a/api/src/com/cloud/host/Status.java b/api/src/main/java/com/cloud/host/Status.java
similarity index 100%
rename from api/src/com/cloud/host/Status.java
rename to api/src/main/java/com/cloud/host/Status.java
diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/main/java/com/cloud/hypervisor/Hypervisor.java
similarity index 100%
rename from api/src/com/cloud/hypervisor/Hypervisor.java
rename to api/src/main/java/com/cloud/hypervisor/Hypervisor.java
diff --git a/api/src/com/cloud/hypervisor/HypervisorCapabilities.java b/api/src/main/java/com/cloud/hypervisor/HypervisorCapabilities.java
similarity index 100%
rename from api/src/com/cloud/hypervisor/HypervisorCapabilities.java
rename to api/src/main/java/com/cloud/hypervisor/HypervisorCapabilities.java
diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java
similarity index 100%
rename from api/src/com/cloud/hypervisor/HypervisorGuru.java
rename to api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java
diff --git a/api/src/com/cloud/info/ConsoleProxyLoadInfo.java b/api/src/main/java/com/cloud/info/ConsoleProxyLoadInfo.java
similarity index 100%
rename from api/src/com/cloud/info/ConsoleProxyLoadInfo.java
rename to api/src/main/java/com/cloud/info/ConsoleProxyLoadInfo.java
diff --git a/api/src/com/cloud/info/RunningHostCountInfo.java b/api/src/main/java/com/cloud/info/RunningHostCountInfo.java
similarity index 100%
rename from api/src/com/cloud/info/RunningHostCountInfo.java
rename to api/src/main/java/com/cloud/info/RunningHostCountInfo.java
diff --git a/api/src/com/cloud/network/GuestVlan.java b/api/src/main/java/com/cloud/network/GuestVlan.java
similarity index 100%
rename from api/src/com/cloud/network/GuestVlan.java
rename to api/src/main/java/com/cloud/network/GuestVlan.java
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/main/java/com/cloud/network/IpAddress.java
similarity index 100%
rename from api/src/com/cloud/network/IpAddress.java
rename to api/src/main/java/com/cloud/network/IpAddress.java
diff --git a/api/src/com/cloud/network/MonitoringService.java b/api/src/main/java/com/cloud/network/MonitoringService.java
similarity index 100%
rename from api/src/com/cloud/network/MonitoringService.java
rename to api/src/main/java/com/cloud/network/MonitoringService.java
diff --git a/api/src/com/cloud/network/Network.java b/api/src/main/java/com/cloud/network/Network.java
similarity index 100%
rename from api/src/com/cloud/network/Network.java
rename to api/src/main/java/com/cloud/network/Network.java
diff --git a/api/src/com/cloud/network/NetworkMigrationResponder.java b/api/src/main/java/com/cloud/network/NetworkMigrationResponder.java
similarity index 100%
rename from api/src/com/cloud/network/NetworkMigrationResponder.java
rename to api/src/main/java/com/cloud/network/NetworkMigrationResponder.java
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/main/java/com/cloud/network/NetworkModel.java
similarity index 100%
rename from api/src/com/cloud/network/NetworkModel.java
rename to api/src/main/java/com/cloud/network/NetworkModel.java
diff --git a/api/src/com/cloud/network/NetworkProfile.java b/api/src/main/java/com/cloud/network/NetworkProfile.java
similarity index 100%
rename from api/src/com/cloud/network/NetworkProfile.java
rename to api/src/main/java/com/cloud/network/NetworkProfile.java
diff --git a/api/src/com/cloud/network/NetworkRuleApplier.java b/api/src/main/java/com/cloud/network/NetworkRuleApplier.java
similarity index 100%
rename from api/src/com/cloud/network/NetworkRuleApplier.java
rename to api/src/main/java/com/cloud/network/NetworkRuleApplier.java
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java
similarity index 100%
rename from api/src/com/cloud/network/NetworkService.java
rename to api/src/main/java/com/cloud/network/NetworkService.java
diff --git a/api/src/com/cloud/network/NetworkUsageService.java b/api/src/main/java/com/cloud/network/NetworkUsageService.java
similarity index 100%
rename from api/src/com/cloud/network/NetworkUsageService.java
rename to api/src/main/java/com/cloud/network/NetworkUsageService.java
diff --git a/api/src/com/cloud/network/Networks.java b/api/src/main/java/com/cloud/network/Networks.java
similarity index 100%
rename from api/src/com/cloud/network/Networks.java
rename to api/src/main/java/com/cloud/network/Networks.java
diff --git a/api/src/com/cloud/network/OvsProvider.java b/api/src/main/java/com/cloud/network/OvsProvider.java
similarity index 100%
rename from api/src/com/cloud/network/OvsProvider.java
rename to api/src/main/java/com/cloud/network/OvsProvider.java
diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/main/java/com/cloud/network/PhysicalNetwork.java
similarity index 100%
rename from api/src/com/cloud/network/PhysicalNetwork.java
rename to api/src/main/java/com/cloud/network/PhysicalNetwork.java
diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/main/java/com/cloud/network/PhysicalNetworkServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
rename to api/src/main/java/com/cloud/network/PhysicalNetworkServiceProvider.java
diff --git a/api/src/com/cloud/network/PhysicalNetworkSetupInfo.java b/api/src/main/java/com/cloud/network/PhysicalNetworkSetupInfo.java
similarity index 100%
rename from api/src/com/cloud/network/PhysicalNetworkSetupInfo.java
rename to api/src/main/java/com/cloud/network/PhysicalNetworkSetupInfo.java
diff --git a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java b/api/src/main/java/com/cloud/network/PhysicalNetworkTrafficType.java
similarity index 100%
rename from api/src/com/cloud/network/PhysicalNetworkTrafficType.java
rename to api/src/main/java/com/cloud/network/PhysicalNetworkTrafficType.java
diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/main/java/com/cloud/network/PublicIpAddress.java
similarity index 100%
rename from api/src/com/cloud/network/PublicIpAddress.java
rename to api/src/main/java/com/cloud/network/PublicIpAddress.java
diff --git a/api/src/com/cloud/network/RemoteAccessVpn.java b/api/src/main/java/com/cloud/network/RemoteAccessVpn.java
similarity index 100%
rename from api/src/com/cloud/network/RemoteAccessVpn.java
rename to api/src/main/java/com/cloud/network/RemoteAccessVpn.java
diff --git a/api/src/com/cloud/network/Site2SiteCustomerGateway.java b/api/src/main/java/com/cloud/network/Site2SiteCustomerGateway.java
similarity index 100%
rename from api/src/com/cloud/network/Site2SiteCustomerGateway.java
rename to api/src/main/java/com/cloud/network/Site2SiteCustomerGateway.java
diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java
similarity index 100%
rename from api/src/com/cloud/network/Site2SiteVpnConnection.java
rename to api/src/main/java/com/cloud/network/Site2SiteVpnConnection.java
diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/main/java/com/cloud/network/Site2SiteVpnGateway.java
similarity index 100%
rename from api/src/com/cloud/network/Site2SiteVpnGateway.java
rename to api/src/main/java/com/cloud/network/Site2SiteVpnGateway.java
diff --git a/api/src/com/cloud/network/StorageNetworkService.java b/api/src/main/java/com/cloud/network/StorageNetworkService.java
similarity index 100%
rename from api/src/com/cloud/network/StorageNetworkService.java
rename to api/src/main/java/com/cloud/network/StorageNetworkService.java
diff --git a/api/src/com/cloud/network/TrafficLabel.java b/api/src/main/java/com/cloud/network/TrafficLabel.java
similarity index 100%
rename from api/src/com/cloud/network/TrafficLabel.java
rename to api/src/main/java/com/cloud/network/TrafficLabel.java
diff --git a/api/src/com/cloud/network/UserIpv6Address.java b/api/src/main/java/com/cloud/network/UserIpv6Address.java
similarity index 100%
rename from api/src/com/cloud/network/UserIpv6Address.java
rename to api/src/main/java/com/cloud/network/UserIpv6Address.java
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java
similarity index 100%
rename from api/src/com/cloud/network/VirtualNetworkApplianceService.java
rename to api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java
diff --git a/api/src/com/cloud/network/VirtualRouterProvider.java b/api/src/main/java/com/cloud/network/VirtualRouterProvider.java
similarity index 100%
rename from api/src/com/cloud/network/VirtualRouterProvider.java
rename to api/src/main/java/com/cloud/network/VirtualRouterProvider.java
diff --git a/api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java b/api/src/main/java/com/cloud/network/VpcVirtualNetworkApplianceService.java
similarity index 100%
rename from api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
rename to api/src/main/java/com/cloud/network/VpcVirtualNetworkApplianceService.java
diff --git a/api/src/com/cloud/network/VpnUser.java b/api/src/main/java/com/cloud/network/VpnUser.java
similarity index 100%
rename from api/src/com/cloud/network/VpnUser.java
rename to api/src/main/java/com/cloud/network/VpnUser.java
diff --git a/api/src/com/cloud/network/as/AutoScaleCounter.java b/api/src/main/java/com/cloud/network/as/AutoScaleCounter.java
similarity index 100%
rename from api/src/com/cloud/network/as/AutoScaleCounter.java
rename to api/src/main/java/com/cloud/network/as/AutoScaleCounter.java
diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/main/java/com/cloud/network/as/AutoScalePolicy.java
similarity index 100%
rename from api/src/com/cloud/network/as/AutoScalePolicy.java
rename to api/src/main/java/com/cloud/network/as/AutoScalePolicy.java
diff --git a/api/src/com/cloud/network/as/AutoScaleService.java b/api/src/main/java/com/cloud/network/as/AutoScaleService.java
similarity index 100%
rename from api/src/com/cloud/network/as/AutoScaleService.java
rename to api/src/main/java/com/cloud/network/as/AutoScaleService.java
diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/main/java/com/cloud/network/as/AutoScaleVmGroup.java
similarity index 100%
rename from api/src/com/cloud/network/as/AutoScaleVmGroup.java
rename to api/src/main/java/com/cloud/network/as/AutoScaleVmGroup.java
diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/main/java/com/cloud/network/as/AutoScaleVmProfile.java
similarity index 100%
rename from api/src/com/cloud/network/as/AutoScaleVmProfile.java
rename to api/src/main/java/com/cloud/network/as/AutoScaleVmProfile.java
diff --git a/api/src/com/cloud/network/as/Condition.java b/api/src/main/java/com/cloud/network/as/Condition.java
similarity index 100%
rename from api/src/com/cloud/network/as/Condition.java
rename to api/src/main/java/com/cloud/network/as/Condition.java
diff --git a/api/src/com/cloud/network/as/Counter.java b/api/src/main/java/com/cloud/network/as/Counter.java
similarity index 100%
rename from api/src/com/cloud/network/as/Counter.java
rename to api/src/main/java/com/cloud/network/as/Counter.java
diff --git a/api/src/com/cloud/network/element/AggregatedCommandExecutor.java b/api/src/main/java/com/cloud/network/element/AggregatedCommandExecutor.java
similarity index 100%
rename from api/src/com/cloud/network/element/AggregatedCommandExecutor.java
rename to api/src/main/java/com/cloud/network/element/AggregatedCommandExecutor.java
diff --git a/api/src/com/cloud/network/element/ConnectivityProvider.java b/api/src/main/java/com/cloud/network/element/ConnectivityProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/ConnectivityProvider.java
rename to api/src/main/java/com/cloud/network/element/ConnectivityProvider.java
diff --git a/api/src/com/cloud/network/element/DhcpServiceProvider.java b/api/src/main/java/com/cloud/network/element/DhcpServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/DhcpServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/DhcpServiceProvider.java
diff --git a/api/src/com/cloud/network/element/DnsServiceProvider.java b/api/src/main/java/com/cloud/network/element/DnsServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/DnsServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/DnsServiceProvider.java
diff --git a/api/src/com/cloud/network/element/FirewallServiceProvider.java b/api/src/main/java/com/cloud/network/element/FirewallServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/FirewallServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/FirewallServiceProvider.java
diff --git a/api/src/com/cloud/network/element/IpDeployer.java b/api/src/main/java/com/cloud/network/element/IpDeployer.java
similarity index 100%
rename from api/src/com/cloud/network/element/IpDeployer.java
rename to api/src/main/java/com/cloud/network/element/IpDeployer.java
diff --git a/api/src/com/cloud/network/element/IpDeployingRequester.java b/api/src/main/java/com/cloud/network/element/IpDeployingRequester.java
similarity index 100%
rename from api/src/com/cloud/network/element/IpDeployingRequester.java
rename to api/src/main/java/com/cloud/network/element/IpDeployingRequester.java
diff --git a/api/src/com/cloud/network/element/LoadBalancingServiceProvider.java b/api/src/main/java/com/cloud/network/element/LoadBalancingServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/LoadBalancingServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/LoadBalancingServiceProvider.java
diff --git a/api/src/com/cloud/network/element/NetworkACLServiceProvider.java b/api/src/main/java/com/cloud/network/element/NetworkACLServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/NetworkACLServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/NetworkACLServiceProvider.java
diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/main/java/com/cloud/network/element/NetworkElement.java
similarity index 100%
rename from api/src/com/cloud/network/element/NetworkElement.java
rename to api/src/main/java/com/cloud/network/element/NetworkElement.java
diff --git a/api/src/com/cloud/network/element/PortForwardingServiceProvider.java b/api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/PortForwardingServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/PortForwardingServiceProvider.java
diff --git a/api/src/com/cloud/network/element/RedundantResource.java b/api/src/main/java/com/cloud/network/element/RedundantResource.java
similarity index 100%
rename from api/src/com/cloud/network/element/RedundantResource.java
rename to api/src/main/java/com/cloud/network/element/RedundantResource.java
diff --git a/api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java b/api/src/main/java/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
diff --git a/api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java b/api/src/main/java/com/cloud/network/element/Site2SiteVpnServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/Site2SiteVpnServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/Site2SiteVpnServiceProvider.java
diff --git a/api/src/com/cloud/network/element/SourceNatServiceProvider.java b/api/src/main/java/com/cloud/network/element/SourceNatServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/SourceNatServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/SourceNatServiceProvider.java
diff --git a/api/src/com/cloud/network/element/StaticNatServiceProvider.java b/api/src/main/java/com/cloud/network/element/StaticNatServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/StaticNatServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/StaticNatServiceProvider.java
diff --git a/api/src/com/cloud/network/element/UserDataServiceProvider.java b/api/src/main/java/com/cloud/network/element/UserDataServiceProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/UserDataServiceProvider.java
rename to api/src/main/java/com/cloud/network/element/UserDataServiceProvider.java
diff --git a/api/src/com/cloud/network/element/VirtualRouterElementService.java b/api/src/main/java/com/cloud/network/element/VirtualRouterElementService.java
similarity index 100%
rename from api/src/com/cloud/network/element/VirtualRouterElementService.java
rename to api/src/main/java/com/cloud/network/element/VirtualRouterElementService.java
diff --git a/api/src/com/cloud/network/element/VpcProvider.java b/api/src/main/java/com/cloud/network/element/VpcProvider.java
similarity index 100%
rename from api/src/com/cloud/network/element/VpcProvider.java
rename to api/src/main/java/com/cloud/network/element/VpcProvider.java
diff --git a/api/src/com/cloud/network/firewall/FirewallService.java b/api/src/main/java/com/cloud/network/firewall/FirewallService.java
similarity index 100%
rename from api/src/com/cloud/network/firewall/FirewallService.java
rename to api/src/main/java/com/cloud/network/firewall/FirewallService.java
diff --git a/api/src/com/cloud/network/guru/NetworkGuru.java b/api/src/main/java/com/cloud/network/guru/NetworkGuru.java
similarity index 100%
rename from api/src/com/cloud/network/guru/NetworkGuru.java
rename to api/src/main/java/com/cloud/network/guru/NetworkGuru.java
diff --git a/api/src/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java b/api/src/main/java/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java
similarity index 100%
rename from api/src/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java
rename to api/src/main/java/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRule.java b/api/src/main/java/com/cloud/network/lb/LoadBalancingRule.java
similarity index 100%
rename from api/src/com/cloud/network/lb/LoadBalancingRule.java
rename to api/src/main/java/com/cloud/network/lb/LoadBalancingRule.java
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java
similarity index 100%
rename from api/src/com/cloud/network/lb/LoadBalancingRulesService.java
rename to api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java
diff --git a/api/src/com/cloud/network/router/VirtualRouter.java b/api/src/main/java/com/cloud/network/router/VirtualRouter.java
similarity index 100%
rename from api/src/com/cloud/network/router/VirtualRouter.java
rename to api/src/main/java/com/cloud/network/router/VirtualRouter.java
diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/main/java/com/cloud/network/rules/FirewallRule.java
similarity index 100%
rename from api/src/com/cloud/network/rules/FirewallRule.java
rename to api/src/main/java/com/cloud/network/rules/FirewallRule.java
diff --git a/api/src/com/cloud/network/rules/HealthCheckPolicy.java b/api/src/main/java/com/cloud/network/rules/HealthCheckPolicy.java
similarity index 100%
rename from api/src/com/cloud/network/rules/HealthCheckPolicy.java
rename to api/src/main/java/com/cloud/network/rules/HealthCheckPolicy.java
diff --git a/api/src/com/cloud/network/rules/LbStickinessMethod.java b/api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java
similarity index 100%
rename from api/src/com/cloud/network/rules/LbStickinessMethod.java
rename to api/src/main/java/com/cloud/network/rules/LbStickinessMethod.java
diff --git a/api/src/com/cloud/network/rules/LoadBalancer.java b/api/src/main/java/com/cloud/network/rules/LoadBalancer.java
similarity index 100%
rename from api/src/com/cloud/network/rules/LoadBalancer.java
rename to api/src/main/java/com/cloud/network/rules/LoadBalancer.java
diff --git a/api/src/com/cloud/network/rules/LoadBalancerContainer.java b/api/src/main/java/com/cloud/network/rules/LoadBalancerContainer.java
similarity index 100%
rename from api/src/com/cloud/network/rules/LoadBalancerContainer.java
rename to api/src/main/java/com/cloud/network/rules/LoadBalancerContainer.java
diff --git a/api/src/com/cloud/network/rules/PortForwardingRule.java b/api/src/main/java/com/cloud/network/rules/PortForwardingRule.java
similarity index 100%
rename from api/src/com/cloud/network/rules/PortForwardingRule.java
rename to api/src/main/java/com/cloud/network/rules/PortForwardingRule.java
diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/main/java/com/cloud/network/rules/RulesService.java
similarity index 100%
rename from api/src/com/cloud/network/rules/RulesService.java
rename to api/src/main/java/com/cloud/network/rules/RulesService.java
diff --git a/api/src/com/cloud/network/rules/StaticNat.java b/api/src/main/java/com/cloud/network/rules/StaticNat.java
similarity index 100%
rename from api/src/com/cloud/network/rules/StaticNat.java
rename to api/src/main/java/com/cloud/network/rules/StaticNat.java
diff --git a/api/src/com/cloud/network/rules/StaticNatRule.java b/api/src/main/java/com/cloud/network/rules/StaticNatRule.java
similarity index 100%
rename from api/src/com/cloud/network/rules/StaticNatRule.java
rename to api/src/main/java/com/cloud/network/rules/StaticNatRule.java
diff --git a/api/src/com/cloud/network/rules/StickinessPolicy.java b/api/src/main/java/com/cloud/network/rules/StickinessPolicy.java
similarity index 100%
rename from api/src/com/cloud/network/rules/StickinessPolicy.java
rename to api/src/main/java/com/cloud/network/rules/StickinessPolicy.java
diff --git a/api/src/com/cloud/network/security/SecurityGroup.java b/api/src/main/java/com/cloud/network/security/SecurityGroup.java
similarity index 100%
rename from api/src/com/cloud/network/security/SecurityGroup.java
rename to api/src/main/java/com/cloud/network/security/SecurityGroup.java
diff --git a/api/src/com/cloud/network/security/SecurityGroupRules.java b/api/src/main/java/com/cloud/network/security/SecurityGroupRules.java
similarity index 100%
rename from api/src/com/cloud/network/security/SecurityGroupRules.java
rename to api/src/main/java/com/cloud/network/security/SecurityGroupRules.java
diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/main/java/com/cloud/network/security/SecurityGroupService.java
similarity index 100%
rename from api/src/com/cloud/network/security/SecurityGroupService.java
rename to api/src/main/java/com/cloud/network/security/SecurityGroupService.java
diff --git a/api/src/com/cloud/network/security/SecurityRule.java b/api/src/main/java/com/cloud/network/security/SecurityRule.java
similarity index 100%
rename from api/src/com/cloud/network/security/SecurityRule.java
rename to api/src/main/java/com/cloud/network/security/SecurityRule.java
diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/main/java/com/cloud/network/vpc/NetworkACL.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/NetworkACL.java
rename to api/src/main/java/com/cloud/network/vpc/NetworkACL.java
diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/NetworkACLItem.java
rename to api/src/main/java/com/cloud/network/vpc/NetworkACLItem.java
diff --git a/api/src/com/cloud/network/vpc/NetworkACLService.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/NetworkACLService.java
rename to api/src/main/java/com/cloud/network/vpc/NetworkACLService.java
diff --git a/api/src/com/cloud/network/vpc/PrivateGateway.java b/api/src/main/java/com/cloud/network/vpc/PrivateGateway.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/PrivateGateway.java
rename to api/src/main/java/com/cloud/network/vpc/PrivateGateway.java
diff --git a/api/src/com/cloud/network/vpc/PrivateIp.java b/api/src/main/java/com/cloud/network/vpc/PrivateIp.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/PrivateIp.java
rename to api/src/main/java/com/cloud/network/vpc/PrivateIp.java
diff --git a/api/src/com/cloud/network/vpc/StaticRoute.java b/api/src/main/java/com/cloud/network/vpc/StaticRoute.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/StaticRoute.java
rename to api/src/main/java/com/cloud/network/vpc/StaticRoute.java
diff --git a/api/src/com/cloud/network/vpc/StaticRouteProfile.java b/api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/StaticRouteProfile.java
rename to api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java
diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/main/java/com/cloud/network/vpc/Vpc.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/Vpc.java
rename to api/src/main/java/com/cloud/network/vpc/Vpc.java
diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/main/java/com/cloud/network/vpc/VpcGateway.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/VpcGateway.java
rename to api/src/main/java/com/cloud/network/vpc/VpcGateway.java
diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/main/java/com/cloud/network/vpc/VpcOffering.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/VpcOffering.java
rename to api/src/main/java/com/cloud/network/vpc/VpcOffering.java
diff --git a/api/src/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/VpcProvisioningService.java
rename to api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java
diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/main/java/com/cloud/network/vpc/VpcService.java
similarity index 100%
rename from api/src/com/cloud/network/vpc/VpcService.java
rename to api/src/main/java/com/cloud/network/vpc/VpcService.java
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/main/java/com/cloud/network/vpn/RemoteAccessVpnService.java
similarity index 100%
rename from api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
rename to api/src/main/java/com/cloud/network/vpn/RemoteAccessVpnService.java
diff --git a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java b/api/src/main/java/com/cloud/network/vpn/Site2SiteVpnService.java
similarity index 100%
rename from api/src/com/cloud/network/vpn/Site2SiteVpnService.java
rename to api/src/main/java/com/cloud/network/vpn/Site2SiteVpnService.java
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/main/java/com/cloud/offering/DiskOffering.java
similarity index 100%
rename from api/src/com/cloud/offering/DiskOffering.java
rename to api/src/main/java/com/cloud/offering/DiskOffering.java
diff --git a/api/src/com/cloud/offering/DiskOfferingInfo.java b/api/src/main/java/com/cloud/offering/DiskOfferingInfo.java
similarity index 100%
rename from api/src/com/cloud/offering/DiskOfferingInfo.java
rename to api/src/main/java/com/cloud/offering/DiskOfferingInfo.java
diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/main/java/com/cloud/offering/NetworkOffering.java
similarity index 100%
rename from api/src/com/cloud/offering/NetworkOffering.java
rename to api/src/main/java/com/cloud/offering/NetworkOffering.java
diff --git a/api/src/com/cloud/offering/OfferingManager.java b/api/src/main/java/com/cloud/offering/OfferingManager.java
similarity index 100%
rename from api/src/com/cloud/offering/OfferingManager.java
rename to api/src/main/java/com/cloud/offering/OfferingManager.java
diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/main/java/com/cloud/offering/ServiceOffering.java
similarity index 100%
rename from api/src/com/cloud/offering/ServiceOffering.java
rename to api/src/main/java/com/cloud/offering/ServiceOffering.java
diff --git a/api/src/com/cloud/org/Cluster.java b/api/src/main/java/com/cloud/org/Cluster.java
similarity index 100%
rename from api/src/com/cloud/org/Cluster.java
rename to api/src/main/java/com/cloud/org/Cluster.java
diff --git a/api/src/com/cloud/org/Grouping.java b/api/src/main/java/com/cloud/org/Grouping.java
similarity index 100%
rename from api/src/com/cloud/org/Grouping.java
rename to api/src/main/java/com/cloud/org/Grouping.java
diff --git a/api/src/com/cloud/org/Managed.java b/api/src/main/java/com/cloud/org/Managed.java
similarity index 100%
rename from api/src/com/cloud/org/Managed.java
rename to api/src/main/java/com/cloud/org/Managed.java
diff --git a/api/src/com/cloud/org/RunningIn.java b/api/src/main/java/com/cloud/org/RunningIn.java
similarity index 100%
rename from api/src/com/cloud/org/RunningIn.java
rename to api/src/main/java/com/cloud/org/RunningIn.java
diff --git a/api/src/com/cloud/projects/Project.java b/api/src/main/java/com/cloud/projects/Project.java
similarity index 100%
rename from api/src/com/cloud/projects/Project.java
rename to api/src/main/java/com/cloud/projects/Project.java
diff --git a/api/src/com/cloud/projects/ProjectAccount.java b/api/src/main/java/com/cloud/projects/ProjectAccount.java
similarity index 100%
rename from api/src/com/cloud/projects/ProjectAccount.java
rename to api/src/main/java/com/cloud/projects/ProjectAccount.java
diff --git a/api/src/com/cloud/projects/ProjectInvitation.java b/api/src/main/java/com/cloud/projects/ProjectInvitation.java
similarity index 100%
rename from api/src/com/cloud/projects/ProjectInvitation.java
rename to api/src/main/java/com/cloud/projects/ProjectInvitation.java
diff --git a/api/src/com/cloud/projects/ProjectService.java b/api/src/main/java/com/cloud/projects/ProjectService.java
similarity index 100%
rename from api/src/com/cloud/projects/ProjectService.java
rename to api/src/main/java/com/cloud/projects/ProjectService.java
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/main/java/com/cloud/region/ha/GlobalLoadBalancerRule.java
similarity index 100%
rename from api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
rename to api/src/main/java/com/cloud/region/ha/GlobalLoadBalancerRule.java
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/main/java/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
similarity index 100%
rename from api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
rename to api/src/main/java/com/cloud/region/ha/GlobalLoadBalancingRulesService.java
diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/main/java/com/cloud/resource/ResourceService.java
similarity index 100%
rename from api/src/com/cloud/resource/ResourceService.java
rename to api/src/main/java/com/cloud/resource/ResourceService.java
diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/main/java/com/cloud/resource/ResourceState.java
similarity index 100%
rename from api/src/com/cloud/resource/ResourceState.java
rename to api/src/main/java/com/cloud/resource/ResourceState.java
diff --git a/api/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/main/java/com/cloud/resource/UnableDeleteHostException.java
similarity index 100%
rename from api/src/com/cloud/resource/UnableDeleteHostException.java
rename to api/src/main/java/com/cloud/resource/UnableDeleteHostException.java
diff --git a/api/src/com/cloud/serializer/Param.java b/api/src/main/java/com/cloud/serializer/Param.java
similarity index 100%
rename from api/src/com/cloud/serializer/Param.java
rename to api/src/main/java/com/cloud/serializer/Param.java
diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/main/java/com/cloud/server/ManagementService.java
similarity index 100%
rename from api/src/com/cloud/server/ManagementService.java
rename to api/src/main/java/com/cloud/server/ManagementService.java
diff --git a/api/src/com/cloud/server/ResourceMetaDataService.java b/api/src/main/java/com/cloud/server/ResourceMetaDataService.java
similarity index 100%
rename from api/src/com/cloud/server/ResourceMetaDataService.java
rename to api/src/main/java/com/cloud/server/ResourceMetaDataService.java
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/main/java/com/cloud/server/ResourceTag.java
similarity index 100%
rename from api/src/com/cloud/server/ResourceTag.java
rename to api/src/main/java/com/cloud/server/ResourceTag.java
diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/main/java/com/cloud/server/TaggedResourceService.java
similarity index 100%
rename from api/src/com/cloud/server/TaggedResourceService.java
rename to api/src/main/java/com/cloud/server/TaggedResourceService.java
diff --git a/api/src/com/cloud/storage/DataStoreProviderApiService.java b/api/src/main/java/com/cloud/storage/DataStoreProviderApiService.java
similarity index 100%
rename from api/src/com/cloud/storage/DataStoreProviderApiService.java
rename to api/src/main/java/com/cloud/storage/DataStoreProviderApiService.java
diff --git a/api/src/com/cloud/storage/DataStoreRole.java b/api/src/main/java/com/cloud/storage/DataStoreRole.java
similarity index 100%
rename from api/src/com/cloud/storage/DataStoreRole.java
rename to api/src/main/java/com/cloud/storage/DataStoreRole.java
diff --git a/api/src/com/cloud/storage/GuestOS.java b/api/src/main/java/com/cloud/storage/GuestOS.java
similarity index 100%
rename from api/src/com/cloud/storage/GuestOS.java
rename to api/src/main/java/com/cloud/storage/GuestOS.java
diff --git a/api/src/com/cloud/storage/GuestOSHypervisor.java b/api/src/main/java/com/cloud/storage/GuestOSHypervisor.java
similarity index 100%
rename from api/src/com/cloud/storage/GuestOSHypervisor.java
rename to api/src/main/java/com/cloud/storage/GuestOSHypervisor.java
diff --git a/api/src/com/cloud/storage/GuestOsCategory.java b/api/src/main/java/com/cloud/storage/GuestOsCategory.java
similarity index 100%
rename from api/src/com/cloud/storage/GuestOsCategory.java
rename to api/src/main/java/com/cloud/storage/GuestOsCategory.java
diff --git a/api/src/com/cloud/storage/ImageStore.java b/api/src/main/java/com/cloud/storage/ImageStore.java
similarity index 100%
rename from api/src/com/cloud/storage/ImageStore.java
rename to api/src/main/java/com/cloud/storage/ImageStore.java
diff --git a/api/src/com/cloud/storage/ScopeType.java b/api/src/main/java/com/cloud/storage/ScopeType.java
similarity index 100%
rename from api/src/com/cloud/storage/ScopeType.java
rename to api/src/main/java/com/cloud/storage/ScopeType.java
diff --git a/api/src/com/cloud/storage/Snapshot.java b/api/src/main/java/com/cloud/storage/Snapshot.java
similarity index 100%
rename from api/src/com/cloud/storage/Snapshot.java
rename to api/src/main/java/com/cloud/storage/Snapshot.java
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/main/java/com/cloud/storage/Storage.java
similarity index 100%
rename from api/src/com/cloud/storage/Storage.java
rename to api/src/main/java/com/cloud/storage/Storage.java
diff --git a/api/src/com/cloud/storage/StorageGuru.java b/api/src/main/java/com/cloud/storage/StorageGuru.java
similarity index 100%
rename from api/src/com/cloud/storage/StorageGuru.java
rename to api/src/main/java/com/cloud/storage/StorageGuru.java
diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/main/java/com/cloud/storage/StoragePool.java
similarity index 100%
rename from api/src/com/cloud/storage/StoragePool.java
rename to api/src/main/java/com/cloud/storage/StoragePool.java
diff --git a/api/src/com/cloud/storage/StoragePoolDiscoverer.java b/api/src/main/java/com/cloud/storage/StoragePoolDiscoverer.java
similarity index 100%
rename from api/src/com/cloud/storage/StoragePoolDiscoverer.java
rename to api/src/main/java/com/cloud/storage/StoragePoolDiscoverer.java
diff --git a/api/src/com/cloud/storage/StoragePoolStatus.java b/api/src/main/java/com/cloud/storage/StoragePoolStatus.java
similarity index 100%
rename from api/src/com/cloud/storage/StoragePoolStatus.java
rename to api/src/main/java/com/cloud/storage/StoragePoolStatus.java
diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/main/java/com/cloud/storage/StorageService.java
similarity index 100%
rename from api/src/com/cloud/storage/StorageService.java
rename to api/src/main/java/com/cloud/storage/StorageService.java
diff --git a/api/src/com/cloud/storage/StorageStats.java b/api/src/main/java/com/cloud/storage/StorageStats.java
similarity index 100%
rename from api/src/com/cloud/storage/StorageStats.java
rename to api/src/main/java/com/cloud/storage/StorageStats.java
diff --git a/api/src/com/cloud/storage/Upload.java b/api/src/main/java/com/cloud/storage/Upload.java
similarity index 100%
rename from api/src/com/cloud/storage/Upload.java
rename to api/src/main/java/com/cloud/storage/Upload.java
diff --git a/api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java b/api/src/main/java/com/cloud/storage/VMTemplateStorageResourceAssoc.java
similarity index 100%
rename from api/src/com/cloud/storage/VMTemplateStorageResourceAssoc.java
rename to api/src/main/java/com/cloud/storage/VMTemplateStorageResourceAssoc.java
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/main/java/com/cloud/storage/Volume.java
similarity index 100%
rename from api/src/com/cloud/storage/Volume.java
rename to api/src/main/java/com/cloud/storage/Volume.java
diff --git a/api/src/com/cloud/storage/VolumeApiService.java b/api/src/main/java/com/cloud/storage/VolumeApiService.java
similarity index 100%
rename from api/src/com/cloud/storage/VolumeApiService.java
rename to api/src/main/java/com/cloud/storage/VolumeApiService.java
diff --git a/api/src/com/cloud/storage/VolumeStats.java b/api/src/main/java/com/cloud/storage/VolumeStats.java
similarity index 100%
rename from api/src/com/cloud/storage/VolumeStats.java
rename to api/src/main/java/com/cloud/storage/VolumeStats.java
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotApiService.java b/api/src/main/java/com/cloud/storage/snapshot/SnapshotApiService.java
similarity index 100%
rename from api/src/com/cloud/storage/snapshot/SnapshotApiService.java
rename to api/src/main/java/com/cloud/storage/snapshot/SnapshotApiService.java
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotPolicy.java b/api/src/main/java/com/cloud/storage/snapshot/SnapshotPolicy.java
similarity index 100%
rename from api/src/com/cloud/storage/snapshot/SnapshotPolicy.java
rename to api/src/main/java/com/cloud/storage/snapshot/SnapshotPolicy.java
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotSchedule.java b/api/src/main/java/com/cloud/storage/snapshot/SnapshotSchedule.java
similarity index 100%
rename from api/src/com/cloud/storage/snapshot/SnapshotSchedule.java
rename to api/src/main/java/com/cloud/storage/snapshot/SnapshotSchedule.java
diff --git a/api/src/com/cloud/storage/template/TemplateProp.java b/api/src/main/java/com/cloud/storage/template/TemplateProp.java
similarity index 100%
rename from api/src/com/cloud/storage/template/TemplateProp.java
rename to api/src/main/java/com/cloud/storage/template/TemplateProp.java
diff --git a/api/src/com/cloud/template/BasedOn.java b/api/src/main/java/com/cloud/template/BasedOn.java
similarity index 100%
rename from api/src/com/cloud/template/BasedOn.java
rename to api/src/main/java/com/cloud/template/BasedOn.java
diff --git a/api/src/com/cloud/template/TemplateApiService.java b/api/src/main/java/com/cloud/template/TemplateApiService.java
similarity index 100%
rename from api/src/com/cloud/template/TemplateApiService.java
rename to api/src/main/java/com/cloud/template/TemplateApiService.java
diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
similarity index 100%
rename from api/src/com/cloud/template/VirtualMachineTemplate.java
rename to api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
diff --git a/api/src/com/cloud/user/Account.java b/api/src/main/java/com/cloud/user/Account.java
similarity index 100%
rename from api/src/com/cloud/user/Account.java
rename to api/src/main/java/com/cloud/user/Account.java
diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/main/java/com/cloud/user/AccountService.java
similarity index 100%
rename from api/src/com/cloud/user/AccountService.java
rename to api/src/main/java/com/cloud/user/AccountService.java
diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/main/java/com/cloud/user/DomainService.java
similarity index 100%
rename from api/src/com/cloud/user/DomainService.java
rename to api/src/main/java/com/cloud/user/DomainService.java
diff --git a/api/src/com/cloud/user/OwnedBy.java b/api/src/main/java/com/cloud/user/OwnedBy.java
similarity index 100%
rename from api/src/com/cloud/user/OwnedBy.java
rename to api/src/main/java/com/cloud/user/OwnedBy.java
diff --git a/api/src/com/cloud/user/ResourceLimitService.java b/api/src/main/java/com/cloud/user/ResourceLimitService.java
similarity index 100%
rename from api/src/com/cloud/user/ResourceLimitService.java
rename to api/src/main/java/com/cloud/user/ResourceLimitService.java
diff --git a/api/src/com/cloud/user/SSHKeyPair.java b/api/src/main/java/com/cloud/user/SSHKeyPair.java
similarity index 100%
rename from api/src/com/cloud/user/SSHKeyPair.java
rename to api/src/main/java/com/cloud/user/SSHKeyPair.java
diff --git a/api/src/com/cloud/user/User.java b/api/src/main/java/com/cloud/user/User.java
similarity index 100%
rename from api/src/com/cloud/user/User.java
rename to api/src/main/java/com/cloud/user/User.java
diff --git a/api/src/com/cloud/user/UserAccount.java b/api/src/main/java/com/cloud/user/UserAccount.java
similarity index 100%
rename from api/src/com/cloud/user/UserAccount.java
rename to api/src/main/java/com/cloud/user/UserAccount.java
diff --git a/api/src/com/cloud/uservm/UserVm.java b/api/src/main/java/com/cloud/uservm/UserVm.java
similarity index 100%
rename from api/src/com/cloud/uservm/UserVm.java
rename to api/src/main/java/com/cloud/uservm/UserVm.java
diff --git a/api/src/com/cloud/vm/BareMetalVmService.java b/api/src/main/java/com/cloud/vm/BareMetalVmService.java
similarity index 100%
rename from api/src/com/cloud/vm/BareMetalVmService.java
rename to api/src/main/java/com/cloud/vm/BareMetalVmService.java
diff --git a/api/src/com/cloud/vm/ConsoleProxy.java b/api/src/main/java/com/cloud/vm/ConsoleProxy.java
similarity index 100%
rename from api/src/com/cloud/vm/ConsoleProxy.java
rename to api/src/main/java/com/cloud/vm/ConsoleProxy.java
diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/main/java/com/cloud/vm/DiskProfile.java
similarity index 100%
rename from api/src/com/cloud/vm/DiskProfile.java
rename to api/src/main/java/com/cloud/vm/DiskProfile.java
diff --git a/api/src/com/cloud/vm/InstanceGroup.java b/api/src/main/java/com/cloud/vm/InstanceGroup.java
similarity index 100%
rename from api/src/com/cloud/vm/InstanceGroup.java
rename to api/src/main/java/com/cloud/vm/InstanceGroup.java
diff --git a/api/src/com/cloud/vm/Nic.java b/api/src/main/java/com/cloud/vm/Nic.java
similarity index 100%
rename from api/src/com/cloud/vm/Nic.java
rename to api/src/main/java/com/cloud/vm/Nic.java
diff --git a/api/src/com/cloud/vm/NicExtraDhcpOption.java b/api/src/main/java/com/cloud/vm/NicExtraDhcpOption.java
similarity index 100%
rename from api/src/com/cloud/vm/NicExtraDhcpOption.java
rename to api/src/main/java/com/cloud/vm/NicExtraDhcpOption.java
diff --git a/api/src/com/cloud/vm/NicIpAlias.java b/api/src/main/java/com/cloud/vm/NicIpAlias.java
similarity index 100%
rename from api/src/com/cloud/vm/NicIpAlias.java
rename to api/src/main/java/com/cloud/vm/NicIpAlias.java
diff --git a/api/src/com/cloud/vm/NicProfile.java b/api/src/main/java/com/cloud/vm/NicProfile.java
similarity index 100%
rename from api/src/com/cloud/vm/NicProfile.java
rename to api/src/main/java/com/cloud/vm/NicProfile.java
diff --git a/api/src/com/cloud/vm/NicSecondaryIp.java b/api/src/main/java/com/cloud/vm/NicSecondaryIp.java
similarity index 100%
rename from api/src/com/cloud/vm/NicSecondaryIp.java
rename to api/src/main/java/com/cloud/vm/NicSecondaryIp.java
diff --git a/api/src/com/cloud/vm/ReservationContext.java b/api/src/main/java/com/cloud/vm/ReservationContext.java
similarity index 100%
rename from api/src/com/cloud/vm/ReservationContext.java
rename to api/src/main/java/com/cloud/vm/ReservationContext.java
diff --git a/api/src/com/cloud/vm/RunningOn.java b/api/src/main/java/com/cloud/vm/RunningOn.java
similarity index 100%
rename from api/src/com/cloud/vm/RunningOn.java
rename to api/src/main/java/com/cloud/vm/RunningOn.java
diff --git a/api/src/com/cloud/vm/SecondaryStorageVm.java b/api/src/main/java/com/cloud/vm/SecondaryStorageVm.java
similarity index 100%
rename from api/src/com/cloud/vm/SecondaryStorageVm.java
rename to api/src/main/java/com/cloud/vm/SecondaryStorageVm.java
diff --git a/api/src/com/cloud/vm/SystemVm.java b/api/src/main/java/com/cloud/vm/SystemVm.java
similarity index 100%
rename from api/src/com/cloud/vm/SystemVm.java
rename to api/src/main/java/com/cloud/vm/SystemVm.java
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/main/java/com/cloud/vm/UserVmService.java
similarity index 100%
rename from api/src/com/cloud/vm/UserVmService.java
rename to api/src/main/java/com/cloud/vm/UserVmService.java
diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/main/java/com/cloud/vm/VirtualMachine.java
similarity index 100%
rename from api/src/com/cloud/vm/VirtualMachine.java
rename to api/src/main/java/com/cloud/vm/VirtualMachine.java
diff --git a/api/src/com/cloud/vm/VirtualMachineName.java b/api/src/main/java/com/cloud/vm/VirtualMachineName.java
similarity index 100%
rename from api/src/com/cloud/vm/VirtualMachineName.java
rename to api/src/main/java/com/cloud/vm/VirtualMachineName.java
diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/main/java/com/cloud/vm/VirtualMachineProfile.java
similarity index 100%
rename from api/src/com/cloud/vm/VirtualMachineProfile.java
rename to api/src/main/java/com/cloud/vm/VirtualMachineProfile.java
diff --git a/api/src/com/cloud/vm/VmDetailConstants.java b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
similarity index 100%
rename from api/src/com/cloud/vm/VmDetailConstants.java
rename to api/src/main/java/com/cloud/vm/VmDetailConstants.java
diff --git a/api/src/com/cloud/vm/VmDiskStats.java b/api/src/main/java/com/cloud/vm/VmDiskStats.java
similarity index 100%
rename from api/src/com/cloud/vm/VmDiskStats.java
rename to api/src/main/java/com/cloud/vm/VmDiskStats.java
diff --git a/api/src/com/cloud/vm/VmNetworkStats.java b/api/src/main/java/com/cloud/vm/VmNetworkStats.java
similarity index 100%
rename from api/src/com/cloud/vm/VmNetworkStats.java
rename to api/src/main/java/com/cloud/vm/VmNetworkStats.java
diff --git a/api/src/com/cloud/vm/VmStats.java b/api/src/main/java/com/cloud/vm/VmStats.java
similarity index 100%
rename from api/src/com/cloud/vm/VmStats.java
rename to api/src/main/java/com/cloud/vm/VmStats.java
diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshot.java b/api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java
similarity index 100%
rename from api/src/com/cloud/vm/snapshot/VMSnapshot.java
rename to api/src/main/java/com/cloud/vm/snapshot/VMSnapshot.java
diff --git a/api/src/com/cloud/vm/snapshot/VMSnapshotService.java b/api/src/main/java/com/cloud/vm/snapshot/VMSnapshotService.java
similarity index 100%
rename from api/src/com/cloud/vm/snapshot/VMSnapshotService.java
rename to api/src/main/java/com/cloud/vm/snapshot/VMSnapshotService.java
diff --git a/api/src/org/apache/cloudstack/acl/APIChecker.java b/api/src/main/java/org/apache/cloudstack/acl/APIChecker.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/APIChecker.java
rename to api/src/main/java/org/apache/cloudstack/acl/APIChecker.java
diff --git a/api/src/org/apache/cloudstack/acl/APILimitChecker.java b/api/src/main/java/org/apache/cloudstack/acl/APILimitChecker.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/APILimitChecker.java
rename to api/src/main/java/org/apache/cloudstack/acl/APILimitChecker.java
diff --git a/api/src/org/apache/cloudstack/acl/ControlledEntity.java b/api/src/main/java/org/apache/cloudstack/acl/ControlledEntity.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/ControlledEntity.java
rename to api/src/main/java/org/apache/cloudstack/acl/ControlledEntity.java
diff --git a/api/src/org/apache/cloudstack/acl/InfrastructureEntity.java b/api/src/main/java/org/apache/cloudstack/acl/InfrastructureEntity.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/InfrastructureEntity.java
rename to api/src/main/java/org/apache/cloudstack/acl/InfrastructureEntity.java
diff --git a/api/src/org/apache/cloudstack/acl/PermissionScope.java b/api/src/main/java/org/apache/cloudstack/acl/PermissionScope.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/PermissionScope.java
rename to api/src/main/java/org/apache/cloudstack/acl/PermissionScope.java
diff --git a/api/src/org/apache/cloudstack/acl/QuerySelector.java b/api/src/main/java/org/apache/cloudstack/acl/QuerySelector.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/QuerySelector.java
rename to api/src/main/java/org/apache/cloudstack/acl/QuerySelector.java
diff --git a/api/src/org/apache/cloudstack/acl/Role.java b/api/src/main/java/org/apache/cloudstack/acl/Role.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/Role.java
rename to api/src/main/java/org/apache/cloudstack/acl/Role.java
diff --git a/api/src/org/apache/cloudstack/acl/RolePermission.java b/api/src/main/java/org/apache/cloudstack/acl/RolePermission.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/RolePermission.java
rename to api/src/main/java/org/apache/cloudstack/acl/RolePermission.java
diff --git a/api/src/org/apache/cloudstack/acl/RoleService.java b/api/src/main/java/org/apache/cloudstack/acl/RoleService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/RoleService.java
rename to api/src/main/java/org/apache/cloudstack/acl/RoleService.java
diff --git a/api/src/org/apache/cloudstack/acl/RoleType.java b/api/src/main/java/org/apache/cloudstack/acl/RoleType.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/RoleType.java
rename to api/src/main/java/org/apache/cloudstack/acl/RoleType.java
diff --git a/api/src/org/apache/cloudstack/acl/Rule.java b/api/src/main/java/org/apache/cloudstack/acl/Rule.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/Rule.java
rename to api/src/main/java/org/apache/cloudstack/acl/Rule.java
diff --git a/api/src/org/apache/cloudstack/acl/SecurityChecker.java b/api/src/main/java/org/apache/cloudstack/acl/SecurityChecker.java
similarity index 100%
rename from api/src/org/apache/cloudstack/acl/SecurityChecker.java
rename to api/src/main/java/org/apache/cloudstack/acl/SecurityChecker.java
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroup.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroup.java
similarity index 100%
rename from api/src/org/apache/cloudstack/affinity/AffinityGroup.java
rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroup.java
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupProcessor.java
similarity index 100%
rename from api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java
rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupProcessor.java
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java
rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupResponse.java
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/affinity/AffinityGroupService.java
rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupService.java
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java b/api/src/main/java/org/apache/cloudstack/affinity/AffinityProcessorBase.java
similarity index 100%
rename from api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java
rename to api/src/main/java/org/apache/cloudstack/affinity/AffinityProcessorBase.java
diff --git a/api/src/org/apache/cloudstack/alert/AlertService.java b/api/src/main/java/org/apache/cloudstack/alert/AlertService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/alert/AlertService.java
rename to api/src/main/java/org/apache/cloudstack/alert/AlertService.java
diff --git a/api/src/org/apache/cloudstack/annotation/Annotation.java b/api/src/main/java/org/apache/cloudstack/annotation/Annotation.java
similarity index 100%
rename from api/src/org/apache/cloudstack/annotation/Annotation.java
rename to api/src/main/java/org/apache/cloudstack/annotation/Annotation.java
diff --git a/api/src/org/apache/cloudstack/annotation/AnnotationService.java b/api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/annotation/AnnotationService.java
rename to api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java
diff --git a/api/src/org/apache/cloudstack/api/ACL.java b/api/src/main/java/org/apache/cloudstack/api/ACL.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ACL.java
rename to api/src/main/java/org/apache/cloudstack/api/ACL.java
diff --git a/api/src/org/apache/cloudstack/api/APICommand.java b/api/src/main/java/org/apache/cloudstack/api/APICommand.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/APICommand.java
rename to api/src/main/java/org/apache/cloudstack/api/APICommand.java
diff --git a/api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java b/api/src/main/java/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/ApiArgValidator.java b/api/src/main/java/org/apache/cloudstack/api/ApiArgValidator.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ApiArgValidator.java
rename to api/src/main/java/org/apache/cloudstack/api/ApiArgValidator.java
diff --git a/api/src/org/apache/cloudstack/api/ApiCommandJobType.java b/api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ApiCommandJobType.java
rename to api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ApiConstants.java
rename to api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
diff --git a/api/src/org/apache/cloudstack/api/ApiErrorCode.java b/api/src/main/java/org/apache/cloudstack/api/ApiErrorCode.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ApiErrorCode.java
rename to api/src/main/java/org/apache/cloudstack/api/ApiErrorCode.java
diff --git a/api/src/org/apache/cloudstack/api/ApiServerService.java b/api/src/main/java/org/apache/cloudstack/api/ApiServerService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ApiServerService.java
rename to api/src/main/java/org/apache/cloudstack/api/ApiServerService.java
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCustomIdCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseCustomIdCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseListCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseListCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseListProjectAndAccountResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseResponse.java b/api/src/main/java/org/apache/cloudstack/api/BaseResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseResponse.java
diff --git a/api/src/org/apache/cloudstack/api/BaseResponseWithTagInformation.java b/api/src/main/java/org/apache/cloudstack/api/BaseResponseWithTagInformation.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseResponseWithTagInformation.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseResponseWithTagInformation.java
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/Displayable.java b/api/src/main/java/org/apache/cloudstack/api/Displayable.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/Displayable.java
rename to api/src/main/java/org/apache/cloudstack/api/Displayable.java
diff --git a/api/src/org/apache/cloudstack/api/EntityReference.java b/api/src/main/java/org/apache/cloudstack/api/EntityReference.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/EntityReference.java
rename to api/src/main/java/org/apache/cloudstack/api/EntityReference.java
diff --git a/api/src/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/IBaseListAccountResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/IBaseListCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/IBaseListCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java
diff --git a/api/src/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/IBaseListDomainResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/IBaseListProjectAndAccountResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/IBaseListTaggedResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/Identity.java b/api/src/main/java/org/apache/cloudstack/api/Identity.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/Identity.java
rename to api/src/main/java/org/apache/cloudstack/api/Identity.java
diff --git a/api/src/org/apache/cloudstack/api/InternalIdentity.java b/api/src/main/java/org/apache/cloudstack/api/InternalIdentity.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/InternalIdentity.java
rename to api/src/main/java/org/apache/cloudstack/api/InternalIdentity.java
diff --git a/api/src/org/apache/cloudstack/api/LdapValidator.java b/api/src/main/java/org/apache/cloudstack/api/LdapValidator.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/LdapValidator.java
rename to api/src/main/java/org/apache/cloudstack/api/LdapValidator.java
diff --git a/api/src/org/apache/cloudstack/api/Parameter.java b/api/src/main/java/org/apache/cloudstack/api/Parameter.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/Parameter.java
rename to api/src/main/java/org/apache/cloudstack/api/Parameter.java
diff --git a/api/src/org/apache/cloudstack/api/ResourceDetail.java b/api/src/main/java/org/apache/cloudstack/api/ResourceDetail.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ResourceDetail.java
rename to api/src/main/java/org/apache/cloudstack/api/ResourceDetail.java
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ResponseGenerator.java
rename to api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
diff --git a/api/src/org/apache/cloudstack/api/ResponseObject.java b/api/src/main/java/org/apache/cloudstack/api/ResponseObject.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ResponseObject.java
rename to api/src/main/java/org/apache/cloudstack/api/ResponseObject.java
diff --git a/api/src/org/apache/cloudstack/api/ServerApiException.java b/api/src/main/java/org/apache/cloudstack/api/ServerApiException.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/ServerApiException.java
rename to api/src/main/java/org/apache/cloudstack/api/ServerApiException.java
diff --git a/api/src/org/apache/cloudstack/api/Validate.java b/api/src/main/java/org/apache/cloudstack/api/Validate.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/Validate.java
rename to api/src/main/java/org/apache/cloudstack/api/Validate.java
diff --git a/api/src/org/apache/cloudstack/api/auth/APIAuthenticationManager.java b/api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationManager.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/auth/APIAuthenticationManager.java
rename to api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationManager.java
diff --git a/api/src/org/apache/cloudstack/api/auth/APIAuthenticationType.java b/api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationType.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/auth/APIAuthenticationType.java
rename to api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticationType.java
diff --git a/api/src/org/apache/cloudstack/api/auth/APIAuthenticator.java b/api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticator.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/auth/APIAuthenticator.java
rename to api/src/main/java/org/apache/cloudstack/api/auth/APIAuthenticator.java
diff --git a/api/src/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java b/api/src/main/java/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java
rename to api/src/main/java/org/apache/cloudstack/api/auth/PluggableAPIAuthenticator.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/CopyIsoCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreS3CMD.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/IListFirewallRulesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/UpdateSnapshotPolicyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/SecurityGroupAction.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
rename to api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
diff --git a/api/src/org/apache/cloudstack/api/response/AccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AccountResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AlertResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AlertResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AlertResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AnnotationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AnnotationResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AnnotationResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AnnotationResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerInstanceResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerRuleResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AsyncJobResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AuthenticationCmdResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CAProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CAProviderResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CAProviderResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CAProviderResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilityResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CapabilityResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CapabilityResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CapacityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapacityResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CapacityResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CapacityResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CertificateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CertificateResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CertificateResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CertificateResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CloudIdentifierResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ClusterResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ConditionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ConditionResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ConditionResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ConditionResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ControlledEntityResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ControlledEntityResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CounterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CounterResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CounterResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CounterResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CreateCmdResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CreateCmdResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CreateSSHKeyPairResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CustomCertificateResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/CustomCertificateResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DiskOfferingResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/DiskOfferingResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/DomainResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/DomainResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/DomainResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/EventResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/EventResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/EventResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/EventResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/EventTypeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/EventTypeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/EventTypeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExceptionResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ExceptionResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ExceptionResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ExternalFirewallResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ExternalLoadBalancerResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ExtractResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ExtractResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ExtractResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ExtractResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/FirewallResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/FirewallResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/FirewallResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/FirewallRuleResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/FirewallRuleResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GetVMPasswordResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GpuResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GpuResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GpuResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GpuResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GuestOSResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GuestOsMappingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestOsMappingResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GuestOsMappingResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GuestOsMappingResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HAProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HAProviderResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HAProviderResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HAProviderResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HostHAResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostHAResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HostHAResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HostHAResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HostResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HostTagResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostTagResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HostTagResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HostTagResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HypervisorResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/HypervisorResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/HypervisorResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/IPAddressResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ImageStoreDetailResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ImageStoreResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/InstanceGroupResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/InstanceGroupResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/InternalLoadBalancerElementResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IsoVmResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/IsoVmResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IsolationMethodResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/IsolationMethodResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/IsolationMethodResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LBHealthCheckResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LBStickinessResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LBStickinessResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ListResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ListResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ListResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ListResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerRuleVmMapResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LoginCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LoginCmdResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LoginCmdResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LoginCmdResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/LogoutCmdResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/LogoutCmdResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/LogoutCmdResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/LogoutCmdResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkACLResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkDeviceResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NetworkResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NicExtraDhcpOptionResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NicResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NicResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/OutOfBandManagementResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/OvsProviderResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/OvsProviderResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/OvsProviderResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PodResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/PodResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/PodResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/PortableIpRangeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/PortableIpResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PortableIpResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/PortableIpResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/PortableIpResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectAccountResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ProjectAccountResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ProjectInvitationResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ProjectResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ProjectResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ProjectResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ProviderResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ProviderResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ProviderResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/RegionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RegionResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/RegionResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/RegionResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/RegisterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/RegisterResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceCountResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceCountResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceDetailResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ResourceDetailResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceDetailResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitAndCountResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceTagResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ResourceTagResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/RolePermissionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RolePermissionResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/RolePermissionResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/RolePermissionResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/RoleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RoleResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/RoleResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/RoleResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ServiceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ServiceResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ServiceResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SnapshotResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SslCertResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SslCertResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StorageProviderResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/StorageProviderResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/StorageProviderResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/StorageTagResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StorageTagResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/StorageTagResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/StorageTagResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SuccessResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SuccessResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SuccessResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/TemplateResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/TrafficMonitorResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UsageTypeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/UsageTypeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/UsageTypeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/UserResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/UserResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/UserVmResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VMUserDataResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMUserDataResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VMUserDataResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VMUserDataResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VgpuResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VgpuResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VgpuResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VgpuResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VolumeResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpcOfferingResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VpcOfferingResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VpcResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VpnUsersResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/VpnUsersResponse.java
diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ZoneResponse.java
rename to api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
diff --git a/api/src/org/apache/cloudstack/ca/CAManager.java b/api/src/main/java/org/apache/cloudstack/ca/CAManager.java
similarity index 100%
rename from api/src/org/apache/cloudstack/ca/CAManager.java
rename to api/src/main/java/org/apache/cloudstack/ca/CAManager.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificate.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateVPCCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/network/MigrateVPCCmd.java
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/user/MoveUserCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/command/admin/user/MoveUserCmd.java
diff --git a/api/src/org/apache/cloudstack/api/response/ChildTemplateResponse.java b/api/src/main/java/org/apache/cloudstack/cloudstack/api/response/ChildTemplateResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/response/ChildTemplateResponse.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/api/response/ChildTemplateResponse.java
diff --git a/api/src/org/apache/cloudstack/direct/download/DirectDownloadManager.java b/api/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManager.java
similarity index 100%
rename from api/src/org/apache/cloudstack/direct/download/DirectDownloadManager.java
rename to api/src/main/java/org/apache/cloudstack/cloudstack/direct/download/DirectDownloadManager.java
diff --git a/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java
similarity index 100%
rename from api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java
rename to api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java
diff --git a/api/src/org/apache/cloudstack/context/CallContext.java b/api/src/main/java/org/apache/cloudstack/context/CallContext.java
similarity index 100%
rename from api/src/org/apache/cloudstack/context/CallContext.java
rename to api/src/main/java/org/apache/cloudstack/context/CallContext.java
diff --git a/api/src/org/apache/cloudstack/context/CallContextListener.java b/api/src/main/java/org/apache/cloudstack/context/CallContextListener.java
similarity index 100%
rename from api/src/org/apache/cloudstack/context/CallContextListener.java
rename to api/src/main/java/org/apache/cloudstack/context/CallContextListener.java
diff --git a/api/src/org/apache/cloudstack/context/LogContext.java b/api/src/main/java/org/apache/cloudstack/context/LogContext.java
similarity index 100%
rename from api/src/org/apache/cloudstack/context/LogContext.java
rename to api/src/main/java/org/apache/cloudstack/context/LogContext.java
diff --git a/api/src/org/apache/cloudstack/context/LogContextListener.java b/api/src/main/java/org/apache/cloudstack/context/LogContextListener.java
similarity index 100%
rename from api/src/org/apache/cloudstack/context/LogContextListener.java
rename to api/src/main/java/org/apache/cloudstack/context/LogContextListener.java
diff --git a/api/src/org/apache/cloudstack/ha/HAConfig.java b/api/src/main/java/org/apache/cloudstack/ha/HAConfig.java
similarity index 100%
rename from api/src/org/apache/cloudstack/ha/HAConfig.java
rename to api/src/main/java/org/apache/cloudstack/ha/HAConfig.java
diff --git a/api/src/org/apache/cloudstack/ha/HAConfigManager.java b/api/src/main/java/org/apache/cloudstack/ha/HAConfigManager.java
similarity index 100%
rename from api/src/org/apache/cloudstack/ha/HAConfigManager.java
rename to api/src/main/java/org/apache/cloudstack/ha/HAConfigManager.java
diff --git a/api/src/org/apache/cloudstack/ha/HAResource.java b/api/src/main/java/org/apache/cloudstack/ha/HAResource.java
similarity index 100%
rename from api/src/org/apache/cloudstack/ha/HAResource.java
rename to api/src/main/java/org/apache/cloudstack/ha/HAResource.java
diff --git a/api/src/org/apache/cloudstack/jobs/JobInfo.java b/api/src/main/java/org/apache/cloudstack/jobs/JobInfo.java
similarity index 100%
rename from api/src/org/apache/cloudstack/jobs/JobInfo.java
rename to api/src/main/java/org/apache/cloudstack/jobs/JobInfo.java
diff --git a/api/src/org/apache/cloudstack/kernel/Partition.java b/api/src/main/java/org/apache/cloudstack/kernel/Partition.java
similarity index 100%
rename from api/src/org/apache/cloudstack/kernel/Partition.java
rename to api/src/main/java/org/apache/cloudstack/kernel/Partition.java
diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/main/java/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
rename to api/src/main/java/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
diff --git a/api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java b/api/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
rename to api/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElementService.java
diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java b/api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
rename to api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java b/api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java
rename to api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerRule.java
diff --git a/api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java b/api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java
rename to api/src/main/java/org/apache/cloudstack/network/lb/ApplicationLoadBalancerService.java
diff --git a/api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java b/api/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java
rename to api/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMService.java
diff --git a/api/src/org/apache/cloudstack/network/tls/CertService.java b/api/src/main/java/org/apache/cloudstack/network/tls/CertService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/tls/CertService.java
rename to api/src/main/java/org/apache/cloudstack/network/tls/CertService.java
diff --git a/api/src/org/apache/cloudstack/network/tls/SslCert.java b/api/src/main/java/org/apache/cloudstack/network/tls/SslCert.java
similarity index 100%
rename from api/src/org/apache/cloudstack/network/tls/SslCert.java
rename to api/src/main/java/org/apache/cloudstack/network/tls/SslCert.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagement.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementDriver.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementService.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverCommand.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverPowerCommand.java
diff --git a/api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java b/api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java
similarity index 100%
rename from api/src/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java
rename to api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverResponse.java
diff --git a/api/src/org/apache/cloudstack/poll/BackgroundPollManager.java b/api/src/main/java/org/apache/cloudstack/poll/BackgroundPollManager.java
similarity index 100%
rename from api/src/org/apache/cloudstack/poll/BackgroundPollManager.java
rename to api/src/main/java/org/apache/cloudstack/poll/BackgroundPollManager.java
diff --git a/api/src/org/apache/cloudstack/poll/BackgroundPollTask.java b/api/src/main/java/org/apache/cloudstack/poll/BackgroundPollTask.java
similarity index 100%
rename from api/src/org/apache/cloudstack/poll/BackgroundPollTask.java
rename to api/src/main/java/org/apache/cloudstack/poll/BackgroundPollTask.java
diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/query/QueryService.java
rename to api/src/main/java/org/apache/cloudstack/query/QueryService.java
diff --git a/api/src/org/apache/cloudstack/region/PortableIp.java b/api/src/main/java/org/apache/cloudstack/region/PortableIp.java
similarity index 100%
rename from api/src/org/apache/cloudstack/region/PortableIp.java
rename to api/src/main/java/org/apache/cloudstack/region/PortableIp.java
diff --git a/api/src/org/apache/cloudstack/region/PortableIpRange.java b/api/src/main/java/org/apache/cloudstack/region/PortableIpRange.java
similarity index 100%
rename from api/src/org/apache/cloudstack/region/PortableIpRange.java
rename to api/src/main/java/org/apache/cloudstack/region/PortableIpRange.java
diff --git a/api/src/org/apache/cloudstack/region/Region.java b/api/src/main/java/org/apache/cloudstack/region/Region.java
similarity index 100%
rename from api/src/org/apache/cloudstack/region/Region.java
rename to api/src/main/java/org/apache/cloudstack/region/Region.java
diff --git a/api/src/org/apache/cloudstack/region/RegionService.java b/api/src/main/java/org/apache/cloudstack/region/RegionService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/region/RegionService.java
rename to api/src/main/java/org/apache/cloudstack/region/RegionService.java
diff --git a/api/src/org/apache/cloudstack/region/RegionSync.java b/api/src/main/java/org/apache/cloudstack/region/RegionSync.java
similarity index 100%
rename from api/src/org/apache/cloudstack/region/RegionSync.java
rename to api/src/main/java/org/apache/cloudstack/region/RegionSync.java
diff --git a/api/src/org/apache/cloudstack/usage/Usage.java b/api/src/main/java/org/apache/cloudstack/usage/Usage.java
similarity index 100%
rename from api/src/org/apache/cloudstack/usage/Usage.java
rename to api/src/main/java/org/apache/cloudstack/usage/Usage.java
diff --git a/api/src/org/apache/cloudstack/usage/UsageService.java b/api/src/main/java/org/apache/cloudstack/usage/UsageService.java
similarity index 100%
rename from api/src/org/apache/cloudstack/usage/UsageService.java
rename to api/src/main/java/org/apache/cloudstack/usage/UsageService.java
diff --git a/api/src/org/apache/cloudstack/usage/UsageTypes.java b/api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java
similarity index 100%
rename from api/src/org/apache/cloudstack/usage/UsageTypes.java
rename to api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java
diff --git a/api/resources/META-INF/cloudstack/api-config/module.properties b/api/src/main/resources/META-INF/cloudstack/api-config/module.properties
similarity index 100%
rename from api/resources/META-INF/cloudstack/api-config/module.properties
rename to api/src/main/resources/META-INF/cloudstack/api-config/module.properties
diff --git a/api/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml b/api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml
similarity index 100%
rename from api/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml
rename to api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml
diff --git a/api/resources/META-INF/cloudstack/api-planner/module.properties b/api/src/main/resources/META-INF/cloudstack/api-planner/module.properties
similarity index 100%
rename from api/resources/META-INF/cloudstack/api-planner/module.properties
rename to api/src/main/resources/META-INF/cloudstack/api-planner/module.properties
diff --git a/api/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml b/api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml
similarity index 100%
rename from api/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml
rename to api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml
diff --git a/api/test/com/cloud/network/IsolationMethodTest.java b/api/src/test/java/com/cloud/network/IsolationMethodTest.java
similarity index 100%
rename from api/test/com/cloud/network/IsolationMethodTest.java
rename to api/src/test/java/com/cloud/network/IsolationMethodTest.java
diff --git a/api/test/com/cloud/network/NetworksTest.java b/api/src/test/java/com/cloud/network/NetworksTest.java
similarity index 100%
rename from api/test/com/cloud/network/NetworksTest.java
rename to api/src/test/java/com/cloud/network/NetworksTest.java
diff --git a/api/test/com/cloud/storage/StorageTest.java b/api/src/test/java/com/cloud/storage/StorageTest.java
similarity index 100%
rename from api/test/com/cloud/storage/StorageTest.java
rename to api/src/test/java/com/cloud/storage/StorageTest.java
diff --git a/api/test/org/apache/cloudstack/acl/RoleTypeTest.java b/api/src/test/java/org/apache/cloudstack/acl/RoleTypeTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/acl/RoleTypeTest.java
rename to api/src/test/java/org/apache/cloudstack/acl/RoleTypeTest.java
diff --git a/api/test/org/apache/cloudstack/acl/RuleTest.java b/api/src/test/java/org/apache/cloudstack/acl/RuleTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/acl/RuleTest.java
rename to api/src/test/java/org/apache/cloudstack/acl/RuleTest.java
diff --git a/api/test/org/apache/cloudstack/api/ApiCmdTestUtil.java b/api/src/test/java/org/apache/cloudstack/api/ApiCmdTestUtil.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/ApiCmdTestUtil.java
rename to api/src/test/java/org/apache/cloudstack/api/ApiCmdTestUtil.java
diff --git a/api/test/org/apache/cloudstack/api/BaseCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/BaseCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/BaseCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/BaseCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/ActivateProjectCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddAccountToProjectCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddClusterCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddHostCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddHostCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddNetworkServiceProviderCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/RegionCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/ScaleVMCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateHostPasswordCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/UpdateVmNicIpTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UsageCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/test/UsageCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/test/UsageCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdByAdminTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdByAdminTest.java
diff --git a/api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java
rename to api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java
diff --git a/api/test/org/apache/cloudstack/api/response/HostResponseTest.java b/api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/api/response/HostResponseTest.java
rename to api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java
diff --git a/api/test/org/apache/cloudstack/context/CallContextTest.java b/api/src/test/java/org/apache/cloudstack/context/CallContextTest.java
similarity index 100%
rename from api/test/org/apache/cloudstack/context/CallContextTest.java
rename to api/src/test/java/org/apache/cloudstack/context/CallContextTest.java
diff --git a/api/test/org/apache/cloudstack/test/utils/SpringUtils.java b/api/src/test/java/org/apache/cloudstack/test/utils/SpringUtils.java
similarity index 100%
rename from api/test/org/apache/cloudstack/test/utils/SpringUtils.java
rename to api/src/test/java/org/apache/cloudstack/test/utils/SpringUtils.java
diff --git a/client/pom.xml b/client/pom.xml
index f492030..5620336 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -558,7 +558,7 @@
                 <chmod perm="755"
                   file="${project.build.directory}/common/scripts/**" type="both"/>
                 <copy todir="${project.build.directory}/classes/META-INF/webapp/WEB-INF/">
-                  <fileset dir="${basedir}/WEB-INF/">
+                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/">
                     <include name="web.xml"/>
                   </fileset>
                 </copy>
@@ -646,7 +646,7 @@
                   replace="classpath:nonossComponentContext.xml" byline="true"/>
                 <copy overwrite="true"
                   todir="${basedir}/target/common/scripts">
-                  <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
+                  <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/src/main/scripts">
                     <include name="**/*"/>
                   </fileset>
                 </copy>
diff --git a/client/src/org/apache/cloudstack/ServerDaemon.java b/client/src/main/java/org/apache/cloudstack/ServerDaemon.java
similarity index 100%
rename from client/src/org/apache/cloudstack/ServerDaemon.java
rename to client/src/main/java/org/apache/cloudstack/ServerDaemon.java
diff --git a/client/resources/META-INF/cloudstack/webApplicationContext.xml b/client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml
similarity index 100%
rename from client/resources/META-INF/cloudstack/webApplicationContext.xml
rename to client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml
diff --git a/client/WEB-INF/web.xml b/client/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from client/WEB-INF/web.xml
rename to client/src/main/webapp/WEB-INF/web.xml
diff --git a/core/src/com/cloud/agent/IAgentControl.java b/core/src/main/java/com/cloud/agent/IAgentControl.java
similarity index 100%
rename from core/src/com/cloud/agent/IAgentControl.java
rename to core/src/main/java/com/cloud/agent/IAgentControl.java
diff --git a/core/src/com/cloud/agent/IAgentControlListener.java b/core/src/main/java/com/cloud/agent/IAgentControlListener.java
similarity index 100%
rename from core/src/com/cloud/agent/IAgentControlListener.java
rename to core/src/main/java/com/cloud/agent/IAgentControlListener.java
diff --git a/core/src/com/cloud/agent/StartupCommandProcessor.java b/core/src/main/java/com/cloud/agent/StartupCommandProcessor.java
similarity index 100%
rename from core/src/com/cloud/agent/StartupCommandProcessor.java
rename to core/src/main/java/com/cloud/agent/StartupCommandProcessor.java
diff --git a/core/src/com/cloud/agent/api/AgentControlAnswer.java b/core/src/main/java/com/cloud/agent/api/AgentControlAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AgentControlAnswer.java
rename to core/src/main/java/com/cloud/agent/api/AgentControlAnswer.java
diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/main/java/com/cloud/agent/api/AgentControlCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AgentControlCommand.java
rename to core/src/main/java/com/cloud/agent/api/AgentControlCommand.java
diff --git a/core/src/com/cloud/agent/api/AttachIsoAnswer.java b/core/src/main/java/com/cloud/agent/api/AttachIsoAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AttachIsoAnswer.java
rename to core/src/main/java/com/cloud/agent/api/AttachIsoAnswer.java
diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/main/java/com/cloud/agent/api/AttachIsoCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AttachIsoCommand.java
rename to core/src/main/java/com/cloud/agent/api/AttachIsoCommand.java
diff --git a/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java b/core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java
rename to core/src/main/java/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/core/src/main/java/com/cloud/agent/api/BackupSnapshotAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
rename to core/src/main/java/com/cloud/agent/api/BackupSnapshotAnswer.java
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/main/java/com/cloud/agent/api/BackupSnapshotCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/BackupSnapshotCommand.java
rename to core/src/main/java/com/cloud/agent/api/BackupSnapshotCommand.java
diff --git a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/core/src/main/java/com/cloud/agent/api/BumpUpPriorityCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
rename to core/src/main/java/com/cloud/agent/api/BumpUpPriorityCommand.java
diff --git a/core/src/com/cloud/agent/api/CancelCommand.java b/core/src/main/java/com/cloud/agent/api/CancelCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CancelCommand.java
rename to core/src/main/java/com/cloud/agent/api/CancelCommand.java
diff --git a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java b/core/src/main/java/com/cloud/agent/api/ChangeAgentAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ChangeAgentAnswer.java
rename to core/src/main/java/com/cloud/agent/api/ChangeAgentAnswer.java
diff --git a/core/src/com/cloud/agent/api/ChangeAgentCommand.java b/core/src/main/java/com/cloud/agent/api/ChangeAgentCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/ChangeAgentCommand.java
rename to core/src/main/java/com/cloud/agent/api/ChangeAgentCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckHealthAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckHealthAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckHealthAnswer.java
rename to core/src/main/java/com/cloud/agent/api/CheckHealthAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckHealthCommand.java b/core/src/main/java/com/cloud/agent/api/CheckHealthCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckHealthCommand.java
rename to core/src/main/java/com/cloud/agent/api/CheckHealthCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckNetworkAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckNetworkAnswer.java
rename to core/src/main/java/com/cloud/agent/api/CheckNetworkAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckNetworkCommand.java b/core/src/main/java/com/cloud/agent/api/CheckNetworkCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckNetworkCommand.java
rename to core/src/main/java/com/cloud/agent/api/CheckNetworkCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckOnHostAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckOnHostAnswer.java
rename to core/src/main/java/com/cloud/agent/api/CheckOnHostAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java b/core/src/main/java/com/cloud/agent/api/CheckOnHostCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckOnHostCommand.java
rename to core/src/main/java/com/cloud/agent/api/CheckOnHostCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckRouterAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckRouterAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckRouterAnswer.java
rename to core/src/main/java/com/cloud/agent/api/CheckRouterAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckRouterCommand.java b/core/src/main/java/com/cloud/agent/api/CheckRouterCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckRouterCommand.java
rename to core/src/main/java/com/cloud/agent/api/CheckRouterCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
rename to core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
rename to core/src/main/java/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckStateAnswer.java b/core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckStateAnswer.java
rename to core/src/main/java/com/cloud/agent/api/CheckStateAnswer.java
diff --git a/core/src/com/cloud/agent/api/CheckStateCommand.java b/core/src/main/java/com/cloud/agent/api/CheckStateCommand.java
similarity index 100%
rename from core/src/com/cloud/agent/api/CheckStateCommand.java
rename to core/src/main/java/com/cloud/agent/api/CheckStateCommand.java
diff --git a/core/src/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java b/core/src/main/java/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java
similarity index 100%
... 18072 lines suppressed ...

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].