You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/07/17 10:10:51 UTC

[07/39] git commit: updated refs/heads/vpc-toolkit-hugo to 34bed5f

Cleanup licenses in core with com.mycila:license-maven-plugin:format


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a49bb7e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a49bb7e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a49bb7e8

Branch: refs/heads/vpc-toolkit-hugo
Commit: a49bb7e8e3a3f6e7dd7dbc4ac3d8cf55fd696819
Parents: 109d129
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Jul 14 16:24:22 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Jul 14 16:28:29 2014 +0200

----------------------------------------------------------------------
 .../cloudstack/allocator/module.properties      |  3 ++
 .../allocator/spring-core-allocator-context.xml | 30 +++++++-------
 ...-lifecycle-allocator-context-inheritable.xml | 30 +++++++-------
 .../META-INF/cloudstack/api/module.properties   |  3 ++
 ...g-core-lifecycle-api-context-inheritable.xml | 34 ++++++++--------
 .../cloudstack/backend/module.properties        |  3 ++
 .../cloudstack/bootstrap/module.properties      |  3 ++
 .../spring-bootstrap-context-inheritable.xml    | 30 +++++++-------
 .../bootstrap/spring-bootstrap-context.xml      | 30 +++++++-------
 .../cloudstack/compute/module.properties        |  3 ++
 ...re-lifecycle-compute-context-inheritable.xml | 34 ++++++++--------
 .../META-INF/cloudstack/core/module.properties  |  3 ++
 .../cloudstack/core/spring-core-context.xml     | 30 +++++++-------
 ...-core-lifecycle-core-context-inheritable.xml | 30 +++++++-------
 .../core/spring-core-registry-core-context.xml  | 34 ++++++++--------
 .../cloudstack/discoverer/module.properties     |  3 ++
 ...lifecycle-discoverer-context-inheritable.xml | 30 +++++++-------
 .../cloudstack/network/module.properties        |  3 ++
 ...re-lifecycle-network-context-inheritable.xml | 34 ++++++++--------
 .../cloudstack/planner/module.properties        |  3 ++
 ...re-lifecycle-planner-context-inheritable.xml | 34 ++++++++--------
 .../cloudstack/storage/module.properties        |  3 ++
 ...ng-lifecycle-storage-context-inheritable.xml | 30 +++++++-------
 .../cloudstack/system/module.properties         |  3 ++
 .../spring-core-system-context-inheritable.xml  | 30 +++++++-------
 .../system/spring-core-system-context.xml       | 30 +++++++-------
 core/src/com/cloud/agent/IAgentControl.java     |  3 ++
 .../com/cloud/agent/IAgentControlListener.java  |  3 ++
 .../cloud/agent/StartupCommandProcessor.java    |  3 ++
 .../com/cloud/agent/api/AgentControlAnswer.java |  3 ++
 .../cloud/agent/api/AgentControlCommand.java    |  3 ++
 .../com/cloud/agent/api/AttachIsoCommand.java   |  3 ++
 .../com/cloud/agent/api/AttachVolumeAnswer.java |  3 ++
 .../cloud/agent/api/AttachVolumeCommand.java    |  3 ++
 .../cloud/agent/api/BackupSnapshotAnswer.java   |  3 ++
 .../cloud/agent/api/BackupSnapshotCommand.java  |  3 ++
 .../cloud/agent/api/BumpUpPriorityCommand.java  |  3 ++
 core/src/com/cloud/agent/api/CancelCommand.java |  3 ++
 .../com/cloud/agent/api/ChangeAgentAnswer.java  |  3 ++
 .../com/cloud/agent/api/ChangeAgentCommand.java |  3 ++
 .../com/cloud/agent/api/CheckHealthAnswer.java  |  3 ++
 .../com/cloud/agent/api/CheckHealthCommand.java |  3 ++
 .../com/cloud/agent/api/CheckNetworkAnswer.java |  3 ++
 .../cloud/agent/api/CheckNetworkCommand.java    |  3 ++
 .../com/cloud/agent/api/CheckOnHostAnswer.java  |  3 ++
 .../com/cloud/agent/api/CheckOnHostCommand.java |  3 ++
 .../com/cloud/agent/api/CheckRouterAnswer.java  |  3 ++
 .../com/cloud/agent/api/CheckRouterCommand.java |  3 ++
 .../agent/api/CheckS2SVpnConnectionsAnswer.java |  3 ++
 .../api/CheckS2SVpnConnectionsCommand.java      |  3 ++
 .../com/cloud/agent/api/CheckStateAnswer.java   |  3 ++
 .../com/cloud/agent/api/CheckStateCommand.java  |  3 ++
 .../agent/api/CheckVirtualMachineAnswer.java    |  3 ++
 .../agent/api/CheckVirtualMachineCommand.java   |  3 ++
 .../cloud/agent/api/CleanupNetworkRulesCmd.java |  3 ++
 .../agent/api/ClusterVMMetaDataSyncAnswer.java  |  3 ++
 .../agent/api/ClusterVMMetaDataSyncCommand.java |  3 ++
 .../cloud/agent/api/ComputeChecksumCommand.java |  3 ++
 .../api/ConsoleAccessAuthenticationAnswer.java  |  3 ++
 .../api/ConsoleAccessAuthenticationCommand.java |  3 ++
 .../api/ConsoleProxyLoadReportCommand.java      |  3 ++
 ...reatePrivateTemplateFromSnapshotCommand.java |  3 ++
 .../CreatePrivateTemplateFromVolumeCommand.java |  3 ++
 .../agent/api/CreateStoragePoolCommand.java     |  3 ++
 .../cloud/agent/api/CreateVMSnapshotAnswer.java |  2 +
 .../agent/api/CreateVMSnapshotCommand.java      |  3 ++
 .../api/CreateVolumeFromSnapshotAnswer.java     |  3 ++
 .../api/CreateVolumeFromSnapshotCommand.java    |  3 ++
 .../api/CreateVolumeFromVMSnapshotAnswer.java   |  2 +
 .../api/CreateVolumeFromVMSnapshotCommand.java  |  3 ++
 core/src/com/cloud/agent/api/CronCommand.java   |  3 ++
 .../agent/api/DeleteSnapshotsDirCommand.java    |  3 ++
 .../agent/api/DeleteStoragePoolCommand.java     |  3 ++
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java |  3 ++
 .../agent/api/DeleteVMSnapshotCommand.java      |  5 ++-
 .../agent/api/DirectNetworkUsageAnswer.java     |  3 ++
 .../agent/api/DirectNetworkUsageCommand.java    |  3 ++
 .../api/ExternalNetworkResourceUsageAnswer.java |  3 ++
 .../ExternalNetworkResourceUsageCommand.java    |  3 ++
 core/src/com/cloud/agent/api/FenceAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/FenceCommand.java  |  3 ++
 .../cloud/agent/api/GetDomRVersionAnswer.java   |  3 ++
 .../com/cloud/agent/api/GetDomRVersionCmd.java  |  3 ++
 .../com/cloud/agent/api/GetFileStatsAnswer.java |  3 ++
 .../cloud/agent/api/GetFileStatsCommand.java    |  3 ++
 .../com/cloud/agent/api/GetGPUStatsAnswer.java  | 31 +++++++-------
 .../com/cloud/agent/api/GetGPUStatsCommand.java | 31 +++++++-------
 .../com/cloud/agent/api/GetHostStatsAnswer.java |  3 ++
 .../cloud/agent/api/GetHostStatsCommand.java    |  3 ++
 .../cloud/agent/api/GetRouterAlertsAnswer.java  |  2 +
 .../cloud/agent/api/GetStorageStatsAnswer.java  |  3 ++
 .../cloud/agent/api/GetStorageStatsCommand.java |  3 ++
 .../com/cloud/agent/api/GetVmConfigAnswer.java  |  3 ++
 .../com/cloud/agent/api/GetVmConfigCommand.java |  3 ++
 .../cloud/agent/api/GetVmDiskStatsAnswer.java   |  3 ++
 .../cloud/agent/api/GetVmDiskStatsCommand.java  |  3 ++
 .../com/cloud/agent/api/GetVmStatsAnswer.java   |  3 ++
 .../com/cloud/agent/api/GetVmStatsCommand.java  |  3 ++
 .../com/cloud/agent/api/GetVncPortAnswer.java   |  3 ++
 .../com/cloud/agent/api/GetVncPortCommand.java  |  3 ++
 .../src/com/cloud/agent/api/HostStatsEntry.java |  3 ++
 .../src/com/cloud/agent/api/MaintainAnswer.java |  3 ++
 .../com/cloud/agent/api/MaintainCommand.java    |  3 ++
 .../cloud/agent/api/ManageSnapshotAnswer.java   |  3 ++
 .../cloud/agent/api/ManageSnapshotCommand.java  |  3 ++
 core/src/com/cloud/agent/api/MigrateAnswer.java |  3 ++
 .../src/com/cloud/agent/api/MigrateCommand.java |  3 ++
 .../agent/api/MigrateWithStorageAnswer.java     |  3 ++
 .../agent/api/MigrateWithStorageCommand.java    |  3 ++
 .../api/MigrateWithStorageCompleteAnswer.java   |  3 ++
 .../api/MigrateWithStorageCompleteCommand.java  |  3 ++
 .../api/MigrateWithStorageReceiveAnswer.java    |  3 ++
 .../api/MigrateWithStorageReceiveCommand.java   |  3 ++
 .../agent/api/MigrateWithStorageSendAnswer.java |  3 ++
 .../api/MigrateWithStorageSendCommand.java      |  3 ++
 .../cloud/agent/api/ModifySshKeysCommand.java   |  3 ++
 .../agent/api/ModifyStoragePoolAnswer.java      |  3 ++
 .../agent/api/ModifyStoragePoolCommand.java     |  3 ++
 .../agent/api/ModifyVmNicConfigAnswer.java      |  3 ++
 .../agent/api/ModifyVmNicConfigCommand.java     |  3 ++
 .../agent/api/NetworkRulesSystemVmCommand.java  |  3 ++
 .../api/NetworkRulesVmSecondaryIpCommand.java   |  3 ++
 .../com/cloud/agent/api/NetworkUsageAnswer.java |  3 ++
 .../cloud/agent/api/NetworkUsageCommand.java    |  3 ++
 .../agent/api/PerformanceMonitorAnswer.java     |  3 ++
 .../agent/api/PerformanceMonitorCommand.java    |  3 ++
 core/src/com/cloud/agent/api/PingAnswer.java    |  3 ++
 core/src/com/cloud/agent/api/PingCommand.java   |  3 ++
 .../com/cloud/agent/api/PingRoutingCommand.java |  3 ++
 .../api/PingRoutingWithNwGroupsCommand.java     |  3 ++
 .../agent/api/PingRoutingWithOvsCommand.java    |  3 ++
 .../com/cloud/agent/api/PingStorageCommand.java |  3 ++
 .../com/cloud/agent/api/PingTestCommand.java    |  3 ++
 core/src/com/cloud/agent/api/PlugNicAnswer.java |  3 ++
 .../src/com/cloud/agent/api/PlugNicCommand.java |  3 ++
 .../agent/api/PrepareForMigrationAnswer.java    |  3 ++
 .../agent/api/PrepareForMigrationCommand.java   |  3 ++
 .../agent/api/PrepareOCFS2NodesCommand.java     |  3 ++
 .../api/PropagateResourceEventCommand.java      |  3 ++
 core/src/com/cloud/agent/api/ReadyAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/ReadyCommand.java  |  3 ++
 core/src/com/cloud/agent/api/RebootAnswer.java  |  3 ++
 core/src/com/cloud/agent/api/RebootCommand.java |  3 ++
 .../cloud/agent/api/RebootRouterCommand.java    |  3 ++
 .../agent/api/RecurringNetworkUsageAnswer.java  |  3 ++
 .../agent/api/RecurringNetworkUsageCommand.java |  3 ++
 .../agent/api/RevertToVMSnapshotAnswer.java     |  2 +
 .../agent/api/RevertToVMSnapshotCommand.java    |  3 ++
 core/src/com/cloud/agent/api/ScaleVmAnswer.java |  3 ++
 .../src/com/cloud/agent/api/ScaleVmCommand.java |  3 ++
 .../agent/api/ScheduleHostScanTaskCommand.java  |  3 ++
 .../agent/api/SecStorageFirewallCfgCommand.java |  3 ++
 .../cloud/agent/api/SecStorageSetupAnswer.java  |  3 ++
 .../cloud/agent/api/SecStorageSetupCommand.java |  3 ++
 .../agent/api/SecStorageVMSetupCommand.java     |  3 ++
 .../agent/api/SecurityGroupRuleAnswer.java      |  3 ++
 .../cloud/agent/api/SecurityGroupRulesCmd.java  |  3 ++
 core/src/com/cloud/agent/api/SetupAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/SetupCommand.java  |  3 ++
 .../agent/api/SetupGuestNetworkCommand.java     |  3 ++
 .../com/cloud/agent/api/ShutdownCommand.java    |  3 ++
 .../com/cloud/agent/api/SnapshotCommand.java    |  3 ++
 core/src/com/cloud/agent/api/StartAnswer.java   |  3 ++
 core/src/com/cloud/agent/api/StartCommand.java  |  3 ++
 core/src/com/cloud/agent/api/StartupAnswer.java |  3 ++
 .../src/com/cloud/agent/api/StartupCommand.java |  3 ++
 .../agent/api/StartupExternalDhcpCommand.java   |  3 ++
 .../api/StartupExternalFirewallCommand.java     |  3 ++
 .../api/StartupExternalLoadBalancerCommand.java |  3 ++
 .../cloud/agent/api/StartupProxyCommand.java    |  3 ++
 .../agent/api/StartupPxeServerCommand.java      |  3 ++
 .../cloud/agent/api/StartupRoutingCommand.java  |  3 ++
 .../api/StartupSecondaryStorageCommand.java     |  3 ++
 .../cloud/agent/api/StartupStorageCommand.java  |  3 ++
 .../agent/api/StartupTrafficMonitorCommand.java |  3 ++
 .../cloud/agent/api/StartupVMMAgentCommand.java |  3 ++
 core/src/com/cloud/agent/api/StopAnswer.java    |  3 ++
 core/src/com/cloud/agent/api/StopCommand.java   |  3 ++
 .../cloud/agent/api/TransferAgentCommand.java   |  3 ++
 .../com/cloud/agent/api/UnPlugNicAnswer.java    |  3 ++
 .../com/cloud/agent/api/UnPlugNicCommand.java   |  3 ++
 .../cloud/agent/api/UnregisterNicCommand.java   |  3 ++
 .../cloud/agent/api/UnregisterVMCommand.java    |  3 ++
 .../agent/api/UpdateHostPasswordCommand.java    |  3 ++
 .../cloud/agent/api/UpgradeSnapshotCommand.java |  3 ++
 .../cloud/agent/api/VMSnapshotBaseCommand.java  |  2 +
 core/src/com/cloud/agent/api/VMSnapshotTO.java  |  3 ++
 .../cloud/agent/api/ValidateSnapshotAnswer.java |  3 ++
 .../agent/api/ValidateSnapshotCommand.java      |  3 ++
 .../com/cloud/agent/api/VmDiskStatsEntry.java   |  3 ++
 core/src/com/cloud/agent/api/VmStatsEntry.java  |  3 ++
 .../api/baremetal/IpmISetBootDevCommand.java    |  3 ++
 .../api/baremetal/IpmiBootorResetCommand.java   |  3 ++
 .../baremetal/PrepareCreateTemplateCommand.java |  3 ++
 .../api/baremetal/PreparePxeServerAnswer.java   |  3 ++
 .../api/baremetal/PreparePxeServerCommand.java  |  3 ++
 .../cloud/agent/api/check/CheckSshAnswer.java   |  3 ++
 .../cloud/agent/api/check/CheckSshCommand.java  |  3 ++
 .../api/proxy/CheckConsoleProxyLoadCommand.java |  3 ++
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java |  3 ++
 .../com/cloud/agent/api/proxy/ProxyCommand.java |  3 ++
 ...tartConsoleProxyAgentHttpHandlerCommand.java |  3 ++
 .../api/proxy/WatchConsoleProxyLoadCommand.java |  3 ++
 .../api/routing/AggregationControlCommand.java  |  2 +
 .../agent/api/routing/CreateIpAliasCommand.java |  3 ++
 .../CreateLoadBalancerApplianceCommand.java     |  3 ++
 .../agent/api/routing/DeleteIpAliasCommand.java |  3 ++
 .../DestroyLoadBalancerApplianceCommand.java    |  3 ++
 .../agent/api/routing/DhcpEntryCommand.java     |  3 ++
 .../agent/api/routing/DnsMasqConfigCommand.java |  3 ++
 .../api/routing/GetRouterAlertsCommand.java     |  2 +
 .../routing/GlobalLoadBalancerConfigAnswer.java |  3 ++
 .../GlobalLoadBalancerConfigCommand.java        |  2 +
 .../cloud/agent/api/routing/GroupAnswer.java    |  2 +
 .../api/routing/HealthCheckLBConfigAnswer.java  |  3 ++
 .../api/routing/HealthCheckLBConfigCommand.java |  3 ++
 .../com/cloud/agent/api/routing/IpAliasTO.java  |  3 ++
 .../cloud/agent/api/routing/IpAssocAnswer.java  |  3 ++
 .../cloud/agent/api/routing/IpAssocCommand.java |  3 ++
 .../agent/api/routing/IpAssocVpcCommand.java    |  3 ++
 .../api/routing/LoadBalancerConfigCommand.java  |  3 ++
 .../api/routing/NetworkElementCommand.java      |  3 ++
 .../api/routing/RemoteAccessVpnCfgCommand.java  |  3 ++
 .../agent/api/routing/SavePasswordCommand.java  |  3 ++
 .../api/routing/SetFirewallRulesAnswer.java     |  3 ++
 .../api/routing/SetFirewallRulesCommand.java    |  3 ++
 .../api/routing/SetMonitorServiceCommand.java   |  3 ++
 .../agent/api/routing/SetNetworkACLAnswer.java  |  3 ++
 .../agent/api/routing/SetNetworkACLCommand.java |  2 +
 .../routing/SetPortForwardingRulesAnswer.java   |  3 ++
 .../routing/SetPortForwardingRulesCommand.java  |  3 ++
 .../SetPortForwardingRulesVpcCommand.java       |  3 ++
 .../agent/api/routing/SetSourceNatAnswer.java   |  3 ++
 .../agent/api/routing/SetSourceNatCommand.java  |  3 ++
 .../api/routing/SetStaticNatRulesAnswer.java    |  3 ++
 .../api/routing/SetStaticNatRulesCommand.java   |  3 ++
 .../agent/api/routing/SetStaticRouteAnswer.java |  3 ++
 .../api/routing/SetStaticRouteCommand.java      |  2 +
 .../api/routing/Site2SiteVpnCfgCommand.java     |  3 ++
 .../api/routing/SiteLoadBalancerConfig.java     |  2 +
 .../agent/api/routing/UserDataCommand.java      |  3 ++
 .../cloud/agent/api/routing/VmDataCommand.java  |  3 ++
 .../agent/api/routing/VpnUsersCfgCommand.java   |  3 ++
 .../api/storage/AbstractDownloadCommand.java    |  3 ++
 .../api/storage/AbstractUploadCommand.java      |  3 ++
 .../agent/api/storage/CopyVolumeAnswer.java     |  3 ++
 .../agent/api/storage/CopyVolumeCommand.java    |  3 ++
 .../cloud/agent/api/storage/CreateAnswer.java   |  3 ++
 .../cloud/agent/api/storage/CreateCommand.java  |  3 ++
 .../storage/CreateEntityDownloadURLAnswer.java  |  3 ++
 .../storage/CreateEntityDownloadURLCommand.java |  3 ++
 .../storage/CreatePrivateTemplateAnswer.java    |  3 ++
 .../storage/CreatePrivateTemplateCommand.java   |  3 ++
 .../storage/DeleteEntityDownloadURLCommand.java |  3 ++
 .../cloud/agent/api/storage/DestroyAnswer.java  |  3 ++
 .../cloud/agent/api/storage/DestroyCommand.java |  3 ++
 .../cloud/agent/api/storage/DownloadAnswer.java |  3 ++
 .../agent/api/storage/ListTemplateAnswer.java   |  3 ++
 .../agent/api/storage/ListTemplateCommand.java  |  3 ++
 .../agent/api/storage/ListVolumeAnswer.java     |  3 ++
 .../agent/api/storage/ListVolumeCommand.java    |  3 ++
 .../storage/ManageVolumeAvailabilityAnswer.java |  3 ++
 .../ManageVolumeAvailabilityCommand.java        |  3 ++
 .../agent/api/storage/MigrateVolumeAnswer.java  |  3 ++
 .../agent/api/storage/MigrateVolumeCommand.java |  3 ++
 .../storage/PrimaryStorageDownloadAnswer.java   |  3 ++
 .../storage/PrimaryStorageDownloadCommand.java  |  3 ++
 .../agent/api/storage/ResizeVolumeAnswer.java   |  3 ++
 .../agent/api/storage/ResizeVolumeCommand.java  |  3 ++
 .../com/cloud/agent/api/storage/SsCommand.java  |  3 ++
 .../cloud/agent/api/storage/StorageCommand.java |  3 ++
 .../agent/api/storage/UpgradeDiskAnswer.java    |  3 ++
 .../agent/api/storage/UpgradeDiskCommand.java   |  3 ++
 .../cloud/agent/api/storage/UploadAnswer.java   |  3 ++
 .../cloud/agent/api/storage/UploadCommand.java  |  3 ++
 .../api/storage/UploadProgressCommand.java      |  3 ++
 .../resource/virtualnetwork/ConfigHelper.java   |  3 ++
 .../resource/virtualnetwork/ConfigItem.java     |  3 ++
 .../resource/virtualnetwork/FileConfigItem.java |  3 ++
 .../virtualnetwork/ScriptConfigItem.java        |  3 ++
 .../resource/virtualnetwork/VRScripts.java      |  3 ++
 .../virtualnetwork/VirtualRouterDeployer.java   |  3 ++
 .../virtualnetwork/VirtualRoutingResource.java  |  3 ++
 .../cloud/agent/transport/ArrayTypeAdaptor.java |  3 ++
 .../agent/transport/InterfaceTypeAdaptor.java   |  3 ++
 .../transport/LoggingExclusionStrategy.java     |  3 ++
 core/src/com/cloud/agent/transport/Request.java |  3 ++
 .../src/com/cloud/agent/transport/Response.java |  3 ++
 .../exception/UnsupportedVersionException.java  |  3 ++
 .../cloud/exception/UsageServerException.java   |  3 ++
 core/src/com/cloud/host/HostInfo.java           |  3 ++
 .../resource/HypervDummyResourceBase.java       |  3 ++
 .../cloud/info/ConsoleProxyConnectionInfo.java  |  3 ++
 core/src/com/cloud/info/ConsoleProxyInfo.java   |  3 ++
 core/src/com/cloud/info/ConsoleProxyStatus.java |  3 ++
 .../cloud/info/RunningHostInfoAgregator.java    |  3 ++
 .../com/cloud/info/SecStorageVmLoadInfo.java    |  3 ++
 .../com/cloud/network/HAProxyConfigurator.java  |  3 ++
 .../cloud/network/LoadBalancerConfigurator.java |  3 ++
 .../cloud/network/LoadBalancerValidator.java    |  3 ++
 .../CreateLoadBalancerApplianceAnswer.java      |  3 ++
 .../DestroyLoadBalancerApplianceAnswer.java     |  3 ++
 .../resource/TrafficSentinelResource.java       |  3 ++
 .../com/cloud/resource/ResourceListener.java    |  3 ++
 core/src/com/cloud/resource/ServerResource.java |  3 ++
 .../com/cloud/resource/ServerResourceBase.java  |  3 ++
 .../resource/hypervisor/HypervisorResource.java |  3 ++
 core/src/com/cloud/serializer/GsonHelper.java   |  3 ++
 .../com/cloud/serializer/SerializerHelper.java  |  3 ++
 .../src/com/cloud/storage/JavaStorageLayer.java |  3 ++
 core/src/com/cloud/storage/StorageLayer.java    |  3 ++
 .../storage/resource/StoragePoolResource.java   |  3 ++
 .../storage/resource/StorageProcessor.java      | 37 +++++++++--------
 .../StorageSubsystemCommandHandler.java         | 37 +++++++++--------
 .../storage/template/FtpTemplateUploader.java   |  3 ++
 .../template/HttpTemplateDownloader.java        |  3 ++
 .../cloud/storage/template/IsoProcessor.java    |  3 ++
 .../template/LocalTemplateDownloader.java       |  3 ++
 .../cloud/storage/template/OVAProcessor.java    |  3 ++
 .../com/cloud/storage/template/Processor.java   |  3 ++
 .../cloud/storage/template/QCOW2Processor.java  |  3 ++
 .../storage/template/RawImageProcessor.java     |  3 ++
 .../storage/template/S3TemplateDownloader.java  |  3 ++
 .../storage/template/ScpTemplateDownloader.java |  3 ++
 .../storage/template/TemplateConstants.java     |  3 ++
 .../storage/template/TemplateDownloader.java    |  3 ++
 .../template/TemplateDownloaderBase.java        |  3 ++
 .../storage/template/TemplateLocation.java      |  3 ++
 .../storage/template/TemplateUploader.java      |  3 ++
 .../cloud/storage/template/VhdProcessor.java    |  3 ++
 .../cloud/storage/template/VmdkProcessor.java   |  3 ++
 .../storage/command/AttachAnswer.java           | 39 +++++++++---------
 .../storage/command/AttachCommand.java          | 37 +++++++++--------
 .../command/AttachPrimaryDataStoreAnswer.java   | 43 ++++++++++----------
 .../command/AttachPrimaryDataStoreCmd.java      | 41 ++++++++++---------
 .../storage/command/CopyCmdAnswer.java          |  3 ++
 .../cloudstack/storage/command/CopyCommand.java |  3 ++
 .../storage/command/CreateObjectAnswer.java     | 39 +++++++++---------
 .../storage/command/CreateObjectCommand.java    | 41 ++++++++++---------
 .../command/CreatePrimaryDataStoreCmd.java      |  3 ++
 .../storage/command/DeleteCommand.java          | 39 +++++++++---------
 .../storage/command/DettachAnswer.java          | 39 +++++++++---------
 .../storage/command/DettachCommand.java         | 37 +++++++++--------
 .../storage/command/DownloadCommand.java        |  3 ++
 .../command/DownloadProgressCommand.java        |  3 ++
 .../storage/command/ForgetObjectCmd.java        | 41 ++++++++++---------
 .../storage/command/IntroduceObjectAnswer.java  | 39 +++++++++---------
 .../storage/command/IntroduceObjectCmd.java     | 39 +++++++++---------
 .../command/StorageSubSystemCommand.java        | 37 +++++++++--------
 .../cloudstack/storage/to/ImageStoreTO.java     |  3 ++
 .../storage/to/PrimaryDataStoreTO.java          |  3 ++
 .../cloudstack/storage/to/SnapshotObjectTO.java |  3 ++
 .../cloudstack/storage/to/TemplateObjectTO.java |  3 ++
 .../cloudstack/storage/to/VolumeObjectTO.java   |  3 ++
 .../VirtualRoutingResourceTest.java             |  3 ++
 .../com/cloud/agent/transport/RequestTest.java  |  3 ++
 .../cloud/network/HAProxyConfiguratorTest.java  |  3 ++
 .../api/agent/test/AgentControlAnswerTest.java  |  3 ++
 .../api/agent/test/AgentControlCommandTest.java |  3 ++
 .../cloudstack/api/agent/test/AnswerTest.java   |  3 ++
 .../api/agent/test/AttachIsoCommandTest.java    |  3 ++
 .../api/agent/test/AttachVolumeAnswerTest.java  |  3 ++
 .../api/agent/test/AttachVolumeCommandTest.java |  3 ++
 .../agent/test/BackupSnapshotAnswerTest.java    |  3 ++
 .../agent/test/BackupSnapshotCommandTest.java   |  3 ++
 .../agent/test/BumpUpPriorityCommandTest.java   |  3 ++
 .../api/agent/test/CancelCommandTest.java       |  3 ++
 .../api/agent/test/ChangeAgentAnswerTest.java   |  3 ++
 .../api/agent/test/ChangeAgentCommandTest.java  |  3 ++
 .../api/agent/test/CheckHealthAnswerTest.java   |  3 ++
 .../api/agent/test/CheckHealthCommandTest.java  |  3 ++
 .../api/agent/test/CheckNetworkAnswerTest.java  |  3 ++
 .../api/agent/test/CheckNetworkCommandTest.java |  3 ++
 .../api/agent/test/CheckOnHostCommandTest.java  |  3 ++
 .../api/agent/test/SnapshotCommandTest.java     |  3 ++
 375 files changed, 1602 insertions(+), 534 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/allocator/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/allocator/module.properties b/core/resources/META-INF/cloudstack/allocator/module.properties
