incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [54/54] [abbrv] git commit: Merge branch 'master' into ui-quick-view-v2
Date Tue, 08 Jan 2013 00:41:18 GMT
Updated Branches:
  refs/heads/ui-quick-view-v2 368a8e2bd -> 19aad357c


Merge branch 'master' into ui-quick-view-v2


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

Branch: refs/heads/ui-quick-view-v2
Commit: 19aad357c25691b9bd7e607aa8213c8a1e9d41ec
Parents: e77c99c 7235ba3
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Jan 7 16:41:02 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Jan 7 16:41:02 2013 -0800

----------------------------------------------------------------------
 LICENSE                                            | 3474 +++++++--------
 NOTICE                                             |  146 +-
 .../src/com/cloud/agent/MetricsCollector.java      |  107 -
 .../src/com/cloud/agent/MockVmMetrics.java         |  205 -
 .../src/com/cloud/agent/MultiCaster.java           |  152 -
 .../src/com/cloud/agent/MultiCasterListener.java   |   22 -
 .../src/com/cloud/agent/SimulatorCmd.java          |   37 -
 .../src/com/cloud/agent/SimulatorMigrateVmCmd.java |   83 -
 .../com/cloud/agent/manager/MockAgentManager.java  |   66 -
 .../cloud/agent/manager/MockAgentManagerImpl.java  |  468 --
 .../cloud/agent/manager/MockStorageManager.java    |   91 -
 .../agent/manager/MockStorageManagerImpl.java      | 1298 ------
 .../src/com/cloud/agent/manager/MockVmManager.java |   83 -
 .../com/cloud/agent/manager/MockVmManagerImpl.java |  615 ---
 .../src/com/cloud/agent/manager/SimulatorInfo.java |   59 -
 .../com/cloud/agent/manager/SimulatorManager.java  |   66 -
 .../cloud/agent/manager/SimulatorManagerImpl.java  |  336 --
 .../com/cloud/api/commands/ConfigureSimulator.java |   82 -
 .../configuration/SimulatorComponentLibrary.java   |   50 -
 .../src/com/cloud/resource/AgentResourceBase.java  |  284 --
 .../com/cloud/resource/AgentRoutingResource.java   |  363 --
 .../com/cloud/resource/AgentStorageResource.java   |  117 -
 .../com/cloud/resource/SimulatorDiscoverer.java    |  336 --
 .../resource/SimulatorSecondaryDiscoverer.java     |  151 -
 .../server/ManagementServerSimulatorImpl.java      |   32 -
 .../com/cloud/simulator/MockConfigurationVO.java   |  121 -
 .../src/com/cloud/simulator/MockHost.java          |   62 -
 .../src/com/cloud/simulator/MockHostVO.java        |  276 --
 .../src/com/cloud/simulator/MockSecStorageVO.java  |   76 -
 .../com/cloud/simulator/MockSecurityRulesVO.java   |  104 -
 .../src/com/cloud/simulator/MockStoragePoolVO.java |  102 -
 .../src/com/cloud/simulator/MockVMVO.java          |  130 -
 .../src/com/cloud/simulator/MockVm.java            |   45 -
 .../src/com/cloud/simulator/MockVolumeVO.java      |  118 -
 .../src/com/cloud/simulator/SimulatorGuru.java     |   59 -
 .../cloud/simulator/SimulatorRuntimeException.java |   41 -
 .../cloud/simulator/dao/MockConfigurationDao.java  |   27 -
 .../simulator/dao/MockConfigurationDaoImpl.java    |  142 -
 .../src/com/cloud/simulator/dao/MockHostDao.java   |   27 -
 .../com/cloud/simulator/dao/MockHostDaoImpl.java   |   55 -
 .../com/cloud/simulator/dao/MockSecStorageDao.java |   24 -
 .../cloud/simulator/dao/MockSecStorageDaoImpl.java |   42 -
 .../cloud/simulator/dao/MockSecurityRulesDao.java  |   27 -
 .../simulator/dao/MockSecurityRulesDaoImpl.java    |   60 -
 .../cloud/simulator/dao/MockStoragePoolDao.java    |   25 -
 .../simulator/dao/MockStoragePoolDaoImpl.java      |   57 -
 .../src/com/cloud/simulator/dao/MockVMDao.java     |   29 -
 .../src/com/cloud/simulator/dao/MockVMDaoImpl.java |   92 -
 .../src/com/cloud/simulator/dao/MockVolumeDao.java |   30 -
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |  101 -
 api/src/com/cloud/agent/api/to/FirewallRuleTO.java |    1 +
 api/src/com/cloud/agent/api/to/LoadBalancerTO.java |   12 +-
 .../com/cloud/agent/api/to/StaticNatRuleTO.java    |    5 +
 api/src/com/cloud/api/commands/ListS3sCmd.java     |   37 -
 api/src/com/cloud/api/response/UserResponse.java   |   10 +
 api/src/com/cloud/network/Network.java             |    1 +
 api/src/com/cloud/network/element/IpDeployer.java  |    3 +
 .../network/element/IpDeployingRequester.java      |   28 +
 .../element/LoadBalancingServiceProvider.java      |    3 +-
 .../element/PortForwardingServiceProvider.java     |    4 +-
 .../element/RemoteAccessVPNServiceProvider.java    |    4 +-
 .../network/element/SourceNatServiceProvider.java  |    5 +-
 .../network/element/StaticNatServiceProvider.java  |    4 +-
 api/src/com/cloud/offering/NetworkOffering.java    |    1 +
 awsapi/pom.xml                                     |   27 +
 build/package.xml                                  |    4 +
 client/pom.xml                                     |   26 +-
 client/tomcatconf/commands.properties.in           |    9 +-
 client/tomcatconf/simulator.properties.in          |   31 -
 client/tomcatconf/simulator_commands.properties.in |   19 +
 developer/developer-prefill.sql                    |    2 +
 developer/pom.xml                                  |  134 +-
 docs/en-US/changing-secondary-storage-servers.xml  |    2 +-
 docs/en-US/changing-secondary-storage-serversp.xml |   36 -
 docs/en-US/configure-xenserver-dom-memory.xml      |   29 -
 .../debian/config/etc/init.d/cloud-early-config    |    1 +
 .../debian/config/opt/cloud/bin/ipassoc.sh         |    4 +-
 .../debian/config/opt/cloud/bin/passwd_server      |    2 +-
 .../config/root/redundant_router/disable_pubip.sh  |    2 -
 .../root/redundant_router/enable_pubip.sh.templ    |    4 +-
 .../config/root/redundant_router/master.sh.templ   |    6 +
 .../config/root/redundant_router/services.sh       |   68 +
 .../systemvm/debian/config/root/savepassword.sh    |    2 +-
 plugins/hypervisors/simulator/pom.xml              |   45 +
 .../simulator/resources/components-simulator.xml   |   66 +
 .../src/com/cloud/agent/MetricsCollector.java      |  107 +
 .../src/com/cloud/agent/MockVmMetrics.java         |  204 +
 .../simulator/src/com/cloud/agent/MultiCaster.java |  152 +
 .../src/com/cloud/agent/MultiCasterListener.java   |   22 +
 .../src/com/cloud/agent/SimulatorCmd.java          |   37 +
 .../src/com/cloud/agent/SimulatorMigrateVmCmd.java |   83 +
 .../com/cloud/agent/manager/MockAgentManager.java  |   64 +
 .../cloud/agent/manager/MockAgentManagerImpl.java  |  459 ++
 .../cloud/agent/manager/MockStorageManager.java    |   82 +
 .../agent/manager/MockStorageManagerImpl.java      | 1328 ++++++
 .../src/com/cloud/agent/manager/MockVmManager.java |   84 +
 .../com/cloud/agent/manager/MockVmManagerImpl.java |  642 +++
 .../src/com/cloud/agent/manager/SimulatorInfo.java |   59 +
 .../com/cloud/agent/manager/SimulatorManager.java  |   65 +
 .../cloud/agent/manager/SimulatorManagerImpl.java  |  329 ++
 .../com/cloud/api/commands/ConfigureSimulator.java |   82 +
 .../configuration/SimulatorComponentLibrary.java   |   50 +
 .../src/com/cloud/resource/AgentResourceBase.java  |  284 ++
 .../com/cloud/resource/AgentRoutingResource.java   |  363 ++
 .../com/cloud/resource/AgentStorageResource.java   |  117 +
 .../com/cloud/resource/SimulatorDiscoverer.java    |  336 ++
 .../resource/SimulatorSecondaryDiscoverer.java     |  178 +
 .../server/ManagementServerSimulatorImpl.java      |   32 +
 .../com/cloud/simulator/MockConfigurationVO.java   |  120 +
 .../src/com/cloud/simulator/MockHost.java          |   62 +
 .../src/com/cloud/simulator/MockHostVO.java        |  276 ++
 .../src/com/cloud/simulator/MockSecStorageVO.java  |   76 +
 .../com/cloud/simulator/MockSecurityRulesVO.java   |  104 +
 .../src/com/cloud/simulator/MockStoragePoolVO.java |  102 +
 .../src/com/cloud/simulator/MockVMVO.java          |  140 +
 .../simulator/src/com/cloud/simulator/MockVm.java  |   47 +
 .../src/com/cloud/simulator/MockVolumeVO.java      |  118 +
 .../src/com/cloud/simulator/SimulatorGuru.java     |   59 +
 .../cloud/simulator/SimulatorRuntimeException.java |   41 +
 .../cloud/simulator/dao/MockConfigurationDao.java  |   27 +
 .../simulator/dao/MockConfigurationDaoImpl.java    |  142 +
 .../src/com/cloud/simulator/dao/MockHostDao.java   |   27 +
 .../com/cloud/simulator/dao/MockHostDaoImpl.java   |   55 +
 .../com/cloud/simulator/dao/MockSecStorageDao.java |   24 +
 .../cloud/simulator/dao/MockSecStorageDaoImpl.java |   42 +
 .../cloud/simulator/dao/MockSecurityRulesDao.java  |   27 +
 .../simulator/dao/MockSecurityRulesDaoImpl.java    |   60 +
 .../cloud/simulator/dao/MockStoragePoolDao.java    |   25 +
 .../simulator/dao/MockStoragePoolDaoImpl.java      |   57 +
 .../src/com/cloud/simulator/dao/MockVMDao.java     |   29 +
 .../src/com/cloud/simulator/dao/MockVMDaoImpl.java |   92 +
 .../src/com/cloud/simulator/dao/MockVolumeDao.java |   30 +
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |  101 +
 plugins/hypervisors/vmware/pom.xml                 |    6 +-
 .../xen/resource/CitrixResourceBase.java           |    9 +-
 plugins/network-elements/dns-notifier/pom.xml      |   50 +
 .../dns-notifier/resources/components-example.xml  |  220 +
 .../cloudstack/network/element/DnsNotifier.java    |  143 +
 .../network/lb/ElasticLoadBalancerManagerImpl.java |    2 +-
 .../cloud/api/response/F5LoadBalancerResponse.java |    7 -
 .../element/F5ExternalLoadBalancerElement.java     |   16 +-
 .../cloud/network/resource/F5BigIpResource.java    |   94 +-
 .../element/JuniperSRXExternalFirewallElement.java |   21 +-
 .../cloud/network/resource/JuniperSrxResource.java |  239 +-
 .../response/NetscalerLoadBalancerResponse.java    |    7 -
 .../cloud/network/element/NetscalerElement.java    |   33 +-
 .../cloud/network/element/NiciraNvpElement.java    |    3 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |    7 +-
 .../src/com/cloud/network/nicira/NiciraNvpApi.java |    2 +-
 .../network/element/NiciraNvpElementTest.java      |  119 +
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |  114 +
 .../src/com/cloud/network/element/OvsElement.java  |   13 +-
 plugins/pom.xml                                    |   13 +
 pom.xml                                            |    2 -
 .../network/juniper/firewall-filter-term-add.xml   |   43 +
 .../juniper/firewall-filter-term-getone.xml        |   32 +
 scripts/network/juniper/template-entry.xml         |   21 +
 scripts/vm/network/vnet/modifyvlan.sh              |    2 +
 server/pom.xml                                     |    1 +
 server/src/com/cloud/api/ApiDBUtils.java           |    4 +
 server/src/com/cloud/api/ApiResponseHelper.java    |    8 +-
 server/src/com/cloud/configuration/Config.java     |    4 +
 .../configuration/ConfigurationManagerImpl.java    |  131 +-
 .../network/ExternalFirewallDeviceManager.java     |    9 +
 .../network/ExternalFirewallDeviceManagerImpl.java |  185 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |  320 +-
 .../network/ExternalLoadBalancerDeviceVO.java      |   18 +-
 .../cloud/network/InlineLoadBalancerNicMapVO.java  |   10 +-
 server/src/com/cloud/network/NetworkManager.java   |   11 +
 .../src/com/cloud/network/NetworkManagerImpl.java  |  220 +-
 .../com/cloud/network/dao/FirewallRulesDao.java    |    4 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |   15 +
 server/src/com/cloud/network/dao/NetworkDao.java   |    1 +
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |    9 +
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   20 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   16 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |  169 +-
 .../src/com/cloud/offerings/NetworkOfferingVO.java |   11 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    2 +-
 .../src/com/cloud/server/ManagementServerImpl.java |   26 +
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |    4 +
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |  140 +
 server/src/com/cloud/storage/s3/S3ManagerImpl.java |    5 -
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |   10 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    2 +-
 server/src/com/cloud/vm/dao/NicDao.java            |    2 +
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |    8 +
 .../com/cloud/network/MockNetworkManagerImpl.java  |   35 +
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   33 +
 .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java |    6 +
 setup/db/create-schema-simulator.sql               |    2 +
 setup/db/create-schema.sql                         |    6 +-
 setup/db/db/schema-40to41.sql                      |   23 -
 setup/db/db/schema-40to410.sql                     |   18 +
 setup/db/templates.simulator.sql                   |  437 +--
 test/integration/component/test_snapshots.py       |    6 +-
 tools/cli/cloudmonkey/cloudmonkey.py               |  136 +-
 tools/cli/cloudmonkey/common.py                    |    1 +
 tools/cli/setup.py                                 |    4 +-
 tools/marvin/marvin/cloudstackConnection.py        |    1 -
 tools/marvin/marvin/configGenerator.py             |   11 +
 tools/marvin/marvin/deployDataCenter.py            |   29 +-
 tools/marvin/marvin/jsonHelper.py                  |    2 +-
 .../marvin/sandbox/demo/simulator/simulator.cfg    |    4 -
 tools/whisker/descriptor.xml                       |   43 +-
 ui/css/cloudstack3.css                             |   84 +-
 ui/images/icons.png                                |  Bin 49385 -> 50745 bytes
 ui/scripts/accounts.js                             |   33 +-
 ui/scripts/network.js                              |    4 +-
 ui/scripts/sharedFunctions.js                      |   16 +
 ui/scripts/ui/widgets/listView.js                  |    2 +
 utils/conf/db.properties                           |   11 +
 utils/pom.xml                                      |    1 +
 utils/src/com/cloud/utils/db/DbUtil.java           |   59 +
 vmware-base/pom.xml                                |    6 +-
 215 files changed, 11833 insertions(+), 10037 deletions(-)
----------------------------------------------------------------------



Mime
View raw message