cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [1/25] git commit: committing Chip Childers patches fixing licensing headers Applying to the following directories: * api * deamonize * agnet * agent-simulator * cloud-cli
Date Tue, 12 Jun 2012 16:34:05 GMT
Updated Branches:
  refs/heads/master 9dfc3b0a1 -> c15948a3e


committing Chip Childers patches fixing licensing headers
Applying to the following directories:
* api
* deamonize
* agnet
* agent-simulator
* cloud-cli


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

Branch: refs/heads/master
Commit: c15948a3ef888c4440d5b43c33bdcfb5ab2b0328
Parents: 8e6999d
Author: David Nalley <david@gnsa.us>
Authored: Tue Jun 12 12:32:58 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Tue Jun 12 12:32:58 2012 -0400

----------------------------------------------------------------------
 agent-simulator/scripts/__old__/deletePod.sh       |   28 ++++++++------
 .../scripts/__old__/deleteServiceOffering.sh       |   28 ++++++++------
 agent-simulator/scripts/__old__/deleteVlan.sh      |   28 ++++++++------
 .../scripts/__old__/deployVirtualMachine.sh        |   28 ++++++++------
 agent-simulator/scripts/__old__/listRouters.sh     |   28 ++++++++------
 .../scripts/__old__/listVirtualMachine.sh          |   28 ++++++++------
 .../scripts/__old__/queryAsyncJobResult.sh         |   29 ++++++++------
 agent-simulator/scripts/__old__/run.sh             |   27 +++++++------
 agent-simulator/scripts/__old__/setupDirectPods.sh |   28 ++++++++------
 agent-simulator/scripts/__old__/setupHosts.sh      |   28 ++++++++------
 .../scripts/__old__/setupPodAndNetwork.sh          |   28 ++++++++------
 .../scripts/__old__/setupServiceOffering.sh        |   28 ++++++++------
 agent-simulator/scripts/__old__/setupVlan.sh       |   28 ++++++++------
 .../scripts/__old__/simulator_advanced.sh          |   29 ++++++++------
 agent-simulator/scripts/__old__/simulator_basic.sh |   29 ++++++++------
 agent-simulator/scripts/__old__/startRouter.sh     |   28 ++++++++------
 agent-simulator/scripts/__old__/testQuery.sh       |   28 ++++++++------
 agent-simulator/scripts/addHostStats.py            |   27 +++++++------
 .../scripts/guava/__old__/1000routers.sh           |   28 ++++++++------
 .../scripts/guava/__old__/createAdminAccount.sh    |   28 ++++++++------
 .../scripts/guava/__old__/createStoragePool.sh     |   28 ++++++++------
 .../scripts/guava/__old__/createUserAccount.sh     |   28 ++++++++------
 .../scripts/guava/__old__/deleteAccount.sh         |   28 ++++++++------
 agent-simulator/scripts/guava/__old__/deletePod.sh |   28 ++++++++------
 .../scripts/guava/__old__/deleteServiceOffering.sh |   28 ++++++++------
 .../scripts/guava/__old__/deleteVlan.sh            |   28 ++++++++------
 .../scripts/guava/__old__/deployVirtualMachine.sh  |   28 ++++++++------
 .../scripts/guava/__old__/destroyVirtualMachine.sh |   28 ++++++++------
 .../scripts/guava/__old__/listCapacity.sh          |   28 ++++++++------
 .../scripts/guava/__old__/listEvents.sh            |   28 ++++++++------
 agent-simulator/scripts/guava/__old__/listHosts.sh |   28 ++++++++------
 .../scripts/guava/__old__/listRouters.sh           |   28 ++++++++------
 .../scripts/guava/__old__/listTemplates.sh         |   28 ++++++++------
 .../scripts/guava/__old__/listVirtualMachine.sh    |   28 ++++++++------
 agent-simulator/scripts/guava/__old__/load.sh      |   28 ++++++++------
 .../scripts/guava/__old__/networkShutDown.sh       |   28 ++++++++------
 .../scripts/guava/__old__/networkStart.sh          |   28 ++++++++------
 .../scripts/guava/__old__/reconnectStats.sh        |   29 ++++++++------
 agent-simulator/scripts/guava/__old__/setup.sh     |   29 ++++++++------
 .../scripts/guava/__old__/setupDirectPods.sh       |   28 ++++++++------
 .../scripts/guava/__old__/setupHosts.sh            |   28 ++++++++------
 .../scripts/guava/__old__/setupPodAndNetwork.sh    |   28 ++++++++------
 .../scripts/guava/__old__/setupServiceOffering.sh  |   28 ++++++++------
 agent-simulator/scripts/guava/__old__/setupVlan.sh |   28 ++++++++------
 .../scripts/guava/__old__/startRouter.sh           |   28 ++++++++------
 .../scripts/guava/__old__/startVirtualMachine.sh   |   28 ++++++++------
 .../scripts/guava/__old__/stopVirtualMachine.sh    |   28 ++++++++------
 agent-simulator/scripts/guava/__old__/stress.sh    |   28 ++++++++------
 agent-simulator/scripts/guava/__old__/stress2.sh   |   29 ++++++++------
 agent-simulator/scripts/guava/setup.py             |   27 +++++++------
 .../scripts/guava/tests/testProvision.py           |   27 +++++++------
 agent-simulator/scripts/kumquat/setup.py           |   27 +++++++------
 .../scripts/kumquat/tests/testProvision.py         |   27 +++++++------
 .../scripts/zucchini/__old__/deletePod.sh          |   28 ++++++++------
 .../zucchini/__old__/deleteServiceOffering.sh      |   28 ++++++++------
 .../scripts/zucchini/__old__/deleteVlan.sh         |   28 ++++++++------
 .../scripts/zucchini/__old__/deployBulk-sg.sh      |   29 ++++++++------
 .../scripts/zucchini/__old__/deployBulk.sh         |   29 ++++++++------
 .../zucchini/__old__/deployVirtualMachine.sh       |   28 ++++++++------
 .../scripts/zucchini/__old__/destroySystemVm.sh    |   29 ++++++++------
 .../zucchini/__old__/destroyVirtualMachine.sh      |   28 ++++++++------
 .../scripts/zucchini/__old__/listCapacity.sh       |   28 ++++++++------
 .../scripts/zucchini/__old__/listEvents.sh         |   28 ++++++++------
 .../scripts/zucchini/__old__/listHosts.sh          |   28 ++++++++------
 .../scripts/zucchini/__old__/listRouters.sh        |   28 ++++++++------
 .../scripts/zucchini/__old__/listTemplates.sh      |   28 ++++++++------
 .../scripts/zucchini/__old__/listVirtualMachine.sh |   28 ++++++++------
 .../scripts/zucchini/__old__/monitor.sh            |   29 ++++++++------
 .../scripts/zucchini/__old__/newsetup.sh           |   29 ++++++++------
 .../scripts/zucchini/__old__/reconnectStats.sh     |   29 ++++++++------
 agent-simulator/scripts/zucchini/__old__/setup.sh  |   29 ++++++++------
 .../scripts/zucchini/__old__/setupDirectPods.sh    |   28 ++++++++------
 .../scripts/zucchini/__old__/setupHosts.sh         |   28 ++++++++------
 .../scripts/zucchini/__old__/setupPodAndNetwork.sh |   28 ++++++++------
 .../zucchini/__old__/setupServiceOffering.sh       |   28 ++++++++------
 .../scripts/zucchini/__old__/setupVlan.sh          |   28 ++++++++------
 .../scripts/zucchini/__old__/setup_sg.sh           |   29 ++++++++------
 agent-simulator/scripts/zucchini/__old__/small.sh  |   29 ++++++++------
 .../scripts/zucchini/__old__/so_setup.sh           |   29 ++++++++------
 .../scripts/zucchini/__old__/startRouter.sh        |   28 ++++++++------
 .../zucchini/__old__/startVirtualMachine.sh        |   28 ++++++++------
 .../scripts/zucchini/__old__/stopRouter.sh         |   29 ++++++++------
 .../scripts/zucchini/__old__/stopVirtualMachine.sh |   29 ++++++++------
 .../scripts/zucchini/__old__/zucchini219.sh        |   29 ++++++++------
 agent-simulator/scripts/zucchini/setup.py          |   27 +++++++------
 .../scripts/zucchini/tests/testListVm.py           |   27 +++++++------
 .../scripts/zucchini/tests/testProvision.py        |   27 +++++++------
 .../src/com/cloud/agent/MetricsCollector.java      |   28 ++++++++------
 .../src/com/cloud/agent/MockVmMetrics.java         |   28 ++++++++------
 .../src/com/cloud/agent/MultiCaster.java           |   28 ++++++++------
 .../src/com/cloud/agent/MultiCasterListener.java   |   28 ++++++++------
 .../src/com/cloud/agent/SimulatorCmd.java          |   28 ++++++++------
 .../src/com/cloud/agent/SimulatorMigrateVmCmd.java |   28 ++++++++------
 .../com/cloud/agent/manager/MockAgentManager.java  |   28 ++++++++------
 .../cloud/agent/manager/MockAgentManagerImpl.java  |   28 ++++++++------
 .../cloud/agent/manager/MockStorageManager.java    |   28 ++++++++------
 .../agent/manager/MockStorageManagerImpl.java      |   28 ++++++++------
 .../src/com/cloud/agent/manager/MockVmManager.java |   28 ++++++++------
 .../com/cloud/agent/manager/MockVmManagerImpl.java |   28 ++++++++------
 .../src/com/cloud/agent/manager/SimulatorInfo.java |   28 ++++++++------
 .../com/cloud/agent/manager/SimulatorManager.java  |   28 ++++++++------
 .../cloud/agent/manager/SimulatorManagerImpl.java  |   28 ++++++++------
 .../com/cloud/api/commands/ConfigureSimulator.java |   28 ++++++++------
 .../configuration/SimulatorComponentLibrary.java   |   28 ++++++++------
 .../src/com/cloud/resource/AgentResourceBase.java  |   28 ++++++++------
 .../com/cloud/resource/AgentRoutingResource.java   |   28 ++++++++------
 .../com/cloud/resource/AgentStorageResource.java   |   28 ++++++++------
 .../com/cloud/resource/SimulatorDiscoverer.java    |   28 ++++++++------
 .../resource/SimulatorSecondaryDiscoverer.java     |   28 ++++++++------
 .../server/ManagementServerSimulatorImpl.java      |   28 ++++++++------
 .../com/cloud/simulator/MockConfigurationVO.java   |   28 ++++++++------
 .../src/com/cloud/simulator/MockHost.java          |   28 ++++++++------
 .../src/com/cloud/simulator/MockHostVO.java        |   28 ++++++++------
 .../src/com/cloud/simulator/MockSecStorageVO.java  |   28 ++++++++------
 .../com/cloud/simulator/MockSecurityRulesVO.java   |   28 ++++++++------
 .../src/com/cloud/simulator/MockStoragePoolVO.java |   28 ++++++++------
 .../src/com/cloud/simulator/MockVMVO.java          |   28 ++++++++------
 .../src/com/cloud/simulator/MockVm.java            |   28 ++++++++------
 .../src/com/cloud/simulator/MockVolumeVO.java      |   28 ++++++++------
 .../src/com/cloud/simulator/SimulatorGuru.java     |   28 ++++++++------
 .../cloud/simulator/dao/MockConfigurationDao.java  |   28 ++++++++------
 .../simulator/dao/MockConfigurationDaoImpl.java    |   28 ++++++++------
 .../src/com/cloud/simulator/dao/MockHostDao.java   |   28 ++++++++------
 .../com/cloud/simulator/dao/MockHostDaoImpl.java   |   28 ++++++++------
 .../com/cloud/simulator/dao/MockSecStorageDao.java |   28 ++++++++------
 .../cloud/simulator/dao/MockSecStorageDaoImpl.java |   28 ++++++++------
 .../cloud/simulator/dao/MockSecurityRulesDao.java  |   28 ++++++++------
 .../simulator/dao/MockSecurityRulesDaoImpl.java    |   28 ++++++++------
 .../cloud/simulator/dao/MockStoragePoolDao.java    |   28 ++++++++------
 .../simulator/dao/MockStoragePoolDaoImpl.java      |   28 ++++++++------
 .../src/com/cloud/simulator/dao/MockVMDao.java     |   28 ++++++++------
 .../src/com/cloud/simulator/dao/MockVMDaoImpl.java |   28 ++++++++------
 .../src/com/cloud/simulator/dao/MockVolumeDao.java |   28 ++++++++------
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |   28 ++++++++------
 agent/bindir/cloud-setup-agent.in                  |   17 ++++++++
 agent/bindir/mycloud-setup-agent                   |   16 ++++++++
 agent/conf/agent.properties                        |   19 +++++++++-
 agent/conf/developer.properties.template           |   17 ++++++++
 agent/conf/environment.properties.in               |   17 ++++++++
 .../centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in   |   17 ++++++++
 .../fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in   |   17 ++++++++
 .../opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in |   16 ++++++++
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in     |   17 ++++++++
 agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in |   16 ++++++++
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in |   16 ++++++++
 .../ubuntu/SYSCONFDIR/init/cloud-cleanup.conf      |   17 ++++++++
 agent/libexec/agent-runner.in                      |   17 ++++++++
 agent/scripts/_run.sh                              |   29 ++++++++------
 agent/scripts/agent.sh                             |   29 +++++++-------
 agent/scripts/run.sh                               |   30 +++++++-------
 agent/src/com/cloud/agent/Agent.java               |   28 ++++++++------
 agent/src/com/cloud/agent/AgentShell.java          |   28 ++++++++------
 agent/src/com/cloud/agent/IAgentShell.java         |   28 ++++++++------
 .../configuration/AgentComponentLibraryBase.java   |   28 ++++++++------
 .../src/com/cloud/agent/dao/StorageComponent.java  |   28 ++++++++------
 .../cloud/agent/dao/impl/PropertiesStorage.java    |   28 ++++++++------
 .../src/com/cloud/agent/dhcp/DhcpPacketParser.java |   28 ++++++++------
 .../cloud/agent/dhcp/DhcpProtocolParserServer.java |   28 ++++++++------
 agent/src/com/cloud/agent/dhcp/DhcpSnooper.java    |   28 ++++++++------
 .../src/com/cloud/agent/dhcp/DhcpSnooperImpl.java  |   28 ++++++++------
 .../src/com/cloud/agent/dhcp/FakeDhcpSnooper.java  |   28 ++++++++------
 agent/src/com/cloud/agent/mockvm/MockVm.java       |   28 ++++++++------
 agent/src/com/cloud/agent/mockvm/MockVmMgr.java    |   28 ++++++++------
 agent/src/com/cloud/agent/mockvm/VmMgr.java        |   28 ++++++++------
 .../com/cloud/agent/resource/DummyResource.java    |   28 ++++++++------
 .../computing/CloudZonesComputingResource.java     |   28 ++++++++------
 .../resource/computing/FakeComputingResource.java  |   28 ++++++++------
 .../agent/resource/computing/KVMGuestOsMapper.java |   28 ++++++++------
 .../cloud/agent/resource/computing/KVMHABase.java  |   28 ++++++++------
 .../agent/resource/computing/KVMHAChecker.java     |   28 ++++++++------
 .../agent/resource/computing/KVMHAMonitor.java     |   28 ++++++++------
 .../resource/computing/LibvirtCapXMLParser.java    |   28 ++++++++------
 .../computing/LibvirtComputingResource.java        |   28 ++++++++------
 .../resource/computing/LibvirtConnection.java      |   28 ++++++++------
 .../resource/computing/LibvirtDomainXMLParser.java |   28 ++++++++------
 .../resource/computing/LibvirtNetworkDef.java      |   28 ++++++++------
 .../resource/computing/LibvirtStoragePoolDef.java  |   28 ++++++++------
 .../computing/LibvirtStoragePoolXMLParser.java     |   28 ++++++++------
 .../computing/LibvirtStorageVolumeDef.java         |   28 ++++++++------
 .../computing/LibvirtStorageVolumeXMLParser.java   |   28 ++++++++------
 .../agent/resource/computing/LibvirtVMDef.java     |   28 ++++++++------
 .../agent/resource/computing/LibvirtXMLParser.java |   28 ++++++++------
 .../ConsoleProxyAuthenticationResult.java          |   16 ++++++++
 .../consoleproxy/ConsoleProxyResource.java         |   28 ++++++++------
 .../com/cloud/agent/storage/KVMPhysicalDisk.java   |   28 ++++++++------
 .../com/cloud/agent/storage/KVMStoragePool.java    |   28 ++++++++------
 .../cloud/agent/storage/KVMStoragePoolManager.java |   28 ++++++++------
 .../com/cloud/agent/storage/KVMVirtualDisk.java    |   28 ++++++++------
 .../cloud/agent/storage/LibvirtStorageAdaptor.java |   28 ++++++++------
 .../cloud/agent/storage/LibvirtStoragePool.java    |   28 ++++++++------
 .../com/cloud/agent/storage/StorageAdaptor.java    |   28 ++++++++------
 .../com/cloud/agent/vmdata/JettyVmDataServer.java  |   28 ++++++++------
 agent/src/com/cloud/agent/vmdata/VmDataServer.java |   28 ++++++++------
 agent/test/com/cloud/agent/TestAgentShell.java     |   28 ++++++++------
 api/src/com/cloud/acl/ControlledEntity.java        |   28 ++++++++------
 api/src/com/cloud/acl/SecurityChecker.java         |   28 ++++++++------
 .../com/cloud/agent/api/AgentControlAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/AgentControlCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/Answer.java            |   28 ++++++++------
 api/src/com/cloud/agent/api/AttachIsoCommand.java  |   28 ++++++++------
 .../com/cloud/agent/api/AttachVolumeAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/AttachVolumeCommand.java   |   28 ++++++++------
 .../com/cloud/agent/api/BackupSnapshotAnswer.java  |   28 ++++++++------
 .../com/cloud/agent/api/BackupSnapshotCommand.java |   28 ++++++++------
 .../com/cloud/agent/api/BumpUpPriorityCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/CancelCommand.java     |   28 ++++++++------
 api/src/com/cloud/agent/api/ChangeAgentAnswer.java |   28 ++++++++------
 .../com/cloud/agent/api/ChangeAgentCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/CheckHealthAnswer.java |   28 ++++++++------
 .../com/cloud/agent/api/CheckHealthCommand.java    |   28 ++++++++------
 .../com/cloud/agent/api/CheckNetworkAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/CheckNetworkCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/CheckOnHostAnswer.java |   28 ++++++++------
 .../com/cloud/agent/api/CheckOnHostCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/CheckRouterAnswer.java |   28 ++++++++------
 .../com/cloud/agent/api/CheckRouterCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/CheckStateAnswer.java  |   28 ++++++++------
 api/src/com/cloud/agent/api/CheckStateCommand.java |   28 ++++++++------
 .../cloud/agent/api/CheckVirtualMachineAnswer.java |   28 ++++++++------
 .../agent/api/CheckVirtualMachineCommand.java      |   28 ++++++++------
 .../cloud/agent/api/CleanupNetworkRulesCmd.java    |   28 ++++++++------
 .../agent/api/CleanupSnapshotBackupCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/ClusterSyncAnswer.java |   28 ++++++++------
 .../com/cloud/agent/api/ClusterSyncCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/Command.java           |   28 ++++++++------
 .../cloud/agent/api/ComputeChecksumCommand.java    |   28 ++++++++------
 .../api/ConsoleAccessAuthenticationAnswer.java     |   28 ++++++++------
 .../api/ConsoleAccessAuthenticationCommand.java    |   28 ++++++++------
 .../agent/api/ConsoleProxyLoadReportCommand.java   |   28 ++++++++------
 .../CreatePrivateTemplateFromSnapshotCommand.java  |   28 ++++++++------
 .../CreatePrivateTemplateFromVolumeCommand.java    |   28 ++++++++------
 .../cloud/agent/api/CreateStoragePoolCommand.java  |   28 ++++++++------
 .../agent/api/CreateVolumeFromSnapshotAnswer.java  |   28 ++++++++------
 .../agent/api/CreateVolumeFromSnapshotCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/CronCommand.java       |   28 ++++++++------
 .../agent/api/DeleteObjectFromSwiftCommand.java    |   28 ++++++++------
 .../agent/api/DeleteSnapshotBackupAnswer.java      |   28 ++++++++------
 .../agent/api/DeleteSnapshotBackupCommand.java     |   28 ++++++++------
 .../cloud/agent/api/DeleteSnapshotsDirCommand.java |   28 ++++++++------
 .../cloud/agent/api/DeleteStoragePoolCommand.java  |   28 ++++++++------
 api/src/com/cloud/agent/api/FenceAnswer.java       |   28 ++++++++------
 api/src/com/cloud/agent/api/FenceCommand.java      |   28 ++++++++------
 .../com/cloud/agent/api/GetDomRVersionAnswer.java  |   28 ++++++++------
 api/src/com/cloud/agent/api/GetDomRVersionCmd.java |   28 ++++++++------
 .../com/cloud/agent/api/GetFileStatsAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/GetFileStatsCommand.java   |   28 ++++++++------
 .../com/cloud/agent/api/GetHostStatsAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/GetHostStatsCommand.java   |   28 ++++++++------
 .../com/cloud/agent/api/GetStorageStatsAnswer.java |   28 ++++++++------
 .../cloud/agent/api/GetStorageStatsCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/GetVmStatsAnswer.java  |   28 ++++++++------
 api/src/com/cloud/agent/api/GetVmStatsCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/GetVncPortAnswer.java  |   28 ++++++++------
 api/src/com/cloud/agent/api/GetVncPortCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/HostStatsEntry.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/LogLevel.java          |   28 ++++++++------
 api/src/com/cloud/agent/api/MaintainAnswer.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/MaintainCommand.java   |   28 ++++++++------
 .../com/cloud/agent/api/ManageSnapshotAnswer.java  |   28 ++++++++------
 .../com/cloud/agent/api/ManageSnapshotCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/MigrateAnswer.java     |   28 ++++++++------
 api/src/com/cloud/agent/api/MigrateCommand.java    |   28 ++++++++------
 .../com/cloud/agent/api/ModifySshKeysCommand.java  |   28 ++++++++------
 .../cloud/agent/api/ModifyStoragePoolAnswer.java   |   28 ++++++++------
 .../cloud/agent/api/ModifyStoragePoolCommand.java  |   28 ++++++++------
 .../com/cloud/agent/api/NetworkUsageAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/NetworkUsageCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/PingAnswer.java        |   28 ++++++++------
 api/src/com/cloud/agent/api/PingCommand.java       |   28 ++++++++------
 .../com/cloud/agent/api/PingRoutingCommand.java    |   28 ++++++++------
 .../agent/api/PingRoutingWithNwGroupsCommand.java  |   28 ++++++++------
 .../cloud/agent/api/PingRoutingWithOvsCommand.java |   28 ++++++++------
 .../com/cloud/agent/api/PingStorageCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/PingTestCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/PoolEjectCommand.java  |   28 ++++++++------
 .../cloud/agent/api/PrepareForMigrationAnswer.java |   28 ++++++++------
 .../agent/api/PrepareForMigrationCommand.java      |   28 ++++++++------
 .../cloud/agent/api/PrepareOCFS2NodesCommand.java  |   28 ++++++++------
 .../agent/api/PropagateResourceEventCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/ReadyAnswer.java       |   28 ++++++++------
 api/src/com/cloud/agent/api/ReadyCommand.java      |   28 ++++++++------
 api/src/com/cloud/agent/api/RebootAnswer.java      |   28 ++++++++------
 api/src/com/cloud/agent/api/RebootCommand.java     |   28 ++++++++------
 .../com/cloud/agent/api/RebootRouterCommand.java   |   28 ++++++++------
 .../agent/api/SecStorageFirewallCfgCommand.java    |   28 ++++++++------
 .../com/cloud/agent/api/SecStorageSetupAnswer.java |   28 ++++++++------
 .../cloud/agent/api/SecStorageSetupCommand.java    |   28 ++++++++------
 .../cloud/agent/api/SecStorageVMSetupCommand.java  |   28 ++++++++------
 .../cloud/agent/api/SecurityGroupRuleAnswer.java   |   28 ++++++++------
 .../com/cloud/agent/api/SecurityGroupRulesCmd.java |   28 ++++++++------
 api/src/com/cloud/agent/api/SetupAnswer.java       |   28 ++++++++------
 api/src/com/cloud/agent/api/SetupCommand.java      |   28 ++++++++------
 api/src/com/cloud/agent/api/ShutdownCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/SnapshotCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/StartAnswer.java       |   28 ++++++++------
 api/src/com/cloud/agent/api/StartCommand.java      |   28 ++++++++------
 api/src/com/cloud/agent/api/StartupAnswer.java     |   28 ++++++++------
 api/src/com/cloud/agent/api/StartupCommand.java    |   28 ++++++++------
 .../agent/api/StartupExternalDhcpCommand.java      |   28 ++++++++------
 .../agent/api/StartupExternalFirewallCommand.java  |   28 ++++++++------
 .../api/StartupExternalLoadBalancerCommand.java    |   28 ++++++++------
 .../com/cloud/agent/api/StartupProxyCommand.java   |   28 ++++++++------
 .../cloud/agent/api/StartupPxeServerCommand.java   |   28 ++++++++------
 .../com/cloud/agent/api/StartupRoutingCommand.java |   28 ++++++++------
 .../agent/api/StartupSecondaryStorageCommand.java  |   28 ++++++++------
 .../com/cloud/agent/api/StartupStorageCommand.java |   28 ++++++++------
 .../agent/api/StartupTrafficMonitorCommand.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/StopAnswer.java        |   28 ++++++++------
 api/src/com/cloud/agent/api/StopCommand.java       |   28 ++++++++------
 api/src/com/cloud/agent/api/StoragePoolInfo.java   |   28 ++++++++------
 .../com/cloud/agent/api/TransferAgentCommand.java  |   28 ++++++++------
 api/src/com/cloud/agent/api/UnsupportedAnswer.java |   28 ++++++++------
 .../cloud/agent/api/UpdateHostPasswordCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/UpgradeAnswer.java     |   28 ++++++++------
 api/src/com/cloud/agent/api/UpgradeCommand.java    |   28 ++++++++------
 .../cloud/agent/api/UpgradeSnapshotCommand.java    |   28 ++++++++------
 .../cloud/agent/api/ValidateSnapshotAnswer.java    |   28 ++++++++------
 .../cloud/agent/api/ValidateSnapshotCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/VmStatsEntry.java      |   28 ++++++++------
 .../agent/api/baremetal/IpmISetBootDevCommand.java |   28 ++++++++------
 .../api/baremetal/IpmiBootorResetCommand.java      |   28 ++++++++------
 .../api/baremetal/PreparePxeServerAnswer.java      |   28 ++++++++------
 .../api/baremetal/PreparePxeServerCommand.java     |   28 ++++++++------
 .../baremetal/prepareCreateTemplateCommand.java    |   28 ++++++++------
 .../com/cloud/agent/api/check/CheckSshAnswer.java  |   28 ++++++++------
 .../com/cloud/agent/api/check/CheckSshCommand.java |   28 ++++++++------
 .../api/downloadSnapshotFromSwiftCommand.java      |   28 ++++++++------
 ...TemplateFromSwiftToSecondaryStorageCommand.java |   28 ++++++++------
 .../api/proxy/CheckConsoleProxyLoadCommand.java    |   28 ++++++++------
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java    |   28 ++++++++------
 .../com/cloud/agent/api/proxy/ProxyCommand.java    |   28 ++++++++------
 .../StartConsoleProxyAgentHttpHandlerCommand.java  |   28 ++++++++------
 .../api/proxy/WatchConsoleProxyLoadCommand.java    |   28 ++++++++------
 .../CreateLoadBalancerApplianceCommand.java        |   28 ++++++++------
 .../DestroyLoadBalancerApplianceCommand.java       |   28 ++++++++------
 .../cloud/agent/api/routing/DhcpEntryCommand.java  |   28 ++++++++------
 .../com/cloud/agent/api/routing/IpAssocAnswer.java |   28 ++++++++------
 .../cloud/agent/api/routing/IpAssocCommand.java    |   28 ++++++++------
 .../api/routing/LoadBalancerConfigCommand.java     |   28 ++++++++------
 .../agent/api/routing/NetworkElementCommand.java   |   28 ++++++++------
 .../api/routing/RemoteAccessVpnCfgCommand.java     |   28 ++++++++------
 .../agent/api/routing/SavePasswordCommand.java     |   28 ++++++++------
 .../agent/api/routing/SetFirewallRulesAnswer.java  |   28 ++++++++------
 .../agent/api/routing/SetFirewallRulesCommand.java |   28 ++++++++------
 .../api/routing/SetPortForwardingRulesAnswer.java  |   28 ++++++++------
 .../api/routing/SetPortForwardingRulesCommand.java |   28 ++++++++------
 .../agent/api/routing/SetStaticNatRulesAnswer.java |   28 ++++++++------
 .../api/routing/SetStaticNatRulesCommand.java      |   28 ++++++++------
 .../cloud/agent/api/routing/UserDataCommand.java   |   28 ++++++++------
 .../com/cloud/agent/api/routing/VmDataCommand.java |   28 ++++++++------
 .../agent/api/routing/VpnUsersCfgCommand.java      |   28 ++++++++------
 .../agent/api/storage/AbstractDownloadCommand.java |   28 ++++++++------
 .../agent/api/storage/AbstractUploadCommand.java   |   28 ++++++++------
 .../cloud/agent/api/storage/CopyVolumeAnswer.java  |   28 ++++++++------
 .../cloud/agent/api/storage/CopyVolumeCommand.java |   28 ++++++++------
 .../com/cloud/agent/api/storage/CreateAnswer.java  |   28 ++++++++------
 .../com/cloud/agent/api/storage/CreateCommand.java |   28 ++++++++------
 .../api/storage/CreateEntityDownloadURLAnswer.java |   28 ++++++++------
 .../storage/CreateEntityDownloadURLCommand.java    |   28 ++++++++------
 .../api/storage/CreatePrivateTemplateAnswer.java   |   28 ++++++++------
 .../api/storage/CreatePrivateTemplateCommand.java  |   28 ++++++++------
 .../api/storage/DeleteEntityDownloadURLAnswer.java |   28 ++++++++------
 .../storage/DeleteEntityDownloadURLCommand.java    |   28 ++++++++------
 .../agent/api/storage/DeleteTemplateCommand.java   |   28 ++++++++------
 .../agent/api/storage/DeleteVolumeCommand.java     |   16 ++++++++
 .../com/cloud/agent/api/storage/DestroyAnswer.java |   28 ++++++++------
 .../cloud/agent/api/storage/DestroyCommand.java    |   28 ++++++++------
 .../cloud/agent/api/storage/DownloadAnswer.java    |   28 ++++++++------
 .../cloud/agent/api/storage/DownloadCommand.java   |   28 ++++++++------
 .../agent/api/storage/DownloadProgressCommand.java |   28 ++++++++------
 .../agent/api/storage/ListTemplateAnswer.java      |   28 ++++++++------
 .../agent/api/storage/ListTemplateCommand.java     |   28 ++++++++------
 .../cloud/agent/api/storage/ListVolumeAnswer.java  |   16 ++++++++
 .../cloud/agent/api/storage/ListVolumeCommand.java |   16 ++++++++
 .../storage/ManageVolumeAvailabilityAnswer.java    |   28 ++++++++------
 .../storage/ManageVolumeAvailabilityCommand.java   |   28 ++++++++------
 .../api/storage/PrimaryStorageDownloadAnswer.java  |   28 ++++++++------
 .../api/storage/PrimaryStorageDownloadCommand.java |   28 ++++++++------
 .../cloud/agent/api/storage/StorageCommand.java    |   28 ++++++++------
 .../cloud/agent/api/storage/UpgradeDiskAnswer.java |   28 ++++++++------
 .../agent/api/storage/UpgradeDiskCommand.java      |   28 ++++++++------
 .../com/cloud/agent/api/storage/UploadAnswer.java  |   28 ++++++++------
 .../com/cloud/agent/api/storage/UploadCommand.java |   28 ++++++++------
 .../agent/api/storage/UploadProgressCommand.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/storage/ssCommand.java |   28 ++++++++------
 api/src/com/cloud/agent/api/to/FirewallRuleTO.java |   28 ++++++++------
 api/src/com/cloud/agent/api/to/HostTO.java         |   28 ++++++++------
 api/src/com/cloud/agent/api/to/IpAddressTO.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/to/LoadBalancerTO.java |   28 ++++++++------
 api/src/com/cloud/agent/api/to/NetworkTO.java      |   28 ++++++++------
 api/src/com/cloud/agent/api/to/NicTO.java          |   28 ++++++++------
 .../cloud/agent/api/to/PortForwardingRuleTO.java   |   28 ++++++++------
 .../com/cloud/agent/api/to/StaticNatRuleTO.java    |   28 ++++++++------
 api/src/com/cloud/agent/api/to/StorageFilerTO.java |   28 ++++++++------
 api/src/com/cloud/agent/api/to/SwiftTO.java        |   28 ++++++++------
 api/src/com/cloud/agent/api/to/TemplateTO.java     |   28 ++++++++------
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   28 ++++++++------
 api/src/com/cloud/agent/api/to/VolumeTO.java       |   28 ++++++++------
 ...TemplateToSwiftFromSecondaryStorageCommand.java |   28 ++++++++------
 api/src/com/cloud/alert/Alert.java                 |   28 ++++++++------
 api/src/com/cloud/api/ApiConstants.java            |   28 ++++++++------
 api/src/com/cloud/api/BaseAsyncCmd.java            |   28 ++++++++------
 api/src/com/cloud/api/BaseAsyncCreateCmd.java      |   28 ++++++++------
 api/src/com/cloud/api/BaseCmd.java                 |   28 ++++++++------
 .../com/cloud/api/BaseListAccountResourcesCmd.java |   28 ++++++++------
 api/src/com/cloud/api/BaseListCmd.java             |   28 ++++++++------
 .../com/cloud/api/BaseListDomainResourcesCmd.java  |   28 ++++++++------
 .../api/BaseListProjectAndAccountResourcesCmd.java |   28 ++++++++------
 api/src/com/cloud/api/Identity.java                |   28 ++++++++------
 api/src/com/cloud/api/IdentityMapper.java          |   28 ++++++++------
 api/src/com/cloud/api/IdentityService.java         |   28 ++++++++------
 api/src/com/cloud/api/Implementation.java          |   28 ++++++++------
 api/src/com/cloud/api/Parameter.java               |   28 ++++++++------
 api/src/com/cloud/api/PlugService.java             |   28 ++++++++------
 api/src/com/cloud/api/ResponseGenerator.java       |   28 ++++++++------
 api/src/com/cloud/api/ResponseObject.java          |   28 ++++++++------
 api/src/com/cloud/api/ServerApiException.java      |   28 ++++++++------
 .../com/cloud/api/commands/ActivateProjectCmd.java |   28 ++++++++------
 .../cloud/api/commands/AddAccountToProjectCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/AddClusterCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/AddHostCmd.java     |   28 ++++++++------
 .../api/commands/AddNetworkServiceProviderCmd.java |   28 ++++++++------
 .../cloud/api/commands/AddSecondaryStorageCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/AddSwiftCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/AddTrafficTypeCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/AddVpnUserCmd.java  |   28 ++++++++------
 .../api/commands/AssignToLoadBalancerRuleCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/AssignVMCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/AssociateIPAddrCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/AttachIsoCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/AttachVolumeCmd.java    |   28 ++++++++------
 .../commands/AuthorizeSecurityGroupEgressCmd.java  |   28 ++++++++------
 .../commands/AuthorizeSecurityGroupIngressCmd.java |   28 ++++++++------
 .../cloud/api/commands/CancelMaintenanceCmd.java   |   28 ++++++++------
 .../CancelPrimaryStorageMaintenanceCmd.java        |   28 ++++++++------
 .../commands/ConfigureVirtualRouterElementCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/CopyTemplateCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/CreateAccountCmd.java   |   28 ++++++++------
 .../cloud/api/commands/CreateDiskOfferingCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/CreateDomainCmd.java    |   28 ++++++++------
 .../cloud/api/commands/CreateFirewallRuleCmd.java  |   28 ++++++++------
 .../api/commands/CreateIpForwardingRuleCmd.java    |   28 ++++++++------
 .../api/commands/CreateLBStickinessPolicyCmd.java  |   28 ++++++++------
 .../api/commands/CreateLoadBalancerRuleCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/CreateNetworkCmd.java   |   28 ++++++++------
 .../api/commands/CreateNetworkOfferingCmd.java     |   28 ++++++++------
 .../api/commands/CreatePhysicalNetworkCmd.java     |   28 ++++++++------
 api/src/com/cloud/api/commands/CreatePodCmd.java   |   28 ++++++++------
 .../api/commands/CreatePortForwardingRuleCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/CreateProjectCmd.java   |   28 ++++++++------
 .../api/commands/CreateRemoteAccessVpnCmd.java     |   28 ++++++++------
 .../cloud/api/commands/CreateSSHKeyPairCmd.java    |   28 ++++++++------
 .../cloud/api/commands/CreateSecurityGroupCmd.java |   28 ++++++++------
 .../api/commands/CreateServiceOfferingCmd.java     |   28 ++++++++------
 .../com/cloud/api/commands/CreateSnapshotCmd.java  |   28 ++++++++------
 .../api/commands/CreateSnapshotPolicyCmd.java      |   28 ++++++++------
 .../commands/CreateStorageNetworkIpRangeCmd.java   |   28 ++++++++------
 .../cloud/api/commands/CreateStoragePoolCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/CreateTemplateCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/CreateUserCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/CreateVMGroupCmd.java   |   28 ++++++++------
 .../commands/CreateVirtualRouterElementCmd.java    |   28 ++++++++------
 .../cloud/api/commands/CreateVlanIpRangeCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/CreateVolumeCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/CreateZoneCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/DeleteAccountCmd.java   |   28 ++++++++------
 .../api/commands/DeleteAccountFromProjectCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/DeleteClusterCmd.java   |   28 ++++++++------
 .../cloud/api/commands/DeleteDiskOfferingCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/DeleteDomainCmd.java    |   28 ++++++++------
 .../cloud/api/commands/DeleteFirewallRuleCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/DeleteHostCmd.java  |   28 ++++++++------
 .../api/commands/DeleteIpForwardingRuleCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/DeleteIsoCmd.java   |   28 ++++++++------
 .../api/commands/DeleteLBStickinessPolicyCmd.java  |   28 ++++++++------
 .../api/commands/DeleteLoadBalancerRuleCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/DeleteNetworkCmd.java   |   28 ++++++++------
 .../api/commands/DeleteNetworkOfferingCmd.java     |   28 ++++++++------
 .../commands/DeleteNetworkServiceProviderCmd.java  |   28 ++++++++------
 .../api/commands/DeletePhysicalNetworkCmd.java     |   28 ++++++++------
 api/src/com/cloud/api/commands/DeletePodCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/DeletePoolCmd.java  |   28 ++++++++------
 .../api/commands/DeletePortForwardingRuleCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/DeleteProjectCmd.java   |   28 ++++++++------
 .../api/commands/DeleteProjectInvitationCmd.java   |   28 ++++++++------
 .../api/commands/DeleteRemoteAccessVpnCmd.java     |   28 ++++++++------
 .../cloud/api/commands/DeleteSSHKeyPairCmd.java    |   28 ++++++++------
 .../cloud/api/commands/DeleteSecurityGroupCmd.java |   28 ++++++++------
 .../api/commands/DeleteServiceOfferingCmd.java     |   28 ++++++++------
 .../com/cloud/api/commands/DeleteSnapshotCmd.java  |   28 ++++++++------
 .../api/commands/DeleteSnapshotPoliciesCmd.java    |   28 ++++++++------
 .../commands/DeleteStorageNetworkIpRangeCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/DeleteTemplateCmd.java  |   28 ++++++++------
 .../cloud/api/commands/DeleteTrafficTypeCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/DeleteUserCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/DeleteVMGroupCmd.java   |   28 ++++++++------
 .../cloud/api/commands/DeleteVlanIpRangeCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/DeleteVolumeCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/DeleteZoneCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/DeployVMCmd.java    |   28 ++++++++------
 .../cloud/api/commands/DestroyConsoleProxyCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/DestroyRouterCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/DestroySystemVmCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/DestroyVMCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/DetachIsoCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/DetachVolumeCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/DisableAccountCmd.java  |   28 ++++++++------
 .../cloud/api/commands/DisableStaticNatCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/DisableUserCmd.java |   28 ++++++++------
 .../cloud/api/commands/DisassociateIPAddrCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/EnableAccountCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/EnableStaticNatCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/EnableUserCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/ExtractIsoCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/ExtractTemplateCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/ExtractVolumeCmd.java   |   28 ++++++++------
 .../cloud/api/commands/GetCloudIdentifierCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/GetVMPasswordCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/LDAPConfigCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/LDAPRemoveCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/ListAccountsCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/ListAlertsCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/ListAsyncJobsCmd.java   |   28 ++++++++------
 .../cloud/api/commands/ListCapabilitiesCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/ListCapacityCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/ListCfgsByCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/ListClustersCmd.java    |   28 ++++++++------
 .../cloud/api/commands/ListDiskOfferingsCmd.java   |   28 ++++++++------
 .../cloud/api/commands/ListDomainChildrenCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/ListDomainsCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/ListEventTypesCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/ListEventsCmd.java  |   28 ++++++++------
 .../cloud/api/commands/ListFirewallRulesCmd.java   |   28 ++++++++------
 .../api/commands/ListGuestOsCategoriesCmd.java     |   28 ++++++++------
 api/src/com/cloud/api/commands/ListGuestOsCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/ListHostsCmd.java   |   28 ++++++++------
 .../commands/ListHypervisorCapabilitiesCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/ListHypervisorsCmd.java |   28 ++++++++------
 .../api/commands/ListIpForwardingRulesCmd.java     |   28 ++++++++------
 .../cloud/api/commands/ListIsoPermissionsCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/ListIsosCmd.java    |   28 ++++++++------
 .../api/commands/ListLBStickinessPoliciesCmd.java  |   28 ++++++++------
 .../commands/ListLoadBalancerRuleInstancesCmd.java |   28 ++++++++------
 .../api/commands/ListLoadBalancerRulesCmd.java     |   28 ++++++++------
 .../api/commands/ListNetworkOfferingsCmd.java      |   28 ++++++++------
 .../commands/ListNetworkServiceProvidersCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/ListNetworksCmd.java    |   28 ++++++++------
 .../api/commands/ListPhysicalNetworksCmd.java      |   28 ++++++++------
 api/src/com/cloud/api/commands/ListPodsByCmd.java  |   28 ++++++++------
 .../api/commands/ListPortForwardingRulesCmd.java   |   28 ++++++++------
 .../cloud/api/commands/ListProjectAccountsCmd.java |   28 ++++++++------
 .../api/commands/ListProjectInvitationsCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/ListProjectsCmd.java    |   28 ++++++++------
 .../api/commands/ListPublicIpAddressesCmd.java     |   28 ++++++++------
 .../commands/ListRecurringSnapshotScheduleCmd.java |   28 ++++++++------
 .../api/commands/ListRemoteAccessVpnsCmd.java      |   28 ++++++++------
 .../cloud/api/commands/ListResourceLimitsCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/ListRoutersCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/ListSSHKeyPairsCmd.java |   28 ++++++++------
 .../cloud/api/commands/ListSecurityGroupsCmd.java  |   28 ++++++++------
 .../api/commands/ListServiceOfferingsCmd.java      |   28 ++++++++------
 .../api/commands/ListSnapshotPoliciesCmd.java      |   28 ++++++++------
 .../com/cloud/api/commands/ListSnapshotsCmd.java   |   28 ++++++++------
 .../cloud/api/commands/ListStoragePoolsCmd.java    |   28 ++++++++------
 .../commands/ListSupportedNetworkServicesCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/ListSwiftsCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/ListSystemVMsCmd.java   |   28 ++++++++------
 .../commands/ListTemplateOrIsoPermissionsCmd.java  |   28 ++++++++------
 .../api/commands/ListTemplatePermissionsCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/ListTemplatesCmd.java   |   28 ++++++++------
 .../commands/ListTrafficTypeImplementorsCmd.java   |   28 ++++++++------
 .../cloud/api/commands/ListTrafficTypesCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/ListUsersCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/ListVMGroupsCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/ListVMsCmd.java     |   28 ++++++++------
 .../api/commands/ListVirtualRouterElementsCmd.java |   28 ++++++++------
 .../cloud/api/commands/ListVlanIpRangesCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/ListVolumesCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/ListVpnUsersCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/ListZonesByCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/LockAccountCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/LockUserCmd.java    |   28 ++++++++------
 .../api/commands/MarkDefaultZoneForAccountCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/MigrateSystemVMCmd.java |   28 ++++++++------
 api/src/com/cloud/api/commands/MigrateVMCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/MigrateVolumeCmd.java   |   28 ++++++++------
 .../api/commands/PrepareForMaintenanceCmd.java     |   28 ++++++++------
 .../PreparePrimaryStorageForMaintenanceCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/PrepareTemplateCmd.java |   28 ++++++++------
 .../cloud/api/commands/QueryAsyncJobResultCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/RebootRouterCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/RebootSystemVmCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/RebootVMCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/ReconnectHostCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/RecoverVMCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/RegisterCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/RegisterIsoCmd.java |   28 ++++++++------
 .../cloud/api/commands/RegisterSSHKeyPairCmd.java  |   28 ++++++++------
 .../cloud/api/commands/RegisterTemplateCmd.java    |   28 ++++++++------
 .../commands/RemoveFromLoadBalancerRuleCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/RemoveVpnUserCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/ResetVMPasswordCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/RestartNetworkCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/RestoreVMCmd.java   |   28 ++++++++------
 .../api/commands/RevokeSecurityGroupEgressCmd.java |   28 ++++++++------
 .../commands/RevokeSecurityGroupIngressCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/StartRouterCmd.java |   28 ++++++++------
 .../com/cloud/api/commands/StartSystemVMCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/StartVMCmd.java     |   28 ++++++++------
 api/src/com/cloud/api/commands/StopRouterCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/StopSystemVmCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/StopVMCmd.java      |   28 ++++++++------
 .../com/cloud/api/commands/SuspendProjectCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/UpdateAccountCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdateCfgCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/UpdateClusterCmd.java   |   28 ++++++++------
 .../cloud/api/commands/UpdateDiskOfferingCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/UpdateDomainCmd.java    |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdateHostCmd.java  |   28 ++++++++------
 .../cloud/api/commands/UpdateHostPasswordCmd.java  |   28 ++++++++------
 .../commands/UpdateHypervisorCapabilitiesCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdateIsoCmd.java   |   28 ++++++++------
 .../api/commands/UpdateIsoPermissionsCmd.java      |   28 ++++++++------
 .../api/commands/UpdateLoadBalancerRuleCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/UpdateNetworkCmd.java   |   28 ++++++++------
 .../api/commands/UpdateNetworkOfferingCmd.java     |   28 ++++++++------
 .../commands/UpdateNetworkServiceProviderCmd.java  |   28 ++++++++------
 .../api/commands/UpdatePhysicalNetworkCmd.java     |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdatePodCmd.java   |   28 ++++++++------
 .../api/commands/UpdatePortForwardingRuleCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/UpdateProjectCmd.java   |   28 ++++++++------
 .../api/commands/UpdateProjectInvitationCmd.java   |   28 ++++++++------
 .../cloud/api/commands/UpdateResourceCountCmd.java |   28 ++++++++------
 .../cloud/api/commands/UpdateResourceLimitCmd.java |   28 ++++++++------
 .../api/commands/UpdateServiceOfferingCmd.java     |   28 ++++++++------
 .../commands/UpdateStorageNetworkIpRangeCmd.java   |   28 ++++++++------
 .../cloud/api/commands/UpdateStoragePoolCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/UpdateTemplateCmd.java  |   28 ++++++++------
 .../cloud/api/commands/UpdateTemplateOrIsoCmd.java |   28 ++++++++------
 .../UpdateTemplateOrIsoPermissionsCmd.java         |   28 ++++++++------
 .../api/commands/UpdateTemplatePermissionsCmd.java |   28 ++++++++------
 .../cloud/api/commands/UpdateTrafficTypeCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdateUserCmd.java  |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdateVMCmd.java    |   28 ++++++++------
 .../com/cloud/api/commands/UpdateVMGroupCmd.java   |   28 ++++++++------
 api/src/com/cloud/api/commands/UpdateZoneCmd.java  |   28 ++++++++------
 .../com/cloud/api/commands/UpgradeRouterCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/UpgradeSystemVMCmd.java |   16 ++++++++
 api/src/com/cloud/api/commands/UpgradeVMCmd.java   |   28 ++++++++------
 .../api/commands/UploadCustomCertificateCmd.java   |   28 ++++++++------
 .../com/cloud/api/commands/UploadVolumeCmd.java    |   28 ++++++++------
 .../api/commands/listStorageNetworkIpRangeCmd.java |   28 ++++++++------
 .../com/cloud/api/response/AccountResponse.java    |   28 ++++++++------
 api/src/com/cloud/api/response/AlertResponse.java  |   28 ++++++++------
 .../com/cloud/api/response/AsyncJobResponse.java   |   28 ++++++++------
 api/src/com/cloud/api/response/BaseResponse.java   |   28 ++++++++------
 .../cloud/api/response/CapabilitiesResponse.java   |   28 ++++++++------
 .../com/cloud/api/response/CapabilityResponse.java |   28 ++++++++------
 .../com/cloud/api/response/CapacityResponse.java   |   28 ++++++++------
 .../cloud/api/response/CiscoNexusVSMResponse.java  |   28 ++++++++------
 .../api/response/CloudIdentifierResponse.java      |   28 ++++++++------
 .../com/cloud/api/response/ClusterResponse.java    |   28 ++++++++------
 .../cloud/api/response/ConfigurationResponse.java  |   28 ++++++++------
 .../api/response/ControlledEntityResponse.java     |   28 ++++++++------
 .../com/cloud/api/response/CreateCmdResponse.java  |   28 ++++++++------
 .../api/response/CustomCertificateResponse.java    |   28 ++++++++------
 .../cloud/api/response/DiskOfferingResponse.java   |   28 ++++++++------
 api/src/com/cloud/api/response/DomainResponse.java |   28 ++++++++------
 .../cloud/api/response/DomainRouterResponse.java   |   28 ++++++++------
 api/src/com/cloud/api/response/EventResponse.java  |   28 ++++++++------
 .../com/cloud/api/response/EventTypeResponse.java  |   28 ++++++++------
 .../com/cloud/api/response/ExceptionResponse.java  |   28 ++++++++------
 .../com/cloud/api/response/ExtractResponse.java    |   28 ++++++++------
 .../cloud/api/response/F5LoadBalancerResponse.java |   28 ++++++++------
 .../com/cloud/api/response/FirewallResponse.java   |   28 ++++++++------
 .../cloud/api/response/FirewallRuleResponse.java   |   28 ++++++++------
 .../cloud/api/response/GetVMPasswordResponse.java  |   28 ++++++++------
 .../api/response/GuestOSCategoryResponse.java      |   28 ++++++++------
 .../com/cloud/api/response/GuestOSResponse.java    |   28 ++++++++------
 api/src/com/cloud/api/response/HostResponse.java   |   28 ++++++++------
 .../response/HypervisorCapabilitiesResponse.java   |   28 ++++++++------
 .../com/cloud/api/response/HypervisorResponse.java |   28 ++++++++------
 .../com/cloud/api/response/IPAddressResponse.java  |   28 ++++++++------
 .../cloud/api/response/InstanceGroupResponse.java  |   28 ++++++++------
 .../api/response/IpForwardingRuleResponse.java     |   28 ++++++++------
 api/src/com/cloud/api/response/IsoVmResponse.java  |   28 ++++++++------
 .../api/response/LBStickinessPolicyResponse.java   |   28 ++++++++------
 .../cloud/api/response/LBStickinessResponse.java   |   28 ++++++++------
 .../com/cloud/api/response/LDAPConfigResponse.java |   28 ++++++++------
 .../com/cloud/api/response/LDAPRemoveResponse.java |   28 ++++++++------
 api/src/com/cloud/api/response/ListResponse.java   |   28 ++++++++------
 .../cloud/api/response/LoadBalancerResponse.java   |   28 ++++++++------
 .../response/NetscalerLoadBalancerResponse.java    |   28 ++++++++------
 .../api/response/NetworkOfferingResponse.java      |   28 ++++++++------
 .../com/cloud/api/response/NetworkResponse.java    |   28 ++++++++------
 api/src/com/cloud/api/response/NicResponse.java    |   28 ++++++++------
 .../api/response/PhysicalNetworkResponse.java      |   28 ++++++++------
 api/src/com/cloud/api/response/PodResponse.java    |   28 ++++++++------
 .../cloud/api/response/ProjectAccountResponse.java |   28 ++++++++------
 .../api/response/ProjectInvitationResponse.java    |   28 ++++++++------
 .../com/cloud/api/response/ProjectResponse.java    |   28 ++++++++------
 .../com/cloud/api/response/ProviderResponse.java   |   28 ++++++++------
 .../com/cloud/api/response/RegisterResponse.java   |   28 ++++++++------
 .../api/response/RemoteAccessVpnResponse.java      |   28 ++++++++------
 .../cloud/api/response/ResourceCountResponse.java  |   28 ++++++++------
 .../cloud/api/response/ResourceLimitResponse.java  |   28 ++++++++------
 .../com/cloud/api/response/SSHKeyPairResponse.java |   28 ++++++++------
 .../cloud/api/response/SecurityGroupResponse.java  |   28 ++++++++------
 .../api/response/SecurityGroupRuleResponse.java    |   28 ++++++++------
 .../api/response/ServiceOfferingResponse.java      |   28 ++++++++------
 .../com/cloud/api/response/ServiceResponse.java    |   28 ++++++++------
 .../cloud/api/response/SnapshotPolicyResponse.java |   28 ++++++++------
 .../com/cloud/api/response/SnapshotResponse.java   |   28 ++++++++------
 .../api/response/SnapshotScheduleResponse.java     |   28 ++++++++------
 .../cloud/api/response/SrxFirewallResponse.java    |   28 ++++++++------
 api/src/com/cloud/api/response/StatusResponse.java |   28 ++++++++------
 .../response/StorageNetworkIpRangeResponse.java    |   28 ++++++++------
 .../cloud/api/response/StoragePoolResponse.java    |   28 ++++++++------
 .../com/cloud/api/response/SuccessResponse.java    |   28 ++++++++------
 api/src/com/cloud/api/response/SwiftResponse.java  |   28 ++++++++------
 .../api/response/SystemVmInstanceResponse.java     |   28 ++++++++------
 .../com/cloud/api/response/SystemVmResponse.java   |   28 ++++++++------
 .../api/response/TemplatePermissionsResponse.java  |   28 ++++++++------
 .../com/cloud/api/response/TemplateResponse.java   |   28 ++++++++------
 .../response/TrafficTypeImplementorResponse.java   |   28 ++++++++------
 .../cloud/api/response/TrafficTypeResponse.java    |   28 ++++++++------
 .../com/cloud/api/response/UpgradeVmResponse.java  |   28 ++++++++------
 api/src/com/cloud/api/response/UserResponse.java   |   28 ++++++++------
 api/src/com/cloud/api/response/UserVmResponse.java |   28 ++++++++------
 .../response/VirtualRouterProviderResponse.java    |   28 ++++++++------
 .../cloud/api/response/VlanIpRangeResponse.java    |   28 ++++++++------
 api/src/com/cloud/api/response/VolumeResponse.java |   28 ++++++++------
 .../com/cloud/api/response/VpnUsersResponse.java   |   28 ++++++++------
 api/src/com/cloud/api/response/ZoneResponse.java   |   28 ++++++++------
 .../com/cloud/async/AsyncInstanceCreateStatus.java |   28 ++++++++------
 api/src/com/cloud/async/AsyncJob.java              |   28 ++++++++------
 api/src/com/cloud/async/SyncQueueItem.java         |   28 ++++++++------
 api/src/com/cloud/capacity/Capacity.java           |   28 ++++++++------
 api/src/com/cloud/capacity/CapacityState.java      |   28 ++++++++------
 .../com/cloud/cluster/ManagementServerHost.java    |   28 ++++++++------
 api/src/com/cloud/configuration/Configuration.java |   28 ++++++++------
 .../cloud/configuration/ConfigurationService.java  |   28 ++++++++------
 api/src/com/cloud/configuration/Resource.java      |   28 ++++++++------
 api/src/com/cloud/configuration/ResourceCount.java |   28 ++++++++------
 api/src/com/cloud/configuration/ResourceLimit.java |   28 ++++++++------
 .../cloud/consoleproxy/ConsoleProxyService.java    |   28 ++++++++------
 api/src/com/cloud/dao/EntityManager.java           |   28 ++++++++------
 api/src/com/cloud/dc/DataCenter.java               |   28 ++++++++------
 api/src/com/cloud/dc/Pod.java                      |   28 ++++++++------
 api/src/com/cloud/dc/StorageNetworkIpRange.java    |   28 ++++++++------
 api/src/com/cloud/dc/Vlan.java                     |   28 ++++++++------
 api/src/com/cloud/deploy/DataCenterDeployment.java |   28 ++++++++------
 api/src/com/cloud/deploy/DeployDestination.java    |   28 ++++++++------
 api/src/com/cloud/deploy/DeploymentPlan.java       |   28 ++++++++------
 api/src/com/cloud/deploy/DeploymentPlanner.java    |   28 ++++++++------
 api/src/com/cloud/domain/Domain.java               |   28 ++++++++------
 api/src/com/cloud/domain/PartOf.java               |   28 ++++++++------
 api/src/com/cloud/event/ActionEvent.java           |   28 ++++++++------
 api/src/com/cloud/event/Event.java                 |   28 ++++++++------
 api/src/com/cloud/event/EventTypes.java            |   28 ++++++++------
 .../com/cloud/exception/AccountLimitException.java |   28 ++++++++------
 .../cloud/exception/AgentUnavailableException.java |   28 ++++++++------
 .../exception/CloudAuthenticationException.java    |   28 ++++++++------
 api/src/com/cloud/exception/CloudException.java    |   28 ++++++++------
 .../cloud/exception/CloudExecutionException.java   |   28 ++++++++------
 .../exception/ConcurrentOperationException.java    |   28 ++++++++------
 .../ConflictingNetworkSettingsException.java       |   28 ++++++++------
 .../com/cloud/exception/ConnectionException.java   |   28 ++++++++------
 .../exception/DiscoveredWithErrorException.java    |   28 ++++++++------
 .../com/cloud/exception/DiscoveryException.java    |   28 ++++++++------
 api/src/com/cloud/exception/ErrorCode.java         |   28 ++++++++------
 api/src/com/cloud/exception/HAStateException.java  |   28 ++++++++------
 .../InsufficientAddressCapacityException.java      |   28 ++++++++------
 .../exception/InsufficientCapacityException.java   |   28 ++++++++------
 .../InsufficientNetworkCapacityException.java      |   28 ++++++++------
 .../InsufficientServerCapacityException.java       |   28 ++++++++------
 .../InsufficientStorageCapacityException.java      |   28 ++++++++------
 ...InsufficientVirtualNetworkCapcityException.java |   28 ++++++++------
 .../cloud/exception/InternalErrorException.java    |   28 ++++++++------
 .../exception/InvalidParameterValueException.java  |   28 ++++++++------
 .../cloud/exception/ManagementServerException.java |   28 ++++++++------
 .../exception/NetworkRuleConflictException.java    |   28 ++++++++------
 .../cloud/exception/PermissionDeniedException.java |   28 ++++++++------
 .../exception/ResourceAllocationException.java     |   28 ++++++++------
 .../cloud/exception/ResourceInUseException.java    |   28 ++++++++------
 .../exception/ResourceUnavailableException.java    |   28 ++++++++------
 .../exception/StorageUnavailableException.java     |   28 ++++++++------
 .../exception/UnsupportedServiceException.java     |   28 ++++++++------
 .../VirtualMachineMigrationException.java          |   28 ++++++++------
 api/src/com/cloud/host/Host.java                   |   28 ++++++++------
 api/src/com/cloud/host/HostEnvironment.java        |   28 ++++++++------
 api/src/com/cloud/host/HostStats.java              |   28 ++++++++------
 api/src/com/cloud/host/Status.java                 |   28 ++++++++------
 api/src/com/cloud/hypervisor/Hypervisor.java       |   28 ++++++++------
 .../cloud/hypervisor/HypervisorCapabilities.java   |   28 ++++++++------
 api/src/com/cloud/hypervisor/HypervisorGuru.java   |   28 ++++++++------
 api/src/com/cloud/network/CiscoNexusVSMDevice.java |   27 ++++++++-----
 api/src/com/cloud/network/IpAddress.java           |   28 ++++++++------
 api/src/com/cloud/network/Network.java             |   28 ++++++++------
 api/src/com/cloud/network/NetworkProfile.java      |   28 ++++++++------
 api/src/com/cloud/network/NetworkService.java      |   28 ++++++++------
 api/src/com/cloud/network/Networks.java            |   28 ++++++++------
 api/src/com/cloud/network/PhysicalNetwork.java     |   28 ++++++++------
 .../network/PhysicalNetworkServiceProvider.java    |   28 ++++++++------
 .../cloud/network/PhysicalNetworkSetupInfo.java    |   28 ++++++++------
 .../cloud/network/PhysicalNetworkTrafficType.java  |   28 ++++++++------
 api/src/com/cloud/network/PublicIpAddress.java     |   28 ++++++++------
 api/src/com/cloud/network/RemoteAccessVpn.java     |   28 ++++++++------
 .../com/cloud/network/StorageNetworkService.java   |   28 ++++++++------
 .../network/VirtualNetworkApplianceService.java    |   28 ++++++++------
 .../com/cloud/network/VirtualRouterProvider.java   |   28 ++++++++------
 api/src/com/cloud/network/VpnUser.java             |   28 ++++++++------
 .../cloud/network/element/DhcpServiceProvider.java |   28 ++++++++------
 .../network/element/FirewallServiceProvider.java   |   28 ++++++++------
 api/src/com/cloud/network/element/IpDeployer.java  |   28 ++++++++------
 .../element/LoadBalancingServiceProvider.java      |   28 ++++++++------
 .../com/cloud/network/element/NetworkElement.java  |   28 ++++++++------
 .../element/PortForwardingServiceProvider.java     |   28 ++++++++------
 .../element/RemoteAccessVPNServiceProvider.java    |   28 ++++++++------
 .../network/element/SourceNatServiceProvider.java  |   28 ++++++++------
 .../network/element/StaticNatServiceProvider.java  |   28 ++++++++------
 .../network/element/UserDataServiceProvider.java   |   28 ++++++++------
 .../element/VirtualRouterElementService.java       |   28 ++++++++------
 .../cloud/network/firewall/FirewallService.java    |   28 ++++++++------
 api/src/com/cloud/network/guru/NetworkGuru.java    |   28 ++++++++------
 .../com/cloud/network/lb/LoadBalancingRule.java    |   28 ++++++++------
 .../network/lb/LoadBalancingRulesService.java      |   28 ++++++++------
 .../network/ovs/OvsCreateGreTunnelAnswer.java      |   28 ++++++++------
 .../network/ovs/OvsCreateGreTunnelCommand.java     |   28 ++++++++------
 .../cloud/network/ovs/OvsCreateTunnelAnswer.java   |   28 ++++++++------
 .../cloud/network/ovs/OvsCreateTunnelCommand.java  |   28 ++++++++------
 .../cloud/network/ovs/OvsDeleteFlowCommand.java    |   28 ++++++++------
 .../cloud/network/ovs/OvsDestroyBridgeCommand.java |   16 ++++++++
 .../cloud/network/ovs/OvsDestroyTunnelCommand.java |   28 ++++++++------
 .../cloud/network/ovs/OvsFetchInterfaceAnswer.java |   16 ++++++++
 .../network/ovs/OvsFetchInterfaceCommand.java      |   16 ++++++++
 .../cloud/network/ovs/OvsSetTagAndFlowAnswer.java  |   28 ++++++++------
 .../cloud/network/ovs/OvsSetTagAndFlowCommand.java |   28 ++++++++------
 .../cloud/network/ovs/OvsSetupBridgeCommand.java   |   16 ++++++++
 .../com/cloud/network/router/VirtualRouter.java    |   28 ++++++++------
 api/src/com/cloud/network/rules/FirewallRule.java  |   28 ++++++++------
 .../cloud/network/rules/LbStickinessMethod.java    |   28 ++++++++------
 api/src/com/cloud/network/rules/LoadBalancer.java  |   28 ++++++++------
 .../cloud/network/rules/PortForwardingRule.java    |   28 ++++++++------
 api/src/com/cloud/network/rules/RulesService.java  |   28 ++++++++------
 api/src/com/cloud/network/rules/StaticNat.java     |   28 ++++++++------
 api/src/com/cloud/network/rules/StaticNatRule.java |   28 ++++++++------
 .../com/cloud/network/rules/StickinessPolicy.java  |   28 ++++++++------
 .../com/cloud/network/security/SecurityGroup.java  |   28 ++++++++------
 .../cloud/network/security/SecurityGroupRules.java |   28 ++++++++------
 .../network/security/SecurityGroupService.java     |   28 ++++++++------
 .../com/cloud/network/security/SecurityRule.java   |   28 ++++++++------
 .../cloud/network/vpn/RemoteAccessVpnService.java  |   28 ++++++++------
 api/src/com/cloud/offering/DiskOffering.java       |   28 ++++++++------
 api/src/com/cloud/offering/NetworkOffering.java    |   28 ++++++++------
 api/src/com/cloud/offering/OfferingManager.java    |   28 ++++++++------
 api/src/com/cloud/offering/ServiceOffering.java    |   28 ++++++++------
 api/src/com/cloud/org/Cluster.java                 |   28 ++++++++------
 api/src/com/cloud/org/Grouping.java                |   28 ++++++++------
 api/src/com/cloud/org/Managed.java                 |   28 ++++++++------
 api/src/com/cloud/org/RunningIn.java               |   28 ++++++++------
 api/src/com/cloud/projects/Project.java            |   28 ++++++++------
 api/src/com/cloud/projects/ProjectAccount.java     |   28 ++++++++------
 api/src/com/cloud/projects/ProjectInvitation.java  |   28 ++++++++------
 api/src/com/cloud/projects/ProjectService.java     |   28 ++++++++------
 api/src/com/cloud/resource/ResourceService.java    |   28 ++++++++------
 api/src/com/cloud/resource/ResourceState.java      |   28 ++++++++------
 api/src/com/cloud/serializer/Param.java            |   28 ++++++++------
 api/src/com/cloud/server/ManagementService.java    |   28 ++++++++------
 api/src/com/cloud/storage/GuestOS.java             |   28 ++++++++------
 api/src/com/cloud/storage/GuestOsCategory.java     |   28 ++++++++------
 api/src/com/cloud/storage/Snapshot.java            |   28 ++++++++------
 api/src/com/cloud/storage/Storage.java             |   28 ++++++++------
 api/src/com/cloud/storage/StorageGuru.java         |   28 ++++++++------
 api/src/com/cloud/storage/StoragePool.java         |   28 ++++++++------
 api/src/com/cloud/storage/StoragePoolStatus.java   |   28 ++++++++------
 api/src/com/cloud/storage/StorageService.java      |   28 ++++++++------
 api/src/com/cloud/storage/StorageStats.java        |   28 ++++++++------
 api/src/com/cloud/storage/Swift.java               |   28 ++++++++------
 api/src/com/cloud/storage/Upload.java              |   28 ++++++++------
 .../storage/VMTemplateStorageResourceAssoc.java    |   28 ++++++++------
 api/src/com/cloud/storage/Volume.java              |   28 ++++++++------
 api/src/com/cloud/storage/VolumeStats.java         |   28 ++++++++------
 .../com/cloud/storage/snapshot/SnapshotPolicy.java |   28 ++++++++------
 .../cloud/storage/snapshot/SnapshotSchedule.java   |   28 ++++++++------
 .../cloud/storage/snapshot/SnapshotService.java    |   28 ++++++++------
 .../com/cloud/storage/template/TemplateInfo.java   |   28 ++++++++------
 api/src/com/cloud/template/BasedOn.java            |   28 ++++++++------
 api/src/com/cloud/template/TemplateService.java    |   28 ++++++++------
 .../com/cloud/template/VirtualMachineTemplate.java |   28 ++++++++------
 api/src/com/cloud/user/Account.java                |   28 ++++++++------
 api/src/com/cloud/user/AccountService.java         |   28 ++++++++------
 api/src/com/cloud/user/DomainService.java          |   28 ++++++++------
 api/src/com/cloud/user/OwnedBy.java                |   28 ++++++++------
 api/src/com/cloud/user/ResourceLimitService.java   |   28 ++++++++------
 api/src/com/cloud/user/SSHKeyPair.java             |   28 ++++++++------
 api/src/com/cloud/user/User.java                   |   28 ++++++++------
 api/src/com/cloud/user/UserAccount.java            |   28 ++++++++------
 api/src/com/cloud/user/UserContext.java            |   28 ++++++++------
 api/src/com/cloud/uservm/UserVm.java               |   28 ++++++++------
 api/src/com/cloud/vm/BareMetalVmService.java       |   28 ++++++++------
 api/src/com/cloud/vm/DiskProfile.java              |   28 ++++++++------
 api/src/com/cloud/vm/InstanceGroup.java            |   28 ++++++++------
 api/src/com/cloud/vm/Nic.java                      |   28 ++++++++------
 api/src/com/cloud/vm/NicProfile.java               |   28 ++++++++------
 api/src/com/cloud/vm/ReservationContext.java       |   28 ++++++++------
 api/src/com/cloud/vm/RunningOn.java                |   28 ++++++++------
 api/src/com/cloud/vm/UserVmService.java            |   28 ++++++++------
 api/src/com/cloud/vm/VirtualMachine.java           |   28 ++++++++------
 api/src/com/cloud/vm/VirtualMachineProfile.java    |   28 ++++++++------
 api/src/com/cloud/vm/VmStats.java                  |   28 ++++++++------
 cloud-cli/bindir/cloud-tool                        |   17 ++++++++
 cloud-cli/bindir/cloudvoladm                       |   17 ++++++++
 cloud-cli/cloudapis/__init__.py                    |   26 +++++++-----
 cloud-cli/cloudapis/cloud.py                       |   26 +++++++-----
 cloud-cli/cloudtool/__init__.py                    |   26 +++++++-----
 cloud-cli/cloudtool/utils.py                       |   26 +++++++-----
 daemonize/COPYING                                  |   26 ++++++++-----
 daemonize/daemonize.c                              |   19 +++++++++
 919 files changed, 14705 insertions(+), 10746 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/deletePod.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deletePod.sh b/agent-simulator/scripts/__old__/deletePod.sh
