Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9c019a9 
							
						 
					 
					
						
						
							
							All merge conflicts resolved  
						
						
						
						
					 
					
						2013-01-18 12:14:57 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2be270de89 
							
						 
					 
					
						
						
							
							Separate loadable components like Gurus, Elements, Adapters to componentContext.xml  
						
						
						
						
					 
					
						2013-01-16 16:33:59 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							3ec985f46f 
							
						 
					 
					
						
						
							
							StaticRoleBased: commands.properties is actually cfg for this plugin  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-14 19:01:26 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							896e505da6 
							
						 
					 
					
						
						
							
							APIChecker: Make interface generic, pass user and not just role  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-14 15:08:45 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							4c80684b1f 
							
						 
					 
					
						
						
							
							StaticRoleBasedAPIAccessChecker: Fix acl cfg processing error messages  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-11 18:44:20 -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 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							18bdc58ceb 
							
						 
					 
					
						
						
							
							APIAccessChecker: Refactor and simply plugin implementation using better data structures  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 17:21:58 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							757e1a931b 
							
						 
					 
					
						
						
							
							cleanup warnings in utils  
						
						
						
						
					 
					
						2013-01-10 17:19:30 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							345c179e77 
							
						 
					 
					
						
						
							
							plugins: Check access based on roleType, remove unnecessary properties.in file  
						
						... 
						
						
						
						- Fix StaticRoleBasedAPIAccessChecker to check api access based on roletype
- Remove properties file which is not needed now for api discovery plugin
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 15:55:02 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							f40e7b7511 
							
						 
					 
					
						
						
							
							removed componentlocator and inject  
						
						
						
						
					 
					
						2013-01-10 11:05:20 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							14bd345f1f 
							
						 
					 
					
						
						
							
							merge compiles  
						
						
						
						
					 
					
						2013-01-09 04:41:27 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0637b8c2 
							
						 
					 
					
						
						
							
							api: Refactor move acl to org.apache.cloudstack  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-06 15:30:58 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							c5b51b7c39 
							
						 
					 
					
						
						
							
							plugin: Remove memory mapping of apiname and class name in StaticRoleBasedAPIAccessChecker  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-02 18:43:59 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							bc8e0af0a3 
							
						 
					 
					
						
						
							
							plugin: ACL Static Role Based api access checker  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-02 17:06:19 -08:00