cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to da66b06
Date Mon, 13 Feb 2017 12:14:15 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master dbb219364 -> da66b06e7


Fixed the default JAVA_HOME value to be Java8 if not set


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ee4a195
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ee4a195
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ee4a195

Branch: refs/heads/master
Commit: 6ee4a195f27fe59c61e96d0ab1c56dee0c05a52b
Parents: 17787a1
Author: Will Stevens <williamstevens@gmail.com>
Authored: Fri Feb 10 13:42:58 2017 -0500
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Fri Feb 10 13:42:58 2017 -0500

----------------------------------------------------------------------
 client/tomcatconf/classpath.conf.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ee4a195/client/tomcatconf/classpath.conf.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index e2c5da4..ecdd12a 100644
--- a/client/tomcatconf/classpath.conf.in
+++ b/client/tomcatconf/classpath.conf.in
@@ -34,8 +34,8 @@ for vendorconf in "@MSCONF@"/vendor/* ; do
 	CLASSPATH=$vendorconf:$CLASSPATH
 done
 export CLASSPATH
-if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.7.0
]; then
-     export JAVA_HOME=/usr/lib/jvm/jre-1.7.0
+if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.8.0
]; then
+     export JAVA_HOME=/usr/lib/jvm/jre-1.8.0
 fi
 PATH=$JAVA_HOME/bin:/sbin:/usr/sbin:$PATH
 export PATH


Mime
View raw message