diff --git hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml index 7a2d450..8bcb1f0 100644 --- hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml +++ hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml @@ -24,8 +24,7 @@ - + templeton.hcat @@ -34,12 +33,6 @@ - templeton.libjars - ${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar - Jars to add to the classpath. - - - templeton.pig.archive hdfs:///apps/templeton/pig-${env.PIG_VERSION}.tar.gz The path to the Pig archive. diff --git hcatalog/src/test/e2e/templeton/deployers/env.sh hcatalog/src/test/e2e/templeton/deployers/env.sh index a9cc2d7..8b719f2 100755 --- hcatalog/src/test/e2e/templeton/deployers/env.sh +++ hcatalog/src/test/e2e/templeton/deployers/env.sh @@ -22,6 +22,7 @@ # define necessary env vars here and source it in other files +#todo: most of these variables are defined in pom.xml - see this can be integrated echo ${HADOOP_VERSION}; if [ -z ${HADOOP_VERSION} ]; then diff --git hcatalog/webhcat/svr/pom.xml hcatalog/webhcat/svr/pom.xml index 6f3f9e5..1a6dc92 100644 --- hcatalog/webhcat/svr/pom.xml +++ hcatalog/webhcat/svr/pom.xml @@ -151,12 +151,13 @@ - - - . - src/main/config - - + + + . + src/main/config + true + + org.apache.maven.plugins diff --git hcatalog/webhcat/svr/src/main/config/webhcat-default.xml hcatalog/webhcat/svr/src/main/config/webhcat-default.xml index dc6521a..801f3a5 100644 --- hcatalog/webhcat/svr/src/main/config/webhcat-default.xml +++ hcatalog/webhcat/svr/src/main/config/webhcat-default.xml @@ -39,7 +39,7 @@ templeton.libjars - ${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar + ${env.TEMPLETON_HOME}/../lib/zookeeper-${zookeeper.version}.jar,${env.TEMPLETON_HOME}/../lib/hive-common-${project.version}.jar Jars to add to the classpath. @@ -87,7 +87,7 @@ templeton.pig.path - pig-0.11.1.tar.gz/pig-0.11.1/bin/pig + pig-${pig.version}.tar.gz/pig-${pig.version}/bin/pig The path to the Pig executable. @@ -105,7 +105,7 @@ templeton.hive.path - hive-0.11.0.tar.gz/hive-0.11.0/bin/hive + hive-${project.version}.tar.gz/hive-${project.version}/bin/hive The path to the Hive executable. Applies only if templeton.hive.archive is defined. @@ -125,7 +125,7 @@ templeton.hive.home - hive-0.14.0-SNAPSHOT-bin.tar.gz/hive-0.14.0-SNAPSHOT-bin + hive-${project.version}-bin.tar.gz/hive-${project.version}-bin The path to the Hive home within the tar. This is needed if Hive is not installed on all nodes in the cluster and needs to be shipped to the target node in the cluster to execute Pig @@ -134,7 +134,7 @@ templeton.hcat.home - hive-0.14.0-SNAPSHOT-bin.tar.gz/hive-0.14.0-SNAPSHOT-bin/hcatalog + hive-${project.version}-bin.tar.gz/hive-${project.version}-bin/hcatalog The path to the HCat home within the tar. This is needed if Hive is not installed on all nodes in the cluster and needs to be shipped to the target node in the cluster to execute Pig diff --git packaging/src/main/assembly/bin.xml packaging/src/main/assembly/bin.xml index 2cda623..a1c176f 100644 --- packaging/src/main/assembly/bin.xml +++ packaging/src/main/assembly/bin.xml @@ -276,6 +276,7 @@ webhcat-default.xml webhcat-log4j.properties + true hcatalog/etc/webhcat