Commit Graph

67 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
Rohit Yadav 8d1c460448 db: Fix developer's deploydb and cloud-setup-databases for rolling update
- Fix developer prefill to use 4.0's schema
- Fix developer/pom.xml and cloud-setup-databases to not run create-schema-view,
  the upgrade path is configured to do a rolling update and set it up

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 16e81130cc)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 15:00:39 +05:30
Rohit Yadav d427e1ae0d db: Remove and merge 4.1-new-db-schema.sql to schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit f2ae6dcda9)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 14:56:37 +05:30
Rohit Yadav 0364a4a34e maven: don't use process-test-resources lifecycles, target are skipped if test are
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 733ec50d46)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 12:18:54 +05:30
Rohit Yadav a184816488 CLOUDSTACK-1181: Find by catalina.home property first
The previous commit fails if a person had defined CATALINA_HOME already.
Instead of system env variable, get any passed variable 'catalina.home' and find
the file in that path.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 44287d20c0)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 12:18:33 +05:30
Rohit Yadav a0341d1ce4 CLOUDSTACK-1181: Fix Environment so db.properties is in classpath
We export CATALINA_HOME to utils/ which is the path which a lot of utils class would
check and read db.properties file. This is exactly what is done in production.
The utils classes (Transaction, Encryption*Checker etc.) would use PropertiesUtil
which tries to find it in CATALINA_HOME.

The only issue is, even if someone defined an override file, the encryption type
would be still read from the db.properties file. For all other params, the override
file would be re read and datastores would be reinitialized

BUG-ID: CLOUDSTACK-1181

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 23f7267753)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 12:18:33 +05:30
Rohit Yadav e70143c1dc maven: Fix developer/pom.xml to use DatabaseCreator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:11:42 -08:00
Rohit Yadav b45cdef5d9 DatabaseCreator: Process db props, sql and upgrade classes separately
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
Rohit Yadav cafe881acb maven: Fix deploydb in developer/pom.xml to pass through DatabaseCreator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
Rohit Yadav 1db3a84a03 maven: Fix deploydb in developer/pom.xml
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-16 17:25:55 -08:00
Kelven Yang 727fab71cb Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run 2013-01-16 14:16:01 -08:00
Kelven Yang a2dab60236 deprecate storage provider in StroragePoolVO 2013-01-15 18:07:19 -08:00
Alex Huang 14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Rohit Yadav 22e3454ae4 developer: Load create-schema-view sql for developer deploydb profile
The fix would run create-schema-view.sql which would setup db table views.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 13:08:29 -08:00
Prasanna Santhanam 1f1a13448f simulator: resurrect simulator hypervisor as plugin
Multiple fixes:
1. changes to the mvn configuration
    a. include simulator to client.war
    b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
    a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties

TODO:
 Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
2012-12-23 19:28:57 -08:00
Edison Su 550f4fbcdc create template/primary data store is done 2012-11-20 18:57:19 -08:00