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 
							
						 
					 
					
						
						
						
						
							
						
						
							224f479974 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						
						
						
					 
					
						2013-11-21 04:08:01 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							29aa4ae8da 
							
						 
					 
					
						
						
							
							Get rid of some errors and warnings in the server and usage sources  
						
						
						
						
					 
					
						2013-11-04 20:01:14 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2271d115 
							
						 
					 
					
						
						
							
							Revert "fixed m2eclipse error" because it breaks packaging  
						
						... 
						
						
						
						This reverts commit 5bcd8280fdd1e9039a6bf6c4c4fd43b8b49f938e. 
						
						
					 
					
						2013-10-30 20:17:59 +01:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							5bcd8280fd 
							
						 
					 
					
						
						
							
							fixed m2eclipse error  
						
						
						
						
					 
					
						2013-10-29 15:20:49 -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 
						 
				 
			
				
					
						
							
							
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							977a75f1be 
							
						 
					 
					
						
						
							
							UsageManagerInternal fix  
						
						... 
						
						
						
						aed5e9dc2a6882139bc38073923be5a3bacfd9d2 seems to inroduce some typo to run
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-10-07 13:13:40 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							aed5e9dc2a 
							
						 
					 
					
						
						
							
							Add Manage Context framework  
						
						... 
						
						
						
						The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP. 
						
						
					 
					
						2013-10-02 13:09:52 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							4590813836 
							
						 
					 
					
						
						
							
							Fix UsageServer startup  
						
						... 
						
						
						
						Add back @Component to ConfigurationDaoImpl and scan for the package in
Spring config. 
						
						
					 
					
						2013-10-01 10:30:36 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							b4464d88d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4281 : Usage - exception was hiding the db error. Make the usage job fail incase of any DB insert exceptions  
						
						
						
						
					 
					
						2013-08-13 17:30:46 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							66cca4d9ac 
							
						 
					 
					
						
						
							
							Fixed up the pom.xml to use dependencies specified in cloudstack pom  
						
						
						
						
					 
					
						2013-08-02 13:51:47 -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 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							51e4f597e0 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-3591 add usage recording for VM snapshots  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql 
						
						
					 
					
						2013-08-01 10:47:36 +08:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2c53ede1de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM  
						
						
						
						
					 
					
						2013-07-31 15:07:17 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a4cea4ebf2 
							
						 
					 
					
						
						
							
							Removed schema from the dependency of many components  
						
						
						
						
					 
					
						2013-07-29 10:55:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2752ba93c 
							
						 
					 
					
						
						
							
							Removed mysql as any dependency  
						
						
						
						
					 
					
						2013-07-26 20:35:48 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e5b39c9b 
							
						 
					 
					
						
						
							
							Moved the DB layer code into framework-db and change only the necessary projects to refer to it.  Cut down on the dependencies introduced with all the code in utils.  
						
						
						
						
					 
					
						2013-07-26 15:02:10 -07:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							135a2e66c5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2508: Template usage should report both physical and virtual sizes  
						
						
						
						
					 
					
						2013-07-24 18:17:09 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b18c72626b 
							
						 
					 
					
						
						
							
							Moved the SprintUtils which is for testing only to be in test directory.  Changed pom.xml for different projects to use the utils test-jar.  Removed some @Component annotations.  Moved majority of the dependencies from cloudstack pom to utils pom  
						
						
						
						
					 
					
						2013-07-18 21:53:51 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							f96442a45b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3231: Update service offering Id of allocated Vm usage whem service offering changes for a Vm  
						
						
						
						
					 
					
						2013-06-27 16:01:39 +05:30 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							ab6bf0b209 
							
						 
					 
					
						
						
							
							fix disk I/O description mistake  
						
						
						
						
					 
					
						2013-06-11 00:09:05 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							6de271c754 
							
						 
					 
					
						
						
							
							fix disk I/O description mistake  
						
						
						
						
					 
					
						2013-06-11 00:03:03 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							76ce304411 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server  
						
						
						
						
					 
					
						2013-06-10 15:00:08 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							b9b0168da4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1192: Add Disk I/O Statistics  
						
						
						
						
					 
					
						2013-06-01 08:00:48 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							2e8d1264a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2707: use executeBatch instead of persist when Usage Server createNetworkHelperEntry  
						
						
						
						
					 
					
						2013-05-28 09:43:23 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dcc288c8be 
							
						 
					 
					
						
						
							
							Make the classes that get started by jsvc implement Daemon.  
						
						... 
						
						
						
						Set the daemon version centrally in the pom 
						
						
					 
					
						2013-05-13 16:53:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							5118e9e29f 
							
						 
					 
					
						
						
							
							1) fix CLOUDSTACK-2129 and CLOUDSTACK-2128  
						
						... 
						
						
						
						2) include nicId in network.offerings.assign/remove event
