Repository: incubator-hawq Updated Branches: refs/heads/master d2d3eaf50 -> 4d3375516
HAWQ-1541. Removed pxf configs from webapp Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/4d337551 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/4d337551 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/4d337551 Branch: refs/heads/master Commit: 4d33755169802513baf45194bc5870bc992dae8b Parents: d2d3eaf Author: shivzone <[email protected]> Authored: Mon Oct 30 16:36:13 2017 -0700 Committer: shivzone <[email protected]> Committed: Mon Oct 30 16:36:13 2017 -0700 ---------------------------------------------------------------------- pxf/Makefile | 6 ++-- pxf/build.gradle | 7 +--- .../src/test/resources/pxf-profiles-default.xml | 38 ++++++++++++++++++++ .../src/test/resources/pxf-profiles-default.xml | 38 ++++++++++++++++++++ 4 files changed, 80 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4d337551/pxf/Makefile ---------------------------------------------------------------------- diff --git a/pxf/Makefile b/pxf/Makefile index bd2b939..166a592 100644 --- a/pxf/Makefile +++ b/pxf/Makefile @@ -19,13 +19,13 @@ default: all ifneq "$(HD)" "" - BUILD_PARAMS= -Dhd=$(HD) + BUILD_PARAMS+= -Dhd=$(HD) else ifneq "$(PXF_HOME)" "" - BUILD_PARAMS= -DdeployPath="$(PXF_HOME)" + BUILD_PARAMS+= -DdeployPath="$(PXF_HOME)" else ifneq "$(GPHOME)" "" PXF_HOME= "$(GPHOME)/pxf" - BUILD_PARAMS= -DdeployPath="$(PXF_HOME)" + BUILD_PARAMS+= -DdeployPath="$(PXF_HOME)" else @echo "Cannot invoke install without configuring either PXF_HOME or GPHOME" exit http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4d337551/pxf/build.gradle ---------------------------------------------------------------------- diff --git a/pxf/build.gradle b/pxf/build.gradle index 996e693..78c5249 100644 --- a/pxf/build.gradle +++ b/pxf/build.gradle @@ -197,14 +197,9 @@ project('pxf-service') { tasks.war { archiveName = 'pxf.war' processResources { - filesMatching('**/pxf-private*.classpath') { + filesMatching('**/pxf-*') { details -> - if (details.name == "pxf-private${hddist}.classpath") { - details.name = "pxf-private.classpath" - } else { - // exclude classpath file for a different distribution details.exclude() - } } } } http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4d337551/pxf/pxf-hive/src/test/resources/pxf-profiles-default.xml ---------------------------------------------------------------------- diff --git a/pxf/pxf-hive/src/test/resources/pxf-profiles-default.xml b/pxf/pxf-hive/src/test/resources/pxf-profiles-default.xml new file mode 100644 index 0000000..bc3aa71 --- /dev/null +++ b/pxf/pxf-hive/src/test/resources/pxf-profiles-default.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<!-- + PXF pre-packaged profiles definition file. + It's not recommended to add new profiles here. + For adding new custom profiles please edit pxf-profiles.xml +--> +<profiles> + <profile> + <name>HiveText</name> + <plugins> + <fragmenter>org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter</fragmenter> + <accessor>org.apache.hawq.pxf.plugins.hive.HiveLineBreakAccessor</accessor> + <resolver>org.apache.hawq.pxf.plugins.hive.HiveStringPassResolver</resolver> + <metadata>org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher</metadata> + <outputFormat>org.apache.hawq.pxf.service.io.Text</outputFormat> + </plugins> + </profile> +</profiles> http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4d337551/pxf/pxf-service/src/test/resources/pxf-profiles-default.xml ---------------------------------------------------------------------- diff --git a/pxf/pxf-service/src/test/resources/pxf-profiles-default.xml b/pxf/pxf-service/src/test/resources/pxf-profiles-default.xml new file mode 100644 index 0000000..4d7641f --- /dev/null +++ b/pxf/pxf-service/src/test/resources/pxf-profiles-default.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<!-- + PXF pre-packaged profiles definition file. + It's not recommended to add new profiles here. + For adding new custom profiles please edit pxf-profiles.xml +--> +<profiles> + <profile> + <name>Hive</name> + <plugins> + <fragmenter>org.apache.hawq.pxf.plugins.hive.HiveDataFragmenter</fragmenter> + <accessor>org.apache.hawq.pxf.plugins.hive.HiveAccessor</accessor> + <resolver>org.apache.hawq.pxf.plugins.hive.HiveResolver</resolver> + <metadata>org.apache.hawq.pxf.plugins.hive.HiveMetadataFetcher</metadata> + <outputFormat>org.apache.hawq.pxf.service.io.GPDBWritable</outputFormat> + </plugins> + </profile> +</profiles>
