Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							891b85d516 
							
						 
					 
					
						
						
							
							Add missing licenses  
						
						
						
						
					 
					
						2013-10-23 15:20:08 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							67186429e1 
							
						 
					 
					
						
						
							
							Spring Modularization  
						
						... 
						
						
						
						ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors. 
						
						
					 
					
						2013-10-02 15:41:04 -07:00 
						 
				 
			
				
					
						
							
							
								Ian Duffy 
							
						 
					 
					
						
						
						
						
							
						
						
							bdba0ddeed 
							
						 
					 
					
						
						
							
							Bring up to date with master  
						
						
						
						
					 
					
						2013-08-31 00:25:48 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5495f10bce 
							
						 
					 
					
						
						
							
							Revert "Reverting the range of commits that broke the build"  
						
						... 
						
						
						
						This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387. 
						
						
					 
					
						2013-08-08 15:02:40 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b59e3aaefc 
							
						 
					 
					
						
						
							
							Reverting the range of commits that broke the build  
						
						... 
						
						
						
						This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-08-08 14:46:56 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							942f282a6e 
							
						 
					 
					
						
						
							
							Moved config into it's own package  
						
						
						
						
					 
					
						2013-08-07 16:41:02 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							8225374138 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.3.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chipchilders@apache.org> 
						
						
					 
					
						2013-08-01 10:35:00 -04:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3f7c558de5 
							
						 
					 
					
						
						
							
							Removed all the extra mockito, inject, and junit dependencies.  Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project  
						
						
						
						
					 
					
						2013-07-26 16:34:08 -07:00 
						 
				 
			
				
					
						
							
							
								Ian Duffy 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa4143371 
							
						 
					 
					
						
						
							
							Merge LDAPPlugin  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-25 17:54:52 +05:30 
						 
				 
			
				
					
						
							
							
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							11e1e585b1 
							
						 
					 
					
						
						
							
							UserContext switched to CallContext.  Added generic storage mechanism for other code to carry information throughout a call.  Made the calling User and Account a must have.  Added an interface to carry entities in error.  Fixed up the code.  Part of the vmsync branch  
						
						
						
						
					 
					
						2013-07-16 11:24:21 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9c5c4753e9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1484: provide api.throttling.enabled gloabl configuration settings to enable/disable api throttling feature.  
						
						
						
						
					 
					
						2013-03-05 09:44:09 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5750fd9631 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1190: make APIChecker throw one sensible exception.  
						
						
						
						
					 
					
						2013-03-05 09:44:08 -08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5147fb16ac 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1253: Remove @author tag.  
						
						
						
						
					 
					
						2013-02-15 10:42:06 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							0b1e3a4af0 
							
						 
					 
					
						
						
							
							Move Api rate limit configurations from xml file to global  
						
						... 
						
						
						
						configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption. 
						
						
					 
					
						2013-02-08 00:02:25 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d71cfc1aec 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects"  
						
						... 
						
						
						
						This reverts commit 9b691fc443cc27f1e2026ec239fc4aa11a4167aa. 
						
						
					 
					
						2013-02-07 21:49:37 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9b691fc443 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-07 18:23:49 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b2b369ecb 
							
						 
					 
					
						
						
							
							Merge latest master into javelin  
						
						
						
						
					 
					
						2013-01-31 11:34:49 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							85de14f6a4 
							
						 
					 
					
						
						
							
							Increase sleep time to allow token expire to account for windows  
						
						... 
						
						
						
						environment clock issue. 
						
						
					 
					
						2013-01-29 11:19:09 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1c20c80cb5 
							
						 
					 
					
						
						
							
							Fix unit test failure only on Windows environment.  
						
						
						
						
					 
					
						2013-01-29 11:09:06 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							356866c72b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into javelin  
						
						... 
						
						
						
						- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-24 19:18:53 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							805261a93f 
							
						 
					 
					
						
						
							
							Change a debug message to TRACE level.  
						
						
						
						
					 
					
						2013-01-17 15:16:50 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							86ada92ffa 
							
						 
					 
					
						
						
							
							Fix some bugs and add java integration test for api rate limit plugin.  
						
						
						
						
					 
					
						2013-01-17 15:13:51 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							06fa338d42 
							
						 
					 
					
						
						
							
							Add some tests for api rate limit plugin.  
						
						
						
						
					 
					
						2013-01-16 21:56:25 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							4355d06a86 
							
						 
					 
					
						
						
							
							Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-15 15:53:19 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							4d0c850dc8 
							
						 
					 
					
						
						
							
							Fix plugin component configuration.  
						
						
						
						
					 
					
						2013-01-14 17:13:18 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d900345a20 
							
						 
					 
					
						
						
							
							Ehcache implementation of APi Rate limit plugin.  
						
						
						
						
					 
					
						2013-01-10 17:47:48 -08:00