CLOUDSTACK-1181: Find by catalina.home property first

yadvr · yadvr · commit 44287d20c0c5 · 2013-02-11T12:14:46.000+05:30
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 &lt;bhaisaab@apache.org&gt;
diff --git a/developer/pom.xml b/developer/pom.xml
@@ -179,8 +179,8 @@
               </arguments>
               <systemProperties>
                 <systemProperty>
-                  <key>CATALINA_HOME</key>
-                  <value>${project.parent.basedir}/utils/</value>
+                  <key>catalina.home</key>
+                  <value>${project.parent.basedir}/utils</value>
                 </systemProperty>
               </systemProperties>
             </configuration>
@@ -287,6 +287,12 @@
                 <argument>--rootpassword=${db.root.password}</argument>
                 <!-- 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>
diff --git a/utils/src/com/cloud/utils/PropertiesUtil.java b/utils/src/com/cloud/utils/PropertiesUtil.java
@@ -70,14 +70,14 @@ public static File findConfigFile(String path) {
         if (file.exists()) {
             return file;
         }
-        
-        newPath = System.getenv("CATALINA_HOME");
+
+        newPath = System.getProperty("catalina.home");
         if (newPath == null) {
-        	newPath = System.getenv("CATALINA_BASE");
+            newPath = System.getenv("CATALINA_HOME");
         }
         
         if (newPath == null) {
-        	newPath = System.getProperty("catalina.home");
+            newPath = System.getenv("CATALINA_BASE");
         }
         
         if (newPath == null) {

Original file line number	Diff line number	Diff line change
`@@ -70,14 +70,14 @@ public static File findConfigFile(String path) {`
`70`	`70`	`if (file.exists()) {`
`71`	`71`	`return file;`
`72`	`72`	`}`
`73`		`-`
`74`		`- newPath = System.getenv("CATALINA_HOME");`
	`73`	`+`
	`74`	`+ newPath = System.getProperty("catalina.home");`
`75`	`75`	`if (newPath == null) {`
`76`		`- newPath = System.getenv("CATALINA_BASE");`
	`76`	`+ newPath = System.getenv("CATALINA_HOME");`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (newPath == null) {`
`80`		`- newPath = System.getProperty("catalina.home");`
	`80`	`+ newPath = System.getenv("CATALINA_BASE");`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (newPath == null) {`