Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77ae066c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77ae066c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77ae066c Branch: refs/heads/internallb Commit: 77ae066c6574c8dce31e5a6a083920880647cbe9 Parents: 134704b d3c82b3 Author: Sebastien Goasguen <run...@gmail.com> Authored: Mon Apr 29 06:56:51 2013 -0400 Committer: Sebastien Goasguen <run...@gmail.com> Committed: Mon Apr 29 06:56:51 2013 -0400 ---------------------------------------------------------------------- agent/conf/agent.properties | 2 +- .../cloud/configuration/ConfigurationService.java | 15 +- api/src/com/cloud/network/NetworkModel.java | 2 +- api/src/com/cloud/network/NetworkService.java | 2 +- .../apache/cloudstack/api/ResponseGenerator.java | 4 +- .../api/command/admin/cluster/ListClustersCmd.java | 8 +- .../api/command/admin/config/ListCfgsByCmd.java | 44 +- .../api/command/admin/config/UpdateCfgCmd.java | 47 +- .../api/command/admin/host/ListHostsCmd.java | 7 + .../api/command/admin/pod/ListPodsByCmd.java | 7 + .../api/command/admin/router/ListRoutersCmd.java | 7 + .../command/admin/systemvm/ListSystemVMsCmd.java | 7 + .../api/command/user/iso/ListIsosCmd.java | 7 + .../api/command/user/network/ListNetworksCmd.java | 7 + .../command/user/snapshot/ListSnapshotsCmd.java | 7 + .../command/user/template/ListTemplatesCmd.java | 8 + .../api/command/user/vm/AddIpToVmNicCmd.java | 9 +- .../api/command/user/zone/ListZonesByCmd.java | 8 + .../api/response/ConfigurationResponse.java | 3 + .../api/command/test/AddIpToVmNicTest.java | 6 +- .../WEB-INF/classes/resources/messages.properties | 15 +- .../classes/resources/messages_ca.properties | 1 + .../classes/resources/messages_de_DE.properties | 1 + .../classes/resources/messages_es.properties | 1 + .../classes/resources/messages_fr_FR.properties | 1788 +++++----- .../classes/resources/messages_it_IT.properties | 1 + .../classes/resources/messages_ja.properties | 2679 ++++++++------- .../classes/resources/messages_ko_KR.properties | 1 + .../classes/resources/messages_nb_NO.properties | 1 + .../classes/resources/messages_pt_BR.properties | 1 + .../classes/resources/messages_ru_RU.properties | 3 +- .../classes/resources/messages_zh_CN.properties | 1 + client/pom.xml | 11 +- client/tomcatconf/applicationContext.xml.in | 4 + core/src/com/cloud/async/AsyncJobVO.java | 1 + docs/en-US/added-API-commands-4.2.xml | 24 + docs/en-US/delete-event-alerts.xml | 12 + docs/en-US/events.xml | 2 +- docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes packaging/centos63/package.sh | 4 +- .../debian/config/etc/init.d/cloud-early-config | 8 + server/src/com/cloud/alert/AlertManagerImpl.java | 27 +- server/src/com/cloud/api/ApiDBUtils.java | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 32 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 21 +- .../cloud/api/query/dao/AccountJoinDaoImpl.java | 6 +- .../api/query/dao/DomainRouterJoinDaoImpl.java | 6 +- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 6 +- .../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +- .../api/query/dao/StoragePoolJoinDaoImpl.java | 6 +- .../api/query/dao/UserAccountJoinDaoImpl.java | 6 +- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +- .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +- .../src/com/cloud/api/query/vo/AccountJoinVO.java | 6 +- .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 6 +- server/src/com/cloud/api/query/vo/HostJoinVO.java | 6 +- .../cloud/api/query/vo/SecurityGroupJoinVO.java | 6 +- .../com/cloud/api/query/vo/StoragePoolJoinVO.java | 6 +- .../com/cloud/api/query/vo/UserAccountJoinVO.java | 6 +- .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 6 +- .../src/com/cloud/api/query/vo/VolumeJoinVO.java | 6 +- server/src/com/cloud/capacity/dao/CapacityDao.java | 2 +- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 35 +- server/src/com/cloud/configuration/Config.java | 20 +- .../cloud/configuration/ConfigurationManager.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 173 +- server/src/com/cloud/deploy/FirstFitPlanner.java | 25 +- .../src/com/cloud/network/NetworkManagerImpl.java | 7 +- server/src/com/cloud/network/NetworkModelImpl.java | 11 +- .../src/com/cloud/network/NetworkServiceImpl.java | 36 +- .../network/firewall/FirewallManagerImpl.java | 12 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 6 +- .../com/cloud/server/ConfigurationServerImpl.java | 11 +- .../src/com/cloud/server/ManagementServerImpl.java | 153 +- .../storage/dao/StoragePoolDetailsDaoImpl.java | 1 + .../src/com/cloud/storage/dao/VMTemplateDao.java | 2 +- .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 11 +- .../storage/snapshot/SnapshotManagerImpl.java | 32 +- .../com/cloud/template/TemplateAdapterBase.java | 7 +- .../com/cloud/template/TemplateManagerImpl.java | 10 +- .../upgrade/PremiumDatabaseUpgradeChecker.java | 75 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 11 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 + .../com/cloud/network/MockNetworkManagerImpl.java | 2 +- .../com/cloud/network/MockNetworkModelImpl.java | 2 +- .../cloud/vpc/MockConfigurationManagerImpl.java | 8 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkModelImpl.java | 2 +- .../affinity/AffinityApiTestConfiguration.java | 29 +- .../networkoffering/ChildTestConfiguration.java | 38 +- setup/db/db/schema-410to420.sql | 4 + .../component/test_multiple_ip_ranges.py | 238 ++ test/integration/component/test_vpn_users.py | 447 +++ test/integration/smoke/test_global_settings.py | 14 +- tools/marvin/marvin/asyncJobMgr.py | 70 +- tools/marvin/marvin/cloudstackConnection.py | 17 +- tools/marvin/marvin/cloudstackTestClient.py | 53 +- tools/marvin/marvin/dbConnection.py | 6 +- tools/marvin/marvin/deployDataCenter.py | 7 + tools/marvin/marvin/integration/lib/base.py | 600 +++- tools/marvin/marvin/integration/lib/utils.py | 17 +- tools/marvin/marvin/remoteSSHClient.py | 18 +- tools/transifex/.tx/config | 31 + tools/transifex/README-transifex.txt | 71 + tools/transifex/sync-transifex-ui.sh | 158 + ui/css/cloudstack3.css | 71 +- ui/dictionary.jsp | 1710 +++++----- ui/images/icons.png | Bin 50745 -> 50052 bytes ui/images/sprites.png | Bin 188552 -> 192407 bytes ui/index.jsp | 19 +- ui/scripts/affinity.js | 183 + ui/scripts/cloudStack.js | 9 +- ui/scripts/domains.js | 2 +- ui/scripts/instanceWizard.js | 941 +++--- ui/scripts/instances.js | 151 +- ui/scripts/regions.js | 27 +- ui/scripts/sharedFunctions.js | 4 + ui/scripts/storage.js | 2 +- ui/scripts/system.js | 348 ++- ui/scripts/ui-custom/affinity.js | 173 + ui/scripts/ui-custom/instanceWizard.js | 19 + ui/scripts/ui/widgets/detailView.js | 29 +- ui/scripts/ui/widgets/listView.js | 10 +- 124 files changed, 6950 insertions(+), 4172 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77ae066c/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --cc client/WEB-INF/classes/resources/messages.properties index 9f84c5a,ad8f42b..bab65de --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@@ -627,11 -637,13 +637,14 @@@ label.lang.catalan=Catala label.lang.chinese=Chinese (Simplified) label.lang.english=English label.lang.french=French + label.lang.german=German + label.lang.italian=Italian label.lang.japanese=Japanese label.lang.korean=Korean + label.lang.norwegian=Norwegian label.lang.russian=Russian label.lang.spanish=Spanish +label.lang.arabic=Arabic label.last.disconnected=Last Disconnected label.last.name=Last Name label.latest.events=Latest events http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77ae066c/ui/index.jsp ----------------------------------------------------------------------
