Skip to content

Commit

Permalink
HAWQ-1541. Removed pxf configs from webapp
Browse files Browse the repository at this point in the history
  • Loading branch information
shivzone committed Oct 30, 2017
1 parent d2d3eaf commit 4d33755
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 9 deletions.
6 changes: 3 additions & 3 deletions pxf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions pxf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
}
}
Expand Down
38 changes: 38 additions & 0 deletions pxf/pxf-hive/src/test/resources/pxf-profiles-default.xml
Original file line number Diff line number Diff line change
@@ -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>
38 changes: 38 additions & 0 deletions pxf/pxf-service/src/test/resources/pxf-profiles-default.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 4d33755

Please sign in to comment.