index 6ae1ab3..01cb7ce 100755
--- a/agent-simulator/scripts/__old__/deletePod.sh
+++ b/agent-simulator/scripts/__old__/deletePod.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 x=$1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/deleteServiceOffering.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deleteServiceOffering.sh b/agent-simulator/scripts/__old__/deleteServiceOffering.sh
index e973c9f..1a6c808 100755
--- a/agent-simulator/scripts/__old__/deleteServiceOffering.sh
+++ b/agent-simulator/scripts/__old__/deleteServiceOffering.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 x=$1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/deleteVlan.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deleteVlan.sh b/agent-simulator/scripts/__old__/deleteVlan.sh
index 8ca94c6..34ced90 100755
--- a/agent-simulator/scripts/__old__/deleteVlan.sh
+++ b/agent-simulator/scripts/__old__/deleteVlan.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 x=$1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/deployVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deployVirtualMachine.sh b/agent-simulator/scripts/__old__/deployVirtualMachine.sh
index 5330cc6..15539d2 100755
--- a/agent-simulator/scripts/__old__/deployVirtualMachine.sh
+++ b/agent-simulator/scripts/__old__/deployVirtualMachine.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 zoneid=$1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/listRouters.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/listRouters.sh b/agent-simulator/scripts/__old__/listRouters.sh
index 00b811a..d98a8e5 100755
--- a/agent-simulator/scripts/__old__/listRouters.sh
+++ b/agent-simulator/scripts/__old__/listRouters.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 query="GET	http://10.91.30.226:8096/client/?command=listRouters&zoneId=$1&account=admin&domainid=1	HTTP/1.0\n\n"

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/listVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/listVirtualMachine.sh b/agent-simulator/scripts/__old__/listVirtualMachine.sh
index e80203f..40e2a44 100755
--- a/agent-simulator/scripts/__old__/listVirtualMachine.sh
+++ b/agent-simulator/scripts/__old__/listVirtualMachine.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 query="GET	http://10.91.28.33:8096/client/?command=listVirtualMachines&zoneId=$1&account=admin&domainid=1	HTTP/1.0\n\n"

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/queryAsyncJobResult.sh b/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
index 20ff046..768b331 100755
--- a/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
+++ b/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
@@ -1,17 +1,20 @@
-#!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
- 
+#   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.
  
 usage() {
   printf "Query job result Usage: %s: -h management-server -j jobid\n" $(basename $0) >&2

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/run.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/run.sh b/agent-simulator/scripts/__old__/run.sh
index 73f52c7..015f3f7 100644
--- a/agent-simulator/scripts/__old__/run.sh
+++ b/agent-simulator/scripts/__old__/run.sh
@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
 
 
  

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/setupDirectPods.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupDirectPods.sh b/agent-simulator/scripts/__old__/setupDirectPods.sh
index da4c504..2a252d4 100755
--- a/agent-simulator/scripts/__old__/setupDirectPods.sh
+++ b/agent-simulator/scripts/__old__/setupDirectPods.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 x=$1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c15948a3/agent-simulator/scripts/__old__/setupHosts.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupHosts.sh b/agent-simulator/scripts/__old__/setupHosts.sh
index 126d146..b36d728 100755
--- a/agent-simulator/scripts/__old__/setupHosts.sh
+++ b/agent-simulator/scripts/__old__/setupHosts.sh
@@ -1,16 +1,20 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
+#!/usr/bin/env bash
+# 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
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
-
+#   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.
  
 
 name=$1


Mime
View raw message