Commit Graph

76 Commits

Author SHA1 Message Date
Prachi Damle f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Anshul Gangwar 513f1dba36 CLOUDSTACK-5705: fixed the thumbnail not wrking for hyperv 2014-01-23 10:54:08 +05:30
Anshul Gangwar b2de225f54 CLOUDSTACK-5703: putting rdp server port value in host details 2014-01-23 10:54:08 +05:30
Anshul Gangwar 5941ac46d2 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2014-01-23 10:54:08 +05:30
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management
of keys out of management server
2014-01-14 13:11:35 -08:00
Sanjay Tripathi f6b063de79 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 18:17:22 +05:30
Prachi Damle 9d0d96225d more of account_type refactoring 2013-11-21 16:03:19 -08:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Prachi Damle e0d2423f06 Refactoring account_type for Domain_Admin and Normal_User types 2013-11-20 16:53:59 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Min Chen 2ef4d5200c Merge branch 'master' into rbac. 2013-10-31 17:16:33 -07:00
Darren Shepherd f62e28c1ec New Transaction API
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Prachi Damle aba54356d5 Account_Type Refactoring for Root Admin Role
- change the AccountService::isRootAdmin(short) to  isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
2013-09-24 15:31:09 -07:00
Likitha Shetty b7c5068327 CLOUDSTACK-4186. Signature computed while accessing VM's console is not aligned with how signature is computed for other APIs 2013-08-08 16:29:12 +05:30
Alex Huang 319d91e1c2 Removed the getByTypeAndId() method and replace it with getById method 2013-07-22 20:06:04 -07:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Kelven Yang 34f8f795e1 CLOUDSTACK-2039: Improve console access security with 128-bit AES encryption and securely-randomized key generation 2013-04-15 16:52:22 -07:00
Kelven Yang da2e6461a6 Remove temporary hacking and use Official way to wire-up servlet with injection under Spring 2013-01-30 15:21:01 -08:00
Kelven Yang f8e5740c31 A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes 2013-01-24 18:04:48 -08:00
Kelven Yang 6fb1a1e6f1 Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
Alex Huang fac2270240 more files changed 2013-01-10 15:29:14 -08:00
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Rohit Yadav 6fc3bc3760 api_refactor: refactor vpn and vm apis
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
Kelven Yang 3609e44b58 commit for https://reviews.apache.org/r/6608/ 2012-08-27 10:39:49 -07:00
Kelven Yang 04bf1a33c6 apply patch https://reviews.apache.org/r/6572/ 2012-08-13 17:28:41 -07:00
Alex Huang c1c952b42b should have used non url safe 2012-08-07 16:58:16 -07:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
David Nalley e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
David Nalley ae4b66283a cleaning up some line endings 2012-07-02 09:50:28 -04:00
Kelven Yang e8a5d51da7 Support console access through rebooting with XAPI session re-negotiation 2012-05-16 17:02:22 -07:00
Kelven Yang c5083787c2 Hardening console proxy AJAX protocol to address security concerns 2012-04-19 12:10:33 -07:00
Rajesh Battala 327049b5c5 CS-14546: Fixed bug Unable to view console in System and Guest VMs and Added Upgrade script 2012-04-19 21:15:45 +05:30
Kelven Yang 8b8973f941 Complete XenServer Secure Console proxy implementation 2012-04-10 15:57:52 -07:00
Rajesh Battala 3cbb8bc198 Xenserver Secure Console Proxy Phase I 2012-04-10 18:01:56 +05:30
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Kelven Yang 8f2b6dc791 do not default display name from null to other name like host name 2012-01-30 14:57:50 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
Alena Prokharchyk c581506103 bug 12306: list* command revamp 2012-01-09 10:07:42 -08:00
Alena Prokharchyk 209c4aa881 bug 12444: allow accessing Project's vms console
status 12444: resolved fixed
2011-12-08 14:38:21 -08:00
Kelven Yang c3eba2933e bug 11973: Escape VM name to prevent from XSS attack. Reviewed-by: Alex huang 2011-11-28 11:38:31 -08:00
Kelven Yang d9c41df1a1 Make console proxy support UUID 2011-11-03 16:24:08 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature:
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
Kelven Yang 0421eafba0 bug 10765: add japanese keyboard support for linux OSes 2011-08-31 15:53:01 -07:00
Kelven Yang 1abbc007ba bug 8954: only root admin can access console proxy, SSVM and DomR 2011-03-23 14:46:34 -07:00
Kelven Yang 7168278455 Console access API with API key, there is an issue that it actually depends on existing web session. This is the fix for it 2011-03-21 11:28:31 -07:00
Kelven Yang 3113ae4993 Add display name to user VM in console title 2011-02-11 11:43:00 -08:00
Kelven Yang 737954bed8 1) prepare to seperate volume/snapshot logic to secondary storage VM
2) Add vmware.service.console configuration variable to allow customized VMware setup
2011-02-10 16:41:19 -08:00