3) use publishUsageEvent instead of saveUsageEvent to track usageEvent 
						
						
					 
					
						2013-04-22 19:38:32 +08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							574e716352 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2033 Fix usage server startup and logging  
						
						... 
						
						
						
						Properly implement the Daemon interface
Initialize logging when the usage server is started as a daemon
Fix a few minor startup and packaging items. 
						
						
					 
					
						2013-04-16 10:52:49 +02:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f8471e545f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1746: fix logging warning in usage server  
						
						
						
						
					 
					
						2013-03-29 13:44:12 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							c3c7e7e570 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1746: update usage server startup configuration  
						
						
						
						
					 
					
						2013-03-29 11:12:36 -07:00 
						 
				 
			
				
					
						
							
							
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							61754cd987 
							
						 
					 
					
						
						
							
							CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack  
						
						... 
						
						
						
						Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-03-18 11:36:19 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							a6ea691d64 
							
						 
					 
					
						
						
							
							usage: Revert 7a79451 due to duplicate declaration of plugin definition  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-03-14 16:43:48 +05:30 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8decfe2a 
							
						 
					 
					
						
						
							
							license: Remove trailing spaces in license header  
						
						
						
						
					 
					
						2013-03-14 10:51:33 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee387e9ad 
							
						 
					 
					
						
						
							
							fixed rat  
						
						
						
						
					 
					
						2013-03-13 20:40:43 -07:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							cd65d26a93 
							
						 
					 
					
						
						
							
							debian: Further improve the usage server package  
						
						... 
						
						
						
						We no longer symlink db.properties to the management server, but
we create a own db.properties for the usage server.
During a upgrade we copy the file to make the upgrade easier. 
						
						
					 
					
						2013-03-13 21:25:18 +01:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							7a794519a2 
							
						 
					 
					
						
						
							
							debian: Fix the usage server packaging  
						
						
						
						
					 
					
						2013-03-12 14:26:10 +01:00 
						 
				 
			
				
					
						
							
							
								Noa Resare 
							
						 
					 
					
						
						
						
						
							
						
						
							2f135be15f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1415: Debian & Ubuntu packaging work  
						
						... 
						
						
						
						Some concepts included:
* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch) 
						
						
					 
					
						2013-02-27 15:44:46 +00:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							0a1a207a19 
							
						 
					 
					
						
						
							
							usage: Fix regression build fail from fc3905fb, missing closing parenthesis  
						
						... 
						
						
						
						We've to test our commits, build 'em before committing :)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c47f685b1f323d1d8316ef6067c11cf14ecabbc6)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-26 16:41:16 +05:30 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							fc3905fb57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly  
						
						... 
						
						
						
						Removed duplicate userstatsdao injection 
						
						
					 
					
						2013-02-26 16:27:59 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							4d634980e2 
							
						 
					 
					
						
						
							
							exclude usage unit test since it requires db connection  
						
						
						
						
					 
					
						2013-02-16 09:09:09 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							b54db07d20 
							
						 
					 
					
						
						
							
							added db.properties to usage test resources  
						
						
						
						
					 
					
						2013-02-15 22:39:04 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							7d61ee6e99 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1295 : Added usage unit tests  
						
						... 
						
						
						
						Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db
Conflicts:
	setup/db/db/schema-40to410.sql 
						
						
					 
					
						2013-02-15 18:41:28 +05:30