diff --git src/docs/src/documentation/content/xdocs/configuration.xml src/docs/src/documentation/content/xdocs/configuration.xml index 28817bd..17aad29 100644 --- src/docs/src/documentation/content/xdocs/configuration.xml +++ src/docs/src/documentation/content/xdocs/configuration.xml @@ -30,14 +30,14 @@

The Templeton specific configuration is split into two layers:

    -
  1. templeton-default.xml - All the configuration variables +
  2. webhcat-default.xml - All the configuration variables that Templeton needs. This file sets the defaults that ship with Templeton and should only be changed by Templeton developers. Do not copy this file and/or - change it to maintain local installation settings. Because templeton-default.xml + change it to maintain local installation settings. Because webhcat-default.xml is present in the Templeton war file, editing a local copy of it will not change the configuration.
  3. -
  4. templeton-site.xml - The (possibly empty) configuration +
  5. webhcat-site.xml - The (possibly empty) configuration file in which the system administrator can set variables for their Hadoop cluster. Create this file and maintain entries in it for configuration variables that require you to override default values based on your local installation.
  6. @@ -66,7 +66,7 @@ ${env.PIG_HOME}/bin/pig uncertainty.

    Note: The location of the log files created by Templeton and some other properties - of the logging system are set in the templeton-log4j.properties file.

    + of the logging system are set in the webhcat-log4j.properties file.

    Variables @@ -87,13 +87,13 @@ ${env.PIG_HOME}/bin/pig templeton.jar - ${env.TEMPLETON_HOME}/templeton/templeton-0.1.0-dev.jar + ${env.TEMPLETON_HOME}/share/webhcat/svr/webhcat-0.5.0-SNAPSHOT.jar The path to the Templeton jar file. templeton.libjars - ${env.TEMPLETON_HOME}/lib/zookeeper-3.3.4.jar + ${env.TEMPLETON_HOME}/share/webhcat/svr/lib/zookeeper-3.4.3.jar Jars to add to the classpath. @@ -106,7 +106,7 @@ ${env.PIG_HOME}/bin/pig templeton.override.enabled - true + false Enable the override path in templeton.override.jars @@ -124,13 +124,13 @@ ${env.PIG_HOME}/bin/pig templeton.pig.archive - hdfs:///user/templeton/pig-0.9.2.tar.gz + hdfs:///user/templeton/pig-0.10.1.tar.gz The path to the Pig archive. templeton.pig.path - pig-0.9.2.tar.gz/pig-0.9.2/bin/pig + pig-0.10.1.tar.gz/pig-0.10.1/bin/pig The path to the Pig executable. @@ -142,13 +142,13 @@ ${env.PIG_HOME}/bin/pig templeton.hive.archive - hdfs:///user/templeton/hcatalog-0.5.0.tar.gz + hdfs:///user/templeton/hive-0.10.0.tar.gz The path to the Hive archive. templeton.hive.path - hcatalog-0.5.0.tar.gz/hcatalog-0.5.0/bin/hive + hive-0.10.0.tar.gz/hive-0.10.0/bin/hive The path to the Hive executable. @@ -189,7 +189,7 @@ hive.metastore.sasl.enabled=false templeton.exec.envs - HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME + HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME,HIVE_HOME The environment variables passed through to exec. diff --git src/docs/src/documentation/content/xdocs/rest_server_install.xml src/docs/src/documentation/content/xdocs/rest_server_install.xml index 07358a2..48db8fc 100644 --- src/docs/src/documentation/content/xdocs/rest_server_install.xml +++ src/docs/src/documentation/content/xdocs/rest_server_install.xml @@ -32,11 +32,13 @@ Hadoop distributed cache.
  7. Download and unpack the HCatalog distribution.
  8. Set the TEMPLETON_HOME environment variable to the base of the - HCatalog REST server installation. This will usually be HCATALOG_HOME/webhcat. + HCatalog REST server installation. This will usually be same as + HCATALOG_HOME. This is used to find the Templeton configuration.
  9. +
  10. Set JAVA_HOME,HADOOP_PREFIX, and HIVE_HOME environment variables
  11. Review the configuration - and update or create templeton-site.xml as required. Ensure that + and update or create webhcat-site.xml as required. Ensure that site specific component installation locations are accurate, especially the Hadoop configuration path. Configuration variables that use a filesystem path try to have reasonable defaults, but it's always safe to specify a full @@ -46,9 +48,9 @@
  12. Build HCatalog using the command ant jar from the top level HCatalog directory.
  13. Start the REST server with the command - bin/templeton_server.sh start.
  14. + bin/webhcat_server.sh start.
  15. Check that your local install works. Assuming that the server is running - on port 8080, the following command would give output similar to that shown. + on port 50111, the following command would give output similar to that shown. % curl -i http://localhost:50111/templeton/v1/status HTTP/1.1 200 OK @@ -65,8 +67,8 @@ Server: Jetty(7.6.0.v20120127)
    Server Commands
      -
    • Start the server: bin/templeton_server.sh start
    • -
    • Stop the server: bin/templeton_server.sh stop
    • +
    • Start the server: sbin/webhcat_server.sh start
    • +
    • Stop the server: sbin/webhcat_server.sh stop
    • End-to-end build, run, test: ant e2e
    @@ -75,14 +77,14 @@ Server: Jetty(7.6.0.v20120127) Requirements
    • Ant, version 1.8 or higher
    • -
    • Hadoop, version 0.20.205.0
    • +
    • Hadoop, version 1.0.3 or higher
    • ZooKeeper is required if you are using the ZooKeeper storage class. (Be sure to review and update the ZooKeeper related Templeton configuration.)
    • HCatalog. - Version 0.4.0 or higher. The hcat executable must be both in the + Version 0.5.0 or higher. The hcat executable must be both in the PATH and properly configured in the Templeton configuration.
    • @@ -116,12 +118,10 @@ Server: Jetty(7.6.0.v20120127)
      • Hive: - Download - the HCatalog tar.gz file and place it in HDFS. (If you need a version - that is not yet released, you may need to build it yourself following the HCatalog - instructions.) + Download + the hive tar.gz file and place it in HDFS. -hadoop fs -put /tmp/hcatalog-0.5.0.tar.gz /user/templeton/hcatalog-0.5.0.tar.gz +hadoop fs -put /tmp/hive-0.10.0.tar.gz /apps/templeton/hive-0.10.0.tar.gz
      • @@ -129,7 +129,7 @@ hadoop fs -put /tmp/hcatalog-0.5.0.tar.gz /user/templeton/hcatalog-0.5.0.tar.gz Download the Pig tar.gz file and place it into HDFS. For example: -hadoop fs -put /tmp/pig-0.9.2.tar.gz /user/templeton/pig-0.9.2.tar.gz +hadoop fs -put /tmp/pig-0.10.1.tar.gz /apps/templeton/pig-0.10.1.tar.gz @@ -138,18 +138,18 @@ hadoop fs -put /tmp/pig-0.9.2.tar.gz /user/templeton/pig-0.9.2.tar.gz following command, substituting your path to the jar for the one below. hadoop fs -put $HADOOP_PREFIX/hadoop-0.20.205.0/contrib/streaming/hadoop-streaming-0.20.205.0.jar \ - /user/templeton/hadoop-streaming.jar + /apps/templeton/hadoop-streaming.jar
      • Override Jars: - Place override jars required (if any) into HDFS. Note: As of this writing, all - released versions of Hadoop require a patch to properly run Templeton. This patch is + Place override jars required (if any) into HDFS. Note: Hadoop versions + prior to 1.0.3 require a patch (HADOOP-7987) to properly run Templeton. This patch is distributed with Templeton (located at templeton/src/hadoop_temp_fix/ugi.jar) and should be placed into HDFS, as reflected in the current default configuration. -hadoop fs -put ugi.jar /user/templeton/ugi.jar +hadoop fs -put ugi.jar /apps/templeton/ugi.jar
      @@ -165,37 +165,37 @@ hadoop fs -put ugi.jar /user/templeton/ugi.jar templeton.pig.archive - hdfs:///user/templeton/pig-0.9.2.tar.gz + hdfs:///apps/templeton/pig-0.10.1.tar.gz The path to the Pig archive. templeton.pig.path - pig-0.9.2.tar.gz/pig-0.9.2/bin/pig + pig-0.10.1.tar.gz/pig-0.10.1/bin/pig The path to the Pig executable. templeton.hive.archive - hdfs:///user/templeton/hcatalog-0.5.0.tar.gz + hdfs:///apps/templeton/hive-0.10.0.tar.gz The path to the Hive archive. templeton.hive.path - hcatalog-0.5.0.tar.gz/hcatalog-0.5.0/bin/hive + hive-0.10.0.tar.gz/hive-0.10.0/bin/hive The path to the Hive executable. templeton.streaming.jar - hdfs:///user/templeton/hadoop-streaming.jar + hdfs:///apps/templeton/hadoop-streaming.jar The path to the Hadoop streaming jar file. templeton.override.jars - hdfs:///user/templeton/ugi.jar + hdfs:///apps/templeton/ugi.jar Jars to add to the HADOOP_CLASSPATH for all Map Reduce jobs. These jars must exist on HDFS. diff --git webhcat/svr/src/main/config/webhcat-default.xml webhcat/svr/src/main/config/webhcat-default.xml index a06e8f8..6d3d197 100644 --- webhcat/svr/src/main/config/webhcat-default.xml +++ webhcat/svr/src/main/config/webhcat-default.xml @@ -39,13 +39,13 @@ templeton.jar - ${env.TEMPLETON_HOME}/templeton-0.1.0-dev.jar + ${env.TEMPLETON_HOME}/share/webhcat/svr/webhcat-0.5.0-SNAPSHOT.jar The path to the Templeton jar file. templeton.libjars - ${env.TEMPLETON_HOME}/lib/zookeeper-3.3.4.jar + ${env.TEMPLETON_HOME}/share/webhcat/svr/lib/zookeeper-3.4.3.jar Jars to add to the classpath. @@ -61,7 +61,7 @@ templeton.override.enabled - true + false Enable the override path in templeton.override.jars @@ -81,13 +81,13 @@ templeton.pig.archive - hdfs:///user/templeton/pig-0.10.0.tar.gz + hdfs:///apps/templeton/pig-0.10.1.tar.gz The path to the Pig archive. templeton.pig.path - pig-0.10.0.tar.gz/pig-0.10.0/bin/pig + pig-0.10.1.tar.gz/pig-0.10.1/bin/pig The path to the Pig executable. @@ -99,7 +99,7 @@ templeton.hive.archive - hdfs:///user/templeton/hive-0.10.0.tar.gz + hdfs:///apps/templeton/hive-0.10.0.tar.gz The path to the Hive archive. @@ -146,7 +146,7 @@ templeton.exec.envs - HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME + HADOOP_PREFIX,HADOOP_HOME,JAVA_HOME,HIVE_HOME The environment variables passed through to exec.