Updated Branches: refs/heads/4.1 0923bf8f8 -> a18481648
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 <[email protected]> (cherry picked from commit 23f7267753c3a1b05e61e04b2e8c3f24c54d6975) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a0341d1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a0341d1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a0341d1c Branch: refs/heads/4.1 Commit: a0341d1ce4a6f869ef3dc0fa759efdd744fdef83 Parents: 0923bf8 Author: Rohit Yadav <[email protected]> Authored: Mon Feb 11 11:58:03 2013 +0530 Committer: Rohit Yadav <[email protected]> Committed: Mon Feb 11 12:18:33 2013 +0530 ---------------------------------------------------------------------- developer/pom.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a0341d1c/developer/pom.xml ---------------------------------------------------------------------- diff --git a/developer/pom.xml b/developer/pom.xml index 27849ea..b0ae356 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -177,6 +177,12 @@ <!-- Do dry run using -d or dash-dash-dry --> <!-- Enable verbosity by -v or dash-dash-verbose --> </arguments> + <systemProperties> + <systemProperty> + <key>CATALINA_HOME</key> + <value>${project.parent.basedir}/utils/</value> + </systemProperty> + </systemProperties> </configuration> </plugin> </plugins>
