Commit Graph

114 Commits

Author SHA1 Message Date
Chip Childers
2e2dd684d2 Updating pom.xml version numbers for release 4.1.2-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-07-31 11:06:29 -04:00
ilya musayev
cf2babe7a7 Revert "Updating pom.xml version numbers for release 4.1.1"
This reverts commit d2c646f0a4.
2013-07-25 13:55:33 -04:00
ilya musayev
d2c646f0a4 Updating pom.xml version numbers for release 4.1.1
Signed-off-by: ilya musayev <ilya@apache.org>
2013-07-25 13:52:58 -04:00
ilya musayev
8794bb6346 Revert "Updating pom.xml version numbers for release 4.1.1"
This reverts commit 8fe3505cba.
2013-07-24 13:13:09 -04:00
ilya musayev
8fe3505cba Updating pom.xml version numbers for release 4.1.1
Signed-off-by: ilya musayev <ilya@apache.org>
2013-07-24 13:11:48 -04:00
Chip Childers
707f95dfa0 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-06-15 13:14:40 -04:00
Chip Childers
780439e3bb Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit a5214bee99.
2013-05-28 09:22:01 -04:00
Chip Childers
a5214bee99 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-28 09:16:12 -04:00
Chip Childers
aa29234ee0 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit d0da9f7f46.
2013-05-28 09:09:22 -04:00
Chip Childers
d0da9f7f46 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-28 09:03:41 -04:00
Chip Childers
8a99d19b34 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit db007da152.
2013-05-26 10:36:16 -04:00
Chip Childers
db007da152 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-26 10:32:45 -04:00
Chip Childers
2229727236 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 873c1972c7.
2013-05-24 12:37:59 -04:00
Chip Childers
873c1972c7 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-24 12:31:24 -04:00
Chip Childers
29be94f3ba Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 9d8c8f2042.
2013-04-26 15:14:00 -04:00
Chip Childers
9d8c8f2042 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-26 15:09:47 -04:00
Chip Childers
3be1754626 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit ba7ba61671.
2013-04-23 15:22:01 -04:00
Chip Childers
ba7ba61671 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 15:18:19 -04:00
Chip Childers
e3af51bfc5 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 88098e0c81.
2013-04-23 14:58:55 -04:00
Chip Childers
88098e0c81 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 14:55:22 -04:00
Chip Childers
a5a7105b36 Updating pom.xml version numbers for release 4.1.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:51:20 -04:00
Chip Childers
7048baaa44 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:45:20 -04:00
Chip Childers
818a2c86d8 Revert "Updating pom.xml version numbers for release 4.1.0"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit b7abc3ca1e.
2013-04-22 22:22:32 +01:00
Chip Childers
a3c6ab58a1 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit 8fe99e6453.
2013-04-22 22:22:06 +01:00
Chip Childers
8fe99e6453 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 12:46:11 -04:00
Chip Childers
b7abc3ca1e Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:42:23 -04:00
Chip Childers
d168119a89 Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting for yet another attempted RC

This reverts commit b654578bd5.
2013-04-22 09:35:21 -04:00
Chip Childers
ca3b515bad Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting for yet another attempted RC.
This reverts commit 5a923ca44d.
2013-04-22 09:35:06 -04:00
Chip Childers
5a923ca44d Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:20:20 -04:00
Chip Childers
b654578bd5 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 08:55:21 -04:00
Chip Childers
e119a53bfd Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting to re-spin 4.1.0 RC

This reverts commit b25d27d80b.
2013-04-22 08:52:17 -04:00
Chip Childers
5755f6e3e8 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting so that I can re-spin the 4.1.0 RC

This reverts commit c8c77f6b1c.
2013-04-22 08:51:58 -04:00
Chip Childers
c8c77f6b1c Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:26:50 -04:00
Chip Childers
b25d27d80b Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:18:04 -04:00
Mice Xia
94f9baac82 Fix CLOUDSTACK-2058 packaging fails to incorporate db.properties 2013-04-17 14:43:57 +08:00
Hugo Trippaers
2c019cc645 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-17 01:31:07 +01:00
Kelven Yang
80c588e6b6 CLOUDSTACK-1746: fix logging warning in usage server 2013-03-30 20:19:09 +00:00
Rohit Yadav
7678987ca0 usage: remove duplicate maven plugin dependency in cloud-usage
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-28 14:20:10 +00:00
Kelven Yang
39ac17f7aa CLOUDSTACK-1746: update usage server startup configuration 2013-03-28 01:57:55 +00:00
Wido den Hollander
8d333ec664 CLOUDSTACK-1415: Merge in the Debian/Ubuntu packaging work from master
This patch inclused the packaging work from master tailored for 4.1

Not everything has been tested yet, but it should generate DEB packages.

Signed-off-by: Wido den Hollander <wido@42on.com>
2013-03-14 21:02:30 -04:00
Noa Resare
78e8d18428 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 Belgium.
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
2013-02-27 15:38:55 +00:00
Rohit Yadav
c47f685b1f usage: Fix regression build fail from 03fdbfb2, missing closing parenthesis
We've to test our commits, build 'em before committing :)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 16:37:08 +05:30
Wei Zhou
03fdbfb291 CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
Removed duplicate userstatsdao injection
2013-02-26 16:26:30 +05:30
Kishan Kavala
8863031c47 exclude usage unit test since it requires db connection 2013-02-16 09:14:35 +05:30
Kishan Kavala
009014c1b8 added db.properties to usage test resources 2013-02-15 22:35:45 +05:30
Kishan Kavala
3d3714c79b 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
2013-02-15 18:34:24 +05:30
Rohit Yadav
131e20cd3c usage: Fix classpath issue for usage server
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 8234dfa544)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 16:52:54 +05:30
Rohit Yadav
3ecec178ec usage: Add maven target to run usage server
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 1187fb7ed2)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 18:13:50 +05:30
Hugo Trippaers
5b8ecdad0b Summary: Fixup usage server for packaging
Make the start method work again with jsvc

Move the usageApplicationContext to resources and add resources to the pom.xml

Remove the old components file

Add mysql-connector as a runtime dependency

Rename the usage package and the files to cloudstack

Change paths to the new proposed locations
(cherry picked from commit 7ce03b4f8e)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 21:11:42 +01:00
Kishan Kavala
7970384f6e CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:43:40 +05:30