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/11/20 06:28:23 UTC
svn commit: r1640678 - in /incubator/slider/site/trunk:
content/docs/slider_specs/ templates/
Author: smohanty
Date: Thu Nov 20 05:28:23 2014
New Revision: 1640678
URL: http://svn.apache.org/r1640678
Log:
Updating doc for 0.60
Modified:
incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md
incubator/slider/site/trunk/content/docs/slider_specs/application_instance_configuration.md
incubator/slider/site/trunk/content/docs/slider_specs/creating_app_definitions.md
incubator/slider/site/trunk/content/docs/slider_specs/hello_world_slider_app.md
incubator/slider/site/trunk/templates/nav.html
Modified: incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md?rev=1640678&r1=1640677&r2=1640678&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/application_definition.md Thu Nov 20 05:28:23 2014
@@ -39,7 +39,9 @@ The fields to describe an application is
* *commandScript*: application wide commands may also be defined. The command is executed on a component instance that is a client
-* *dependencies*: application can define a list of dependencies. Dependencies can be on the base services such as HDFS, ZOOKEEPER, YARN which are infrastructure services or GANGLIA, NAGIOS, etc. which are monitoring/alert services. The dependencies are parsed by the management infrastructure to provide the necessary configurations to allow the app to access the services. For example, a HDFS folder could be requested by the app to store its data, a ZOOKEEPER node to co-ordinate among components.
+* *comment*: describe the application
+
+* *exportedConfigs*: what configs to export
An application contains several component. The fields associated with a component are:
@@ -47,19 +49,33 @@ An application contains several componen
* **category**: type of the component - MASTER, SLAVE, and CLIENT
-* **minInstanceCount**: the minimum number of instances required for this component
+* *minInstanceCount*: the minimum number of instances required for this component
* *maxInstanceCount*: maximum number of instances allowed for a component
-* **commandScript**: the script that implements the commands.
+* *appExports*: which application level exports are exported by this component
+
+* *compExports*: which component level exports are exported by this component
+
+ A component may contain component specific exports. Refer to [Specifying Exports](/docs/slider_specs/specifying_exports.html) for more details.
+
+ * **name**: the name of the export
+
+ * **value**: the template that will be populated by Slider and then exported
+
+ A component contains command script for the component.
- * **script**: the script location - relative to the AppPackage root
+ * **commandScript**: the script that implements the commands.
- * **scriptType**: type of the script
+ * **script**: the script location - relative to the AppPackage root
- * **timeout**: default timeout of the script
+ * **scriptType**: type of the script
-* *customCommands*: any additional commands available for the component and their implementation
+ * **timeout**: default timeout of the script
+
+ Custom commands may be added to a component.
+
+ * *customCommands*: any additional commands available for the component and their implementation
An application definition also includes the package used to install the application. Its typically a tarball or some other form of package that does not require root access to install. The details of what happens during install is captured in the command script.
@@ -85,98 +101,80 @@ Applications can also advertise a set of
* **name**: specifies the name of the export group
-Each exportGroup contains one or more exports.
+Each exportGroup contains one or more exports. Refer to [Specifying Exports](/docs/slider_specs/specifying_exports.html) for more details.
* **name**: the name of the export
* **value**: the template that will be populated by Slider and then exported
+Sample metainfo.xml
- <metainfo>
- <schemaVersion>2.0</schemaVersion>
- <application>
- <name>HBASE</name>
- <version>0.96.0.2.1.1</version>
- <type>YARN-APP</type>
- <minHadoopVersion>2.1.0</minHadoopVersion>
- <components>
- <component>
- <name>HBASE_MASTER</name>
- <category>MASTER</category>
- <minInstanceCount>1</minInstanceCount>
- <maxInstanceCount>2</maxInstanceCount>
- <commandScript>
- <script>scripts/hbase_master.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
- <customCommands>
- <customCommand>
- <name>GRACEFUL_STOP</name>
- <commandScript>
- <script>scripts/hbase_master.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>1800</timeout>
- </commandScript>
- </customCommand>
- </customCommands>
- </component>
+ <metainfo>
+ <schemaVersion>2.0</schemaVersion>
+ <application>
+ <name>HBASE</name>
+ <version>0.96.0.2.1.1</version>
+ <type>YARN-APP</type>
+ <minHadoopVersion>2.1.0</minHadoopVersion>
+ <components>
+ <component>
+ <name>HBASE_MASTER</name>
+ <category>MASTER</category>
+ <minInstanceCount>1</minInstanceCount>
+ <maxInstanceCount>2</maxInstanceCount>
+ <exportedConfigs>hbase-site</exportedConfigs>
+ <commandScript>
+ <script>scripts/hbase_master.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
- <component>
- <name>HBASE_REGIONSERVER</name>
- <category>SLAVE</category>
- <minInstanceCount>1</minInstanceCount>
- ...
- </component>
+ <component>
+ <name>HBASE_REGIONSERVER</name>
+ <category>SLAVE</category>
+ <minInstanceCount>1</minInstanceCount>
+ ...
+ </component>
- <component>
- <name>HBASE_CLIENT</name>
- <category>CLIENT</category>
- ...
- </components>
+ </components>
- <osSpecifics>
- <osSpecific>
- <osType>any</osType>
- <packages>
- <package>
- <type>tarball</type>
- <name>hbase-0.96.1-tar.gz</name>
- <location>package/files</location>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
+ <osSpecifics>
+ <osSpecific>
+ <osType>any</osType>
+ <packages>
+ <package>
+ <type>tarball</type>
+ <name>hbase-0.96.1-tar.gz</name>
+ <location>package/files</location>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
- <commandOrders>
- <commandOrder>
- <command>HBASE_REGIONSERVER-START</command>
- <requires>HBASE_MASTER-STARTED</requires>
- </commandOrder>
- </commandOrders>
+ <commandOrders>
+ <commandOrder>
+ <command>HBASE_REGIONSERVER-START</command>
+ <requires>HBASE_MASTER-STARTED</requires>
+ </commandOrder>
+ </commandOrders>
- <exportGroups>
- <exportGroup>
- <name>QuickLinks</name>
- <exports>
- <export>
- <name>JMX_Endpoint</name>
- <value>http://${HBASE_MASTER_HOST}:${site.hbase-site.hbase.master.info.port}/jmx</value>
- </export>
- <export>
- <name>Master_Status</name>
- <value>http://${HBASE_MASTER_HOST}:${site.hbase-site.hbase.master.info.port}/master-status</value>
- </export>
- </exports>
- </exportGroup>
- </exportGroups>
-
- <commandScript>
- <script>scripts/app_health_check.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>300</timeout>
- </commandScript>
-
- </application>
- </metainfo>
+ <exportGroups>
+ <exportGroup>
+ <name>QuickLinks</name>
+ <exports>
+ <export>
+ <name>JMX_Endpoint</name>
+ <value>http://${HBASE_MASTER_HOST}:${site.hbase-site.hbase.master.info.port}/jmx</value>
+ </export>
+ <export>
+ <name>Master_Status</name>
+ <value>http://${HBASE_MASTER_HOST}:${site.hbase-site.hbase.master.info.port}/master-status</value>
+ </export>
+ </exports>
+ </exportGroup>
+ </exportGroups>
+
+ </application>
+ </metainfo>
Modified: incubator/slider/site/trunk/content/docs/slider_specs/application_instance_configuration.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/application_instance_configuration.md?rev=1640678&r1=1640677&r2=1640678&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/application_instance_configuration.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/application_instance_configuration.md Thu Nov 20 05:28:23 2014
@@ -34,35 +34,52 @@ An appConfig.json contains the applicati
{
- "schema" : "http://example.org/specification/v2.0.0",
- "metadata" : {
- },
- "global" : {
- "config_types": "core-site,hdfs-site,hbase-site",
-
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "package_list": "files/hbase-0.96.1-hadoop2-bin.tar",
- "create.default.zookeeper.node": "true"
-
- "site.global.app_user": "yarn",
- "site.global.app_log_dir": "${AGENT_LOG_ROOT}/app/log",
- "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run",
- "site.global.security_enabled": "false",
-
- "site.hbase-site.hbase.hstore.flush.retries.number": "120",
- "site.hbase-site.hbase.client.keyvalue.maxsize": "10485760",
- "site.hbase-site.hbase.hstore.compactionThreshold": "3",
- "site.hbase-site.hbase.rootdir": "${NN_URI}/apps/hbase/data",
- "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp",
- "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}",
- "site.hbase-site.hbase.regionserver.port": "0",
- "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}",
-
- "site.core-site.fs.defaultFS": "${NN_URI}",
- "site.hdfs-site.dfs.namenode.https-address": "${NN_HOST}:50470",
- "site.hdfs-site.dfs.namenode.http-address": "${NN_HOST}:50070"
- }
+ "schema": "http://example.org/specification/v2.0.0",
+ "metadata": {
+ },
+ "global": {
+ "application.def": ".slider/package/HBASE/slider-hbase-app-package-${pkg.version}.zip",
+ "create.default.zookeeper.node": "true",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
+ "system_configs": "core-site",
+
+ "site.global.app_user": "yarn",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+
+ "site.global.ganglia_server_host": "${NN_HOST}",
+ "site.global.ganglia_server_port": "8667",
+ "site.global.ganglia_server_id": "Application1",
+ "site.global.ganglia_enabled":"true",
+
+ "site.global.hbase_instance_name": "instancename",
+ "site.global.hbase_root_password": "secret",
+ "site.global.user_group": "hadoop",
+ "site.global.monitor_protocol": "http",
+ "site.global.hbase_thrift_port": "${HBASE_THRIFT.ALLOCATED_PORT}",
+ "site.global.hbase_thrift2_port": "${HBASE_THRIFT2.ALLOCATED_PORT}",
+ "site.global.hbase_rest_port": "${HBASE_REST.ALLOCATED_PORT}",
+
+ "site.hbase-env.hbase_master_heapsize": "1024m",
+ "site.hbase-env.hbase_regionserver_heapsize": "1024m",
+
+ "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}",
+ "site.hbase-site.hbase.superuser": "${USER_NAME}",
+ "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp",
+ "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local",
+ "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}",
+ "site.hbase-site.zookeeper.znode.parent": "${DEFAULT_ZK_PATH}",
+ "site.hbase-site.hbase.regionserver.info.port": "0",
+ "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}",
+ "site.hbase-site.hbase.regionserver.port": "0",
+ "site.hbase-site.hbase.master.port": "0"
+ },
+ "components": {
+ "slider-appmaster": {
+ "jvm.heapsize": "1024M"
+ }
+ }
}
+
appConf.json allows you to pass in arbitrary set of configuration that Slider will forward to the application component instances.
@@ -77,14 +94,12 @@ In order to understand how the naming co
* Any config not of the form `site.xx.yy` are consumed by Slider itself. Some of the manadatory configuration are:
* `application.def`: location of the application definition package (e.g., "/slider/hbase_v096.zip")
- * `config_types`: list of config types sent to the containers (e.g. "core-site,hdfs-site,hbase-site")
+ * `system_configs`: list of config types sent to the containers (e.g. "core-site,hdfs-site,hbase-site")
* `java_home`: java home path (e.g. "/usr/jdk64/jdk1.7.0_45")
- * `package_list`: location of the package relative to the root where AppPackage is installed (e.g. "files/hbase-0.96.1-hadoop2-bin.tar.gz"
OPTIONAL
* `create.default.zookeeper.node`: whether the application needs default ZK node
- * `agent.conf`: location of the agent config file (typically, "/slider/agent/conf/agent.ini")
**dynamically allocated ports**
@@ -101,6 +116,7 @@ There is no set guideline for doing so.
Ganglia server lifecycle is not controlled by the app instance. So the app instance only needs to know where to emit the metrics. This is achieved by three global variables
+* "site.global.ganglia_enabled":"true"
* "site.global.ganglia_server_host": "gangliaserver.my.org"
* "site.global.ganglia_server_port": "8663"
* "site.global.ganglia_server_id": "HBaseApplicationCluster3"
@@ -131,11 +147,15 @@ All three variable values are user provi
<td>Name node host</td>
</tr>
<tr>
- <td><COMPONENT_NAME>.ALLOCATED_PORT</td>
+ <td>"COMPONENT_NAME".ALLOCATED_PORT</td>
<td>Ask Slider to allocate a port</td>
</tr>
<tr>
- <td>DEF_ZK_PATH</td>
+ <td>{"COMPONENT_NAME".ALLOCATED_PORT}{PER_CONTAINER}</td>
+ <td>Ask Slider to allocate a port but keep it private to each container instance</td>
+ </tr>
+ <tr>
+ <td>DEFAULT_ZK_PATH</td>
<td>Default ZK path created by Slider if create.default.zookeeper.node is true</td>
</tr>
</table>
Modified: incubator/slider/site/trunk/content/docs/slider_specs/creating_app_definitions.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/creating_app_definitions.md?rev=1640678&r1=1640677&r2=1640678&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/creating_app_definitions.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/creating_app_definitions.md Thu Nov 20 05:28:23 2014
@@ -36,11 +36,10 @@ The above list shows three processes, th
## Using an AppPackage
The following command creates an HBase application using the AppPackage for HBase.
- ./slider create cl1 --image hdfs://NN:8020/slider/agent/slider-agent.tar.gz --template /work/appConf.json --resources /work/resources.json
+ ./slider create cl1 --template /work/appConf.json --resources /work/resources.json
Lets analyze various parameters from the perspective of app creation:
-* `--image`: its the slider agent tarball
* `--template`: app configuration
* `--resources`: yarn resource requests
* ⦠other parameters are described in accompanying docs.
@@ -48,32 +47,22 @@ Lets analyze various parameters from the
### AppPackage
The structure of an AppPackage is described at [AppPackage](application_package.html).
-In the enlistment, there are three example AppPackages:
+In the enlistment, there are several example AppPackages:
-* `app-packages/hbase-v0_96`
-* `app-packages/accumulo`
-* `app-packages/storm-v0_91`
+* `app-packages/memcached`
+* `app-packages/memcached-win`
+* `app-packages/hbase`
+* `...`
-The above folders, with minor edits, can be packaged as *zip* files to get the corresponding AppPackages. The application tarball file, containing the binaries/artifacts of the application itself is a component within the AppPackage. They are:
+The above folders, with minor edits, can be packaged as *zip* files to get the corresponding AppPackages. The application tarball file, containing the binaries/artifacts of the application itself is a component within the AppPackage. Refer to the README file in the individual folders on how to package an application.
-* For hbase - `app-packages/hbase-v0_96/package/files/hbase-0.96.1-hadoop2-bin.tar.gz.REPLACE`
-* For accumulo - `app-packages/accumulo/package/files/` (no file present)
-* For storm - `app-packages/storm-v0_91/package/files/apache-storm-0.9.1.2.1.1.0-237.tar.gz.placeholder`
-
-**They are placehoder files**, mostly because the files themselves are too large as well as users are free to use their own version of the package. To create a Slider AppPackage - replace the file with an actual application tarball and then ensure that the metainfo.xml has the correct file name. After that create a zip file using standard zip commands and ensure that the package has the metainfo.xml file at the root folder.
-
-For Accumulo, this is automated in maven by running
+For example, for Accumulo, package creation is automated in maven
mvn clean package -DskipTests -Paccumulo-app-package
Additional configuration parameters are described in `app-packages/accumulo/README.txt`.
-For other app packages, follow this example:
-
-* cd slider/app-packages/hbase
-* zip -r hbase-v098.zip .
-
-Looking at the content through unzip -l "$@" hbase-v098.zip
+Looking at the content through unzip -l "$@" <hbase_app_package>.zip
Archive: hbase-v098.zip
@@ -81,14 +70,14 @@ Looking at the content through unzip -l
--------- ---------- ----- ----
3158 06-19-2014 22:08 appConfig.json
0 06-19-2014 22:15 configuration/
- 5077 06-19-2014 22:15 configuration/global.xml
- 5248 06-19-2014 22:15 configuration/hbase-log4j.xml
- 2250 06-19-2014 22:15 configuration/hbase-policy.xml
- 14705 06-19-2014 22:15 configuration/hbase-site.xml
- 2142 06-19-2014 22:17 jmx_metrics.json
- 3991 06-19-2014 22:45 metainfo.xml
- 0 06-19-2014 22:33 package/
- 0 06-19-2014 22:31 package/files/
+ 5077 06-19-2014 22:15 configuration/global.xml
+ 5248 06-19-2014 22:15 configuration/hbase-log4j.xml
+ 2250 06-19-2014 22:15 configuration/hbase-policy.xml
+ 14705 06-19-2014 22:15 configuration/hbase-site.xml
+ 2142 06-19-2014 22:17 jmx_metrics.json
+ 3991 06-19-2014 22:45 metainfo.xml
+ 0 06-19-2014 22:33 package/
+ 0 06-19-2014 22:31 package/files/
83278591 06-19-2014 22:31 package/files/hbase-0.98.3-hadoop2-bin.tar.gz
0 06-19-2014 22:29 package/scripts/
787 06-19-2014 22:27 package/scripts/__init__.py
@@ -118,7 +107,7 @@ Looking at the content through unzip -l
83354595 35 files
-Sample **resources.json** and **appConfig.json** files are also included in the enlistment. These are samples and are typically tested on one node test installations.
+Sample **resources-default.json** and **appConfig-default.json** files are also included in the enlistment. These are samples and are typically tested on one node test installations. These files are not used during the create commmand, rather the files provided as input parameter are the ones that are used. *So you can leave these files as is in the package.*
### --template appConfig.json
Modified: incubator/slider/site/trunk/content/docs/slider_specs/hello_world_slider_app.md
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/slider_specs/hello_world_slider_app.md?rev=1640678&r1=1640677&r2=1640678&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/slider_specs/hello_world_slider_app.md (original)
+++ incubator/slider/site/trunk/content/docs/slider_specs/hello_world_slider_app.md Thu Nov 20 05:28:23 2014
@@ -21,7 +21,7 @@ Define the Slider application package fo
## Basic version
-The basic version of the app will allow creation of one or more memcached daemons on default ports. Some memory settings may be configured. Later examples will enhance the application package to add more capabilities.
+The basic version of the app will allow creation of one or more memcached daemons on custom ports. Some memory settings may be configured.
The structure of an app package is discussed [here](/docs/slider_specs/application_package.html).
@@ -32,7 +32,7 @@ In this example, the application package
Archive: /jmemcached-1.0.0.zip
Length Date Time Name
-------- ---- ---- ----
- 637 07-15-14 19:17 appConfig.json
+ 637 07-15-14 19:17 appConfig-default.json
1673 07-15-14 17:58 metainfo.xml
0 07-15-14 17:54 package/
0 07-15-14 18:03 package/files/
@@ -41,7 +41,7 @@ In this example, the application package
1530 07-15-14 19:31 package/scripts/memcached.py
1287 07-15-14 18:46 package/scripts/params.py
1581 07-15-14 19:16 README.txt
- 252 07-15-14 17:58 resources.json
+ 252 07-15-14 17:58 resources-default.json
## Step 1: Create metainfo.xml
@@ -55,17 +55,23 @@ The minimal metainfo contains some infor
<comment>Memcache is a network accessible key/value storage system, often used as a distributed cache.</comment>
<version>1.0.0</version>
<exportedConfigs>None</exportedConfigs>
+ <exportGroups>
+ <exportGroup>
+ <name>Servers</name>
+ <exports>
+ <export>
+ <name>host_port</name>
+ <value>${MEMCACHED_HOST}:${site.global.listen_port}</value>
+ </export>
+ </exports>
+ </exportGroup>
+ </exportGroups>
<components>
<component>
<name>MEMCACHED</name>
<category>MASTER</category>
- <componentExports>
- <componentExport>
- <name>host_port</name>
- <value>${THIS_HOST}:${site.global.listen_port}</value>
- </componentExport>
- </componentExports>
+ <compExports>Servers-host_port</compExports>
<commandScript>
<script>scripts/memcached.py</script>
<scriptType>PYTHON</scriptType>
@@ -94,9 +100,9 @@ Most applications release a tarball that
tar tvf jmemcached-1.0.0.tar
- drwxr-xr-x 0 yarn hadoop 0 Jul 15 17:51 jmemcached-1.0.0/
- -rw-r--r-- 0 yarn hadoop 13537 Jul 15 17:51 jmemcached-1.0.0/jmemcached-cli-1.0.0.jar
- -rwxr-xr-x 0 yarn hadoop 101467 Jul 15 17:51 jmemcached-1.0.0/jmemcached-core-1.0.0.jar
+ drwxr-xr-x 0 smohanty staff 0 Nov 5 20:22 ./
+ -rw-r--r-- 0 yarn hadoop 13537 Jul 15 17:51 jmemcached-cli-1.0.0.jar
+ -rwxr-xr-x 0 yarn hadoop 101467 Jul 15 17:51 jmemcached-core-1.0.0.jar
## Step 3: Create a default resources file (resources.json)
@@ -145,18 +151,14 @@ You can add additional parameters as nee
"metadata": {
},
"global": {
- "application.def": "jmemcached-1.0.0.zip",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
-
- "site.global.app_user": "yarn",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/jmemcached-1.0.0",
- "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid",
+ "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
"site.global.additional_cp": "/usr/lib/hadoop/lib/*",
"site.global.xmx_val": "256m",
"site.global.xms_val": "128m",
"site.global.memory_val": "200M",
- "site.global.listen_port": "${MEMCACHED.ALLOCATED_PORT}{DO_NOT_PROPAGATE}"
+ "site.global.listen_port": "${MEMCACHED.ALLOCATED_PORT}{PER_CONTAINER}"
},
"components": {
"slider-appmaster": {
@@ -166,6 +168,7 @@ You can add additional parameters as nee
}
+
Additional details on how to define a configuration template is [here](/docs/slider_specs/application_instance_configuration.html).
## Step 5: Implement the basic commands
@@ -180,7 +183,6 @@ The parameters file we will use is:
app_root = config['configurations']['global']['app_root']
java64_home = config['hostLevelParams']['java_home']
- app_user = config['configurations']['global']['app_user']
pid_file = config['configurations']['global']['pid_file']
additional_cp = config['configurations']['global']['additional_cp']
Modified: incubator/slider/site/trunk/templates/nav.html
URL: http://svn.apache.org/viewvc/incubator/slider/site/trunk/templates/nav.html?rev=1640678&r1=1640677&r2=1640678&view=diff
==============================================================================
--- incubator/slider/site/trunk/templates/nav.html (original)
+++ incubator/slider/site/trunk/templates/nav.html Thu Nov 20 05:28:23 2014
@@ -67,16 +67,20 @@
<ul class="dropdown-menu">
<li id="nav_use_getting_started"><a href="/docs/getting_started.html">Getting Started</a></li>
<li id="nav_use_manpage"><a href="/docs/manpage.html">Man Page</a></li>
-<li id="nav_use_examples"><a href="/docs/examples.html">Examples</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_app_package"><a href="/docs/slider_specs/index.html">Creating App Packages</a></li>
+<li role="presentation" class="divider"></li>
<li id="nav_use_client_config"><a href="/docs/client-configuration.html">Client Configuration</a></li>
<li id="nav_use_exitcodes"><a href="/docs/exitcodes.html">Client Exit Codes</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_debugging"><a href="/docs/debugging.html">Debugging</a></li>
+<li id="nav_use_troubleshooting"><a href="/docs/troubleshooting.html">Troubleshooting</a></li>
+<li role="presentation" class="divider"></li>
+<li id="nav_use_high_availability"><a href="/docs/high_availability.html">High Availability</a></li>
<li id="nav_use_security"><a href="/docs/security.html">Security</a></li>
<li id="nav_am_agent_ssl"><a href="/docs/ssl.html">Agent to AM SSL</a></li>
-<li id="nav_use_app_package"><a href="/docs/slider_specs/index.html">Creating App Packages</a></li>
<li id="nav_use_app_configuration"><a href="/docs/configuration/index.html">App Configuration Model</a></li>
-<li id="nav_use_high_availability"><a href="/docs/high_availability.html">High Availability</a></li>
-<li id="nav_use_debugging"><a href="/docs/debugging.html">Debugging</a></li>
-<li id="nav_use_troubleshooting"><a href="/docs/troubleshooting.html">Troubleshooting</a></li>
+<li id="nav_use_examples"><a href="/docs/examples.html">Provider Examples</a></li>
</ul>
</li>