Merge pull request #64 from hortonworks/issue62

InstallationSteps.txt

@@ -94,7 +94,7 @@ c. Using DGI
   curl -v http://localhost:21000/api/metadata/entities/list/hive_table
   {"requestId":"788558007@qtp-44808654-5","list":["cb9b5513-c672-42cb-8477-b8f3e537a162","ec985719-a794-4c98-b98f-0509bd23aac0","48998f81-f1d3-45a2-989a-223af5c1ed6e","a54b386e-c759-4651-8779-a099294244c4"]}
 
-  curl -v http://localhost:21000/api/metadata/entities/list/hive_database
+  curl -v http://localhost:21000/api/metadata/entities/list/hive_db
 
 * Search for entities (instances) in the repository
   curl -v http://localhost:21000/api/metadata/discovery/search/dsl?query="from hive_table"

addons/hive-bridge/pom.xml

@@ -99,21 +99,6 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
             <version>${hadoop.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>

addons/hive-bridge/src/bin/import-hive.sh

@@ -55,7 +55,7 @@ fi
 
 METADATACPPATH="$METADATA_CONF"
 
-for i in "${BASEDIR}/lib-bridge/"*.jar; do
+for i in "${BASEDIR}/bridge/hive/"*.jar; do
   METADATACPPATH="${METADATACPPATH}:$i"
 done
 
@@ -74,7 +74,7 @@ if [ ! -z "$HIVE_CONF_DIR" ]; then
     HIVE_CP=$HIVE_CONF_DIR
 elif [ ! -z "$HIVE_HOME" ]; then
     HIVE_CP="$HIVE_HOME/conf"
-elif [ -e /usr/hdp/current/hive-client/conf ]; then
+elif [ -e /etc/hive/conf ]; then
     HIVE_CP="/etc/hive/conf"
 else
     echo "Could not find a valid HIVE configuration"

src/main/assemblies/standalone-package.xml

@@ -50,7 +50,7 @@
         </fileSet>
 
         <fileSet>
-            <directory>addons/hive-bridge/src/main/bin</directory>
+            <directory>addons/hive-bridge/src/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
             <directoryMode>0755</directoryMode>