Repository: incubator-hawq Updated Branches: refs/heads/HAWQ-1535 [created] 552413e28
HAWQ-1535. PXF make install should also generate non versioned jars Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/0668e2bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/0668e2bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/0668e2bd Branch: refs/heads/HAWQ-1535 Commit: 0668e2bd754ad4eefa0f07ac3303745e7c011889 Parents: 634e0cd Author: shivzone <[email protected]> Authored: Tue Oct 3 17:17:10 2017 -0700 Committer: shivzone <[email protected]> Committed: Tue Oct 3 17:17:10 2017 -0700 ---------------------------------------------------------------------- pxf/Makefile | 5 +++++ pxf/build.gradle | 2 +- .../templates/pxf-private.classpath.template | 21 ++++++-------------- 3 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0668e2bd/pxf/Makefile ---------------------------------------------------------------------- diff --git a/pxf/Makefile b/pxf/Makefile index 3ac38b1..ae50996 100644 --- a/pxf/Makefile +++ b/pxf/Makefile @@ -92,6 +92,11 @@ tomcat: install: ./gradlew install $(BUILD_PARAMS) + # Create symlink for PXF jars + @pushd $(PXF_HOME)/lib && \ + for X in pxf-*-[0-9]*.jar; do \ + ln -sf $$X `echo $$X | sed -e 's/-[a-zA-Z0-9.]*.jar/.jar/'`; \ + done && popd bundle: ./gradlew bundle $(BUILD_PARAMS) http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0668e2bd/pxf/build.gradle ---------------------------------------------------------------------- diff --git a/pxf/build.gradle b/pxf/build.gradle index 6ac55b7..2c451e3 100644 --- a/pxf/build.gradle +++ b/pxf/build.gradle @@ -611,7 +611,7 @@ def pxfTargetDir = System.properties['deployPath'] ?: "build/" task install(type: Copy, dependsOn: [subprojects.build, tomcatGet]) { into "${pxfTargetDir}" - subprojects { subProject -> + subprojects { project -> from("${project.name}/build/libs") { into 'lib' } } from("pxf-service/src/scripts/pxf-service") { http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0668e2bd/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template b/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template index d5d1910..9dd5cf5 100644 --- a/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template +++ b/pxf/pxf-service/src/configs/templates/pxf-private.classpath.template @@ -23,16 +23,15 @@ PXF_HOME/conf # PXF Libraries -PXF_HOME/lib/pxf-hbase-*[0-9].jar -PXF_HOME/lib/pxf-hdfs-*[0-9].jar -PXF_HOME/lib/pxf-hive-*[0-9].jar -PXF_HOME/lib/pxf-json-*[0-9].jar -PXF_HOME/lib/pxf-jdbc-*[0-9].jar +PXF_HOME/lib/pxf-hbase.jar +PXF_HOME/lib/pxf-hdfs.jar +PXF_HOME/lib/pxf-hive.jar +PXF_HOME/lib/pxf-json.jar +PXF_HOME/lib/pxf-jdbc.jar -# Hadoop/Hive/HBase configurations +# Hadoop/Hive configurations HADOOP_HOME/etc/hadoop HIVE_HOME/conf -HBASE_HOME/conf # Hadoop Libraries HADOOP_HOME/share/hadoop/common/hadoop-common-*[0-9].jar @@ -70,11 +69,3 @@ HIVE_HOME/lib/hive-exec*.jar HIVE_HOME/lib/hive-metastore*.jar HIVE_HOME/lib/jdo-api*.jar HIVE_HOME/lib/libfb303*.jar - -# HBase Libraries -HBASE_HOME/lib/hbase-client*.jar -HBASE_HOME/lib/hbase-common*.jar -HBASE_HOME/lib/hbase-protocol*.jar -HBASE_HOME/lib/htrace-core*.jar -HBASE_HOME/lib/netty*.jar -HBASE_HOME/lib/zookeeper*.jar \ No newline at end of file
