You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/12 02:57:58 UTC
[10/50] git commit: SLIDER-489 set accumulo app package appConfig
java home in a variable
SLIDER-489 set accumulo app package appConfig java home in a variable
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d8b36caf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d8b36caf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d8b36caf
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: d8b36cafe8966f9b7cd655e3ead535559403abb6
Parents: 2359c6d
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Mon Oct 6 17:10:37 2014 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Mon Oct 6 17:10:37 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo/appConfig-default.json | 2 +-
app-packages/accumulo/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d8b36caf/app-packages/accumulo/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/appConfig-default.json b/app-packages/accumulo/appConfig-default.json
index 62050af..9e04564 100644
--- a/app-packages/accumulo/appConfig-default.json
+++ b/app-packages/accumulo/appConfig-default.json
@@ -4,7 +4,7 @@
},
"global": {
"application.def": ".slider/package/ACCUMULO/${app.package.name}.zip",
- "java_home": "/usr/lib/jvm/java",
+ "java_home": "${app.java.home}",
"site.global.app_user": "${app.user}",
"site.global.app_log_dir": "${AGENT_LOG_ROOT}",
"site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d8b36caf/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index f2f1a35..4cd5cca 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -41,6 +41,7 @@
<!-- these properties are used in the default and the test appConfigs -->
<hadoop.dir>/usr/lib</hadoop.dir> <!-- hadoop expected to be found at ${hadoop.dir}/hadoop -->
<zk.dir>${hadoop.dir}</zk.dir> <!-- zookeeper expected to be found at ${zk.dir}/zookeeper -->
+ <app.java.home>${java.home}</app.java.home>
<app.user>yarn</app.user>
<app.user.group>hadoop</app.user.group>
<accumulo.keytab></accumulo.keytab>