Commit Graph

55 Commits

Author SHA1 Message Date
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
Kelven Yang 5a75a3cbda CLOUDSTACK-1818: make DababaseCreator ready to invoke DatabaseUpgradeChecker, adjust Component startup sequence for integrity checkers
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-27 13:08:03 +00:00
Prasanna Santhanam 3afc226de4 ignore the tests looking for db
These tests require DB to be present to do upgrade. Revisit later.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-01 11:20:36 +05:30
frank 2093aefcb8 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh
2013-02-28 15:34:57 -08: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
Hugo Trippaers 3f064ace39 Remove yet another test where the database was not properly mocked. FIXME
(cherry picked from commit 0495f5309e)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 21:05:31 +01:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Murali Reddy e7a554fc6a Merging events framework branch into master. This commit will bring
following changes

   - introduced notion of event bus with publish, subscribe, unsubscribe
     semantics

   - a plug-in can implement the EventBus abstraction to provide event
     bug to CloudStack

   - A rabbitMQ based plug-in that can interact with AMQP servers to
     provide message broker based event-bug

   - stream lines, action events, usage events, alerts publishing in to
     convineance classed which are also used to publish corresponding
     event on to event bus

   - introduced notion of state change event. On a state change, in the
     state machine corrsponding to the resource, a state change event is
     published on the event bug

   - associated a state machined with Snapshot and Network objects

   - Virtual Machine, Volume, Snaphost, Network object state changes wil
     result in a state change event
2013-02-01 01:37:24 +05:30
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
Hugo Trippaers 1e40551cd5 Disabled test 'com.cloud.network.vpn.RemoteAccessVpnTest' as it requires
a database connection which we don't have during unittest phase.
2013-01-23 08:46:53 +01: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
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 d760271945 ApiDispatcher: Get rid of reflections, reuse utils' ReflectUtil
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav dea8227001 server: Exclude ListPerf test in as it requires real MS and DB
Excluded test as per test author's comment:
"Currently we commented out this test suite since it requires a real MS and Db running"

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 18:25:13 -08:00
Rohit Yadav 0659c21f2d Get latest changes, Merge branch 'master' into api_refactoring 2013-01-04 17:22:57 -08:00
Noa Resare 0055d80211 CLOUDSTACK-771: maven: add mysql version reference to enable non-snapshot builds
If you update your build to build a version with a name not ending in -SNAPSHOT,
you are required to declare versions on all your depdendencies. There is already
a cs.mysql.version property, this patch makes sure it is used where appropriate.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-04 12:20:06 -05:00
Rohit Yadav 580bf857ff server: ApiServer inits with processing cmd classes to fill apiname:class mapping
- Add maven dependency reflections (wtfl license, apl compliant)
- Use reflections to recurse and get apiname:class mapping

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:59 -08:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
Rohit Yadav 5572707ec6 maven: Bump httpcore version, add guava and httpclient dependency
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:44:48 -08:00
Edison Su b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
adefanti 2a0d0104bd maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-20 09:27:07 +01:00
Rohit Yadav d8fbb0dd13 maven: enable jvm heap size for forked surefire test processes
Any forked process that runs from maven surefire plugin gets it own separate
heap which may cause build issues. Patch fixes the issue by explicity args to
the surefire plugin for cloud-server.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-03 18:42:51 +05:30
Hugo Trippaers f65b268a2e Active the testrun by default in maven
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
2012-10-30 14:15:07 +01:00
Hugo Trippaers f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers aa6355ffe6 Updated master to 4.1.0
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
olivier lamy f6f1be62b9 configuring tomcat maven plugin too 2012-08-28 23:58:06 +02:00
Darren Shepherd 43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
olivier lamy a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy 3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy 0d9b81aac6 that was an unused import not a missing dependency 2012-08-25 00:44:14 +02:00