index 7866be0..b99b9af 100644
--- a/core/resources/META-INF/cloudstack/allocator/module.properties
+++ b/core/resources/META-INF/cloudstack/allocator/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=allocator
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml b/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
index 65ebc70..700b906 100644
--- a/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
+++ b/core/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml b/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
index ad00de8..e6ed961 100644
--- a/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/api/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/api/module.properties b/core/resources/META-INF/cloudstack/api/module.properties
index cc66a09..727b075 100644
--- a/core/resources/META-INF/cloudstack/api/module.properties
+++ b/core/resources/META-INF/cloudstack/api/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=api
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
index f406841..d4dcc80 100644
--- a/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/backend/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/backend/module.properties b/core/resources/META-INF/cloudstack/backend/module.properties
index ab18ad1..c4e29af 100644
--- a/core/resources/META-INF/cloudstack/backend/module.properties
+++ b/core/resources/META-INF/cloudstack/backend/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=backend
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/bootstrap/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/bootstrap/module.properties b/core/resources/META-INF/cloudstack/bootstrap/module.properties
index 716bd00..15532c4 100644
--- a/core/resources/META-INF/cloudstack/bootstrap/module.properties
+++ b/core/resources/META-INF/cloudstack/bootstrap/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,4 +15,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=bootstrap

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
index adee3ed..84c301c 100644
--- a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
index 5ddb66f..7a586a2 100644
--- a/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
+++ b/core/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/compute/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/compute/module.properties b/core/resources/META-INF/cloudstack/compute/module.properties
index 0a12aae..3549c98 100644
--- a/core/resources/META-INF/cloudstack/compute/module.properties
+++ b/core/resources/META-INF/cloudstack/compute/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=compute
 parent=backend

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml b/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
index b57f52f..f757e7e 100644
--- a/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/compute/spring-core-lifecycle-compute-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/module.properties b/core/resources/META-INF/cloudstack/core/module.properties
index fd5ecb7..6ccd650 100644
--- a/core/resources/META-INF/cloudstack/core/module.properties
+++ b/core/resources/META-INF/cloudstack/core/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=core
 parent=system

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/spring-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-context.xml
index 6cd00a4..242f72c 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-context.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml b/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
index 06b9f5e..515249d 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 819fb83..908d8f0 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/discoverer/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/discoverer/module.properties b/core/resources/META-INF/cloudstack/discoverer/module.properties
index e511fb5..6af75af 100644
--- a/core/resources/META-INF/cloudstack/discoverer/module.properties
+++ b/core/resources/META-INF/cloudstack/discoverer/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=discoverer
 parent=core

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml b/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
index 2c83a10..640d17e 100644
--- a/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/discoverer/spring-core-lifecycle-discoverer-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/network/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/network/module.properties b/core/resources/META-INF/cloudstack/network/module.properties
index 1a15fb0..5d2cc44 100644
--- a/core/resources/META-INF/cloudstack/network/module.properties
+++ b/core/resources/META-INF/cloudstack/network/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=network
 parent=backend

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
index a54d588..e5086d2 100644
--- a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/planner/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/planner/module.properties b/core/resources/META-INF/cloudstack/planner/module.properties
index 96359fb..26c61d9 100644
--- a/core/resources/META-INF/cloudstack/planner/module.properties
+++ b/core/resources/META-INF/cloudstack/planner/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=planner
 parent=allocator
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml b/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
index 80779e4..2548308 100644
--- a/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/planner/spring-core-lifecycle-planner-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/storage/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/storage/module.properties b/core/resources/META-INF/cloudstack/storage/module.properties
index 564e85e..f35ed85 100644
--- a/core/resources/META-INF/cloudstack/storage/module.properties
+++ b/core/resources/META-INF/cloudstack/storage/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=storage
 parent=backend

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml b/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
index ad78cad..7b86e93 100644
--- a/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/storage/spring-lifecycle-storage-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/system/module.properties
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/system/module.properties b/core/resources/META-INF/cloudstack/system/module.properties
index 0b07ebe..cc2dabc 100644
--- a/core/resources/META-INF/cloudstack/system/module.properties
+++ b/core/resources/META-INF/cloudstack/system/module.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=system
 parent=bootstrap

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml b/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
index 80c5da7..2d454ac 100644
--- a/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
----------------------------------------------------------------------
diff --git a/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml b/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
index c2d540c..a1950f6 100644
--- a/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
+++ b/core/resources/META-INF/cloudstack/system/spring-core-system-context.xml
@@ -1,20 +1,22 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/IAgentControl.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/IAgentControl.java b/core/src/com/cloud/agent/IAgentControl.java
index 36ea598..0a826ae 100644
--- a/core/src/com/cloud/agent/IAgentControl.java
+++ b/core/src/com/cloud/agent/IAgentControl.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent;
 
 import com.cloud.agent.api.AgentControlAnswer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/IAgentControlListener.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/IAgentControlListener.java b/core/src/com/cloud/agent/IAgentControlListener.java
index 1983e28..a98f004 100644
--- a/core/src/com/cloud/agent/IAgentControlListener.java
+++ b/core/src/com/cloud/agent/IAgentControlListener.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent;
 
 import com.cloud.agent.api.AgentControlAnswer;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/StartupCommandProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/StartupCommandProcessor.java b/core/src/com/cloud/agent/StartupCommandProcessor.java
index 8efe143..774f65a 100644
--- a/core/src/com/cloud/agent/StartupCommandProcessor.java
+++ b/core/src/com/cloud/agent/StartupCommandProcessor.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent;
 
 import com.cloud.agent.api.StartupCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AgentControlAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AgentControlAnswer.java b/core/src/com/cloud/agent/api/AgentControlAnswer.java
index 58377e6..119623d 100644
--- a/core/src/com/cloud/agent/api/AgentControlAnswer.java
+++ b/core/src/com/cloud/agent/api/AgentControlAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AgentControlAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AgentControlCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/com/cloud/agent/api/AgentControlCommand.java
index 5d3de86..8baf2f9 100644
--- a/core/src/com/cloud/agent/api/AgentControlCommand.java
+++ b/core/src/com/cloud/agent/api/AgentControlCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AgentControlCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AttachIsoCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/com/cloud/agent/api/AttachIsoCommand.java
index 2b7dd13..0767687 100644
--- a/core/src/com/cloud/agent/api/AttachIsoCommand.java
+++ b/core/src/com/cloud/agent/api/AttachIsoCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AttachIsoCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachVolumeAnswer.java b/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
index 0471003..3e869ab 100644
--- a/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
+++ b/core/src/com/cloud/agent/api/AttachVolumeAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class AttachVolumeAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/AttachVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
index a0ee419..af44d72 100644
--- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.storage.Storage.StoragePoolType;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
index a8557e0..59a2ed3 100644
--- a/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
+++ b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class BackupSnapshotAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
index 6e1e3be..2a46610 100644
--- a/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
+++ b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.LogLevel.Log4jLevel;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
index 5d3f10f..dfde6e1 100644
--- a/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
+++ b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CancelCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CancelCommand.java b/core/src/com/cloud/agent/api/CancelCommand.java
index 8ac2998..5adace2 100644
--- a/core/src/com/cloud/agent/api/CancelCommand.java
+++ b/core/src/com/cloud/agent/api/CancelCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CancelCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
index a1a8737..1d43325 100644
--- a/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
+++ b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class ChangeAgentAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/ChangeAgentCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ChangeAgentCommand.java b/core/src/com/cloud/agent/api/ChangeAgentCommand.java
index 6c11de8..61cc943 100644
--- a/core/src/com/cloud/agent/api/ChangeAgentCommand.java
+++ b/core/src/com/cloud/agent/api/ChangeAgentCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.host.Status.Event;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckHealthAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckHealthAnswer.java b/core/src/com/cloud/agent/api/CheckHealthAnswer.java
index 9db912c..80414d2 100644
--- a/core/src/com/cloud/agent/api/CheckHealthAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckHealthAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckHealthAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckHealthCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckHealthCommand.java b/core/src/com/cloud/agent/api/CheckHealthCommand.java
index b8df7c6..1292811 100644
--- a/core/src/com/cloud/agent/api/CheckHealthCommand.java
+++ b/core/src/com/cloud/agent/api/CheckHealthCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckHealthCommand extends Command {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
index 2075849..392ad35 100644
--- a/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckNetworkAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckNetworkCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckNetworkCommand.java b/core/src/com/cloud/agent/api/CheckNetworkCommand.java
index 8e1be56..717af2a 100644
--- a/core/src/com/cloud/agent/api/CheckNetworkCommand.java
+++ b/core/src/com/cloud/agent/api/CheckNetworkCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
index e5325e3..5a26b22 100644
--- a/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 public class CheckOnHostAnswer extends Answer {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckOnHostCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java b/core/src/com/cloud/agent/api/CheckOnHostCommand.java
index be05bd4..b405517 100644
--- a/core/src/com/cloud/agent/api/CheckOnHostCommand.java
+++ b/core/src/com/cloud/agent/api/CheckOnHostCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.to.HostTO;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckRouterAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckRouterAnswer.java b/core/src/com/cloud/agent/api/CheckRouterAnswer.java
index 7df0cfb..b084d4b 100644
--- a/core/src/com/cloud/agent/api/CheckRouterAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckRouterAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.network.router.VirtualRouter.RedundantState;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckRouterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckRouterCommand.java b/core/src/com/cloud/agent/api/CheckRouterCommand.java
index c89cdf7..51a4493 100644
--- a/core/src/com/cloud/agent/api/CheckRouterCommand.java
+++ b/core/src/com/cloud/agent/api/CheckRouterCommand.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import com.cloud.agent.api.routing.NetworkElementCommand;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49bb7e8/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index 0e9db96..3ee5eac 100644
--- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -14,6 +15,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
+
 package com.cloud.agent.api;
 
 import java.util.HashMap;