Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f237759cd3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/javelin' into javelin  
						
						 
						
						
						
						
					 
					
						2013-01-14 16:11:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a2f86003f0 
							
						 
					 
					
						
						
							
							refactor api  
						
						 
						
						
						
						
					 
					
						2013-01-14 16:07:03 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							61ff07e355 
							
						 
					 
					
						
						
							
							Fix POM that breaks the build  
						
						 
						
						
						
						
					 
					
						2013-01-14 10:16:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9faf00bdc8 
							
						 
					 
					
						
						
							
							Fix license on xml.in, jsp and ucls files on javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:34:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ea3f5ecb54 
							
						 
					 
					
						
						
							
							Fix license for xml files in javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:31:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ba20e7f85a 
							
						 
					 
					
						
						
							
							Fix license headers for java files in javelin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 06:27:09 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							fdc9103fbe 
							
						 
					 
					
						
						
							
							create-schema: Fix deploydb, drop existing (new) tables  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-12 03:43:35 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							40779975d3 
							
						 
					 
					
						
						
							
							ExtractVolumeCmd: Fix regression, use Zone Id for getting zone  
						
						 
						
						... 
						
						
						
						Fixes regression introduced in b14b39a69fa295d1d20484170b95b97fe310af28
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-11 18:44:20 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							a35db97355 
							
						 
					 
					
						
						
							
							NetworkService: Add method to interface to get network by uuid  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-11 18:44:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							35544f26e5 
							
						 
					 
					
						
						
							
							DeployVmCmd: Remove usage of IdentityDao, use Network to get by id or uuid  
						
						 
						
						... 
						
						
						
						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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							7960dd429b 
							
						 
					 
					
						
						
							
							utils: Fix getByUuid to accept string arg, it's not gonna be anything else  
						
						 
						
						... 
						
						
						
						Due to generic programming, most classes declare Daos with ID as Long, so they
get the getUuid(Long) definition, it has to be getUuid(String), uuid is not
gonna be anything else. Fix GenericDaoBase and GenericDao.
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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Noa Resare 
							
						 
					 
					
						
						
						
						
							
						
						
							1033200b0b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-933: CglibThrowableRendererTest writing stack traces...  
						
						 
						
						... 
						
						
						
						Improve CglibThrowableRenderer test case
Log to a separate Logger instead of the default one to avoid spurious
stack traces in test run output.
Actually verify that registering CglibThrowableRenderer with the
alternative log hierarchy actually removes call trace lines that
contains the string <generated> 
						
						
					 
					
						2013-01-11 17:09:44 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							d8ebd5e4f9 
							
						 
					 
					
						
						
							
							Summary: Change url of tiny linux in devcloud-kvm.sql  
						
						 
						
						... 
						
						
						
						Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357930366 -0700 
						
						
					 
					
						2013-01-11 11:52:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							66514c00ef 
							
						 
					 
					
						
						
							
							apidoc: Remove api discovery from toc  
						
						 
						
						... 
						
						
						
						Based on eb40d2337e0ae10876a27dfbc22575be8e9d593d
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-11 09:46:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							2b3084bba0 
							
						 
					 
					
						
						
							
							Per my veto vote on the dev list, reverting "SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak"  
						
						 
						
						... 
						
						
						
						This reverts commit 106730ccdde30450e96d080ed6c9791682fb7300. 
						
						
					 
					
						2013-01-11 10:19:38 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							499c474ed0 
							
						 
					 
					
						
						
							
							Autoscale Documentation : Reviewed-By: Jessica Tomechak  
						
						 
						
						
						
						
					 
					
						2013-01-11 17:53:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							eb40d2337e 
							
						 
					 
					
						
						
							
							apidoc: fixing the api doc failure  
						
						 
						
						... 
						
						
						
						remove api-discovery_commands.properties since the plugin returns the
listApis call as a map directly. not needed for api doc generation.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-01-11 17:04:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radhika PC 
							
						 
					 
					
						
						
						
						
							
						
						
							106730ccdd 
							
						 
					 
					
						
						
							
							SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak  
						
						 
						
						
						
						
					 
					
						2013-01-11 15:54:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							bb59c1e385 
							
						 
					 
					
						
						
							
							Revert "<message>"  
						
						 
						
						... 
						
						
						
						This reverts commit 5dd14f322c7332ebb5b9aee22f84209763e891e8. 
						
						
					 
					
						2013-01-11 15:51:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Author Name 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd14f322c 
							
						 
					 
					
						
						
							
							<message>  
						
						 
						
						
						
						
					 
					
						2013-01-11 15:47:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ca9fe7b0 
							
						 
					 
					
						
						
							
							Added Marvin building docs to dev guide  
						
						 
						
						
						
						
					 
					
						2013-01-11 10:57:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastien Goasguen 
							
						 
					 
					
						
						
						
						
							
						
						
							5f19c45e04 
							
						 
					 
					
						
						
							
							Added Marvin building docs in developer guide  
						
						 
						
						
						
						
					 
					
						2013-01-11 10:55:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Tomechak 
							
						 
					 
					
						
						
						
						
							
						
						
							2bc3b5cc6f 
							
						 
					 
					
						
						
							
							Docs. CLOUDSTACK-959. A sub-heading was inadvertently left out of the System Service Offerings section of documentation. Adding the section "Creating a New System Service Offering".  
						
						 
						
						
						
						
					 
					
						2013-01-11 01:30:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							86a77e29dc 
							
						 
					 
					
						
						
							
							ApiDiscovery: Fix listApis to return api response, related apis etc.  
						
						 
						
						... 
						
						
						
						- Fix method to return listApis per api name basis
- Return api response, api related cmd etc. as part of response
- Caching and processing all cmd, response classes when plugin starts, made class
  list, maps static so they are shared by multiple instances in case, takes about
  1306ms to do the processsing but only on load time
- Cache for first listApi() and return precached data thereon, takes 2.2ms
  for first call, during runtime and 0ms thereon
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 22:52:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f170075558 
							
						 
					 
					
						
						
							
							ApiDiscovery: Fix response add response class that will hold api response  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 22:48:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							3df026bd51 
							
						 
					 
					
						
						
							
							ApiDiscoveryServiceImpl: Implement listApis to return response based on role  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 18:51:38 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							8f26e171e6 
							
						 
					 
					
						
						
							
							ManagementServerImpl: Fix missing import of PropertiesUtil  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 15:55:02 -08:00