commit 79d1904201f50b38b2cb7f321095d881af8ccd14
author billie <billie@unknown> Tue May 20 14:59:13 2014 +0000
committer billie <billie@unknown> Tue May 20 14:59:13 2014 +0000
tree 3bc5501e2e365d6facc0c6d7ff48bcf0a9baedec
parent 8f34b7f741f2c888acdec6fa300a18b3c139cd6f

SLIDER-95 export accumulo monitor uri

git-svn-id: https://svn.apache.org/repos/asf/incubator/slider/trunk@1596280 13f79535-47bb-0310-9956-ffa450edef68

app-packages/accumulo-v1_5/appConfig.json

diff --git a/app-packages/accumulo-v1_5/appConfig.json b/app-packages/accumulo-v1_5/appConfig.json
index a633f28..52f8624 100644
--- a/app-packages/accumulo-v1_5/appConfig.json
+++ b/app-packages/accumulo-v1_5/appConfig.json
@@ -39,7 +39,7 @@
     "site.accumulo-site.trace.port.client": "0",
     "site.accumulo-site.tserver.port.client": "0",
     "site.accumulo-site.gc.port.client": "0",
-    "site.accumulo-site.monitor.port.client": "0",
+    "site.accumulo-site.monitor.port.client": "${ACCUMULO_MONITOR.ALLOCATED_PORT}",
     "site.accumulo-site.monitor.port.log4j": "0",
     "site.accumulo-site.general.classpaths": "$ACCUMULO_HOME/lib/accumulo-server.jar,\n$ACCUMULO_HOME/lib/accumulo-core.jar,\n$ACCUMULO_HOME/lib/accumulo-start.jar,\n$ACCUMULO_HOME/lib/accumulo-fate.jar,\n$ACCUMULO_HOME/lib/accumulo-proxy.jar,\n$ACCUMULO_HOME/lib/[^.].*.jar,\n$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n$HADOOP_CONF_DIR,\n$HADOOP_PREFIX/[^.].*.jar,\n$HADOOP_PREFIX/lib/[^.].*.jar,\n$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,\n/usr/lib/hadoop/.*.jar,\n/usr/lib/hadoop/lib/.*.jar,\n/usr/lib/hadoop-hdfs/.*.jar,\n/usr/lib/hadoop-mapreduce/.*.jar,\n/usr/lib/hadoop-yarn/.*.jar,"
   },

app-packages/accumulo-v1_5/metainfo.xml

diff --git a/app-packages/accumulo-v1_5/metainfo.xml b/app-packages/accumulo-v1_5/metainfo.xml
index 6794cf3..db904e2 100644
--- a/app-packages/accumulo-v1_5/metainfo.xml
+++ b/app-packages/accumulo-v1_5/metainfo.xml
@@ -24,6 +24,17 @@
         The Apache Accumulo is a robust, scalable, high performance data storage system.
       </comment>
       <version>1.5.1</version>
+      <exportGroups>
+        <exportGroup>
+          <name>QuickLinks</name>
+          <exports>
+            <export>
+              <name>Monitor</name>
+              <value>http://${ACCUMULO_MONITOR_HOST}:${site.accumulo-site.monitor.port.client}</value>
+            </export>
+          </exports>
+        </exportGroup>
+      </exportGroups>
       <commandOrders>
         <commandOrder>
           <command>ACCUMULO_TSERVER-START</command>
@@ -31,15 +42,15 @@
         </commandOrder>
         <commandOrder>
           <command>ACCUMULO_MONITOR-START</command>
-          <requires>ACCUMULO_TSERVER-STARTED</requires>
+          <requires>ACCUMULO_MASTER-STARTED</requires>
         </commandOrder>
         <commandOrder>
           <command>ACCUMULO_GC-START</command>
-          <requires>ACCUMULO_TSERVER-STARTED</requires>
+          <requires>ACCUMULO_MASTER-STARTED</requires>
         </commandOrder>
         <commandOrder>
           <command>ACCUMULO_TRACER-START</command>
-          <requires>ACCUMULO_TSERVER-STARTED</requires>
+          <requires>ACCUMULO_MASTER-STARTED</requires>
         </commandOrder>
       </commandOrders>
       <components>