etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,443 Commits 323 Branches 325 Tags 976 MiB
Commit Graph

5936 Commits

Author SHA1 Message Date
Kelven Yang e5507c3892 Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption 2013-01-17 18:55:14 -08:00
Rohit Yadav b45cdef5d9 DatabaseCreator: Process db props, sql and upgrade classes separately 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 18:25:27 -08:00
Kelven Yang 17a94b20ec Always use premium setting in ConsoleProxyManager 2013-01-17 18:23:06 -08:00
Rohit Yadav 8d016d035b MockConfigurationDaoImpl: Fix build issue, add base class method 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 16:15:15 -08:00
Rohit Yadav ef07cde449 DBCreator: Fix ScriptRunner to strip comments, reformat code 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 16:10:07 -08:00
Kelven Yang 6d155416c2 System VM can start now with Spring bootstraped management server 2013-01-17 14:22:14 -08:00
Alex Huang cbb7ff1c32 added missing files 2013-01-17 06:50:59 -08:00
Alex Huang b751b69c55 Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin 2013-01-17 06:50:19 -08:00
Alex Huang 9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Kelven Yang 497dcd5044 Get rid of PlugService annotation, replace it with Spring standard injection in command classes 2013-01-16 18:44:44 -08:00
Kelven Yang 2be270de89 Separate loadable components like Gurus, Elements, Adapters to componentContext.xml 2013-01-16 16:33:59 -08:00
Kelven Yang 727fab71cb Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run 2013-01-16 14:16:01 -08:00
Kelven Yang 4c1257bf18 Handle proxy object situation in dispatching API command 2013-01-16 11:28:09 -08:00
Kelven Yang df684261cf Put command classes under Spring injection framework 2013-01-15 18:07:19 -08:00
Kelven Yang af67d87662 Fix issues with @DB support in Spring environment 2013-01-15 12:35:03 -08:00
Kelven Yang f304df44df Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP 2013-01-14 17:44:31 -08:00
Kelven Yang 96bd1d4172 Forget to save changed file in last commit 2013-01-14 14:10:47 -08:00
Kelven Yang 6dfbcee63d Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment 2013-01-14 13:57:30 -08:00
Kelven Yang 64c947a9f8 Re-fix startup of management server 2013-01-14 10:52:37 -08:00
Rohit Yadav 38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:02:54 -08:00
Rohit Yadav 452e9c3efd maven: Remove duplicate cloud-core dependency in server 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 03:41:27 -08:00
Rohit Yadav ad063ed610 StaticRoleBasedAPIAccessChecker: Throw exception on failed check 
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 19:24:11 -08:00
Rohit Yadav 0dca44efe8 ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 83e7214b02 ConsoleProxyManagerImpl: Get rid of IdentityDao 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 8eba0ee0bb ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 8cdb40a416 NetworkManagerImpl: Add method to getNetwork by uuid 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Rohit Yadav 24687973a8 ApiServer: Get rid of IdentityDao, reuse domain manager to get domain id 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Rohit Yadav 31dd412626 DomainService: Fix getDomain by uuid string 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Kelven Yang 6fb1a1e6f1 Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
Kelven Yang f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Kelven Yang 53da542001 Another round of fixes after merge 2013-01-11 15:21:04 -08:00
Rohit Yadav 74bb043c37 APIChecker: Rename refactor and add interface checkExistence 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 18:51:30 -08:00
Alex Huang 757e1a931b cleanup warnings in utils 2013-01-10 17:19:30 -08:00
Rohit Yadav e63e352508 ApiServer: Log a better message if api access fails and debug it 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 16:08:16 -08:00
Alex Huang 1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00
Alex Huang d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00
Rohit Yadav 8f26e171e6 ManagementServerImpl: Fix missing import of PropertiesUtil 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:02 -08:00
Rohit Yadav c4e890c55d PluggableService: Refactor method to return map of key value pairs 
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
  properties map which is apiname:rolemask (both are strings)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:02 -08:00
Rohit Yadav a56f355ceb ApiServer: get role type from account manager using account 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:01 -08:00
Rohit Yadav 1425736c19 AccountManager: Add method to translate account type to role type 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:01 -08:00
Alex Huang fac2270240 more files changed 2013-01-10 15:29:14 -08:00
Alex Huang f922c6fc03 Keep removing 2013-01-10 14:46:52 -08:00
Rohit Yadav 62a42723f9 APIAccessChecker: Make it check based on role type and not user 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 11:49:15 -08:00
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang 395de6f2b3 merge from latest pull 2013-01-10 11:07:11 -08:00
Alex Huang f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Kishan Kavala cd7f771615 CLOUDSTACK-721: Fixed network usage. Send network usage command for isolated guest nic of non VPC VR. Send network usage command for public nic in VPC VR. 2013-01-10 14:56:11 +05:30
Min Chen 7f8262d45e Remove IdentityProxy and IdentityTypeAdapter class. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-09 17:40:58 -08:00
Kelven Yang 0bcebd33b6 Fix problems after merge 2013-01-09 17:36:53 -08:00
Rohit Yadav 657fb6ac0b ApiServer: Don't depend on plugin for apiname:cmd class mapping 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-09 17:20:46 -08:00