hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject incubator-hawq git commit: HAWQ-1538. Install internal profiles definition file in conf directory.
Date Tue, 10 Oct 2017 00:18:36 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 46fac1851 -> e89dea51a


HAWQ-1538. Install internal profiles definition file in conf directory.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/e89dea51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/e89dea51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/e89dea51

Branch: refs/heads/master
Commit: e89dea51a2fb36187183bb1e11f7c3bdd8ab4f91
Parents: 46fac18
Author: Oleksandr Diachenko <odiachenko@pivotal.io>
Authored: Mon Oct 9 17:18:25 2017 -0700
Committer: Oleksandr Diachenko <odiachenko@pivotal.io>
Committed: Mon Oct 9 17:18:25 2017 -0700

----------------------------------------------------------------------
 pxf/build.gradle                                |  5 ++-
 .../src/main/resources/pxf-profiles-default.xml | 14 ++------
 .../src/main/resources/pxf-profiles.xml         | 36 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e89dea51/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index 0e2cf0c..2a99231 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -240,10 +240,9 @@ project('pxf-service') {
         obsoletes('pxf-core')
         obsoletes('pxf-api')
 
-        from('src/main/resources/pxf-profiles-default.xml') {
+        from('src/main/resources/pxf-profiles.xml') {
             fileType CONFIG | NOREPLACE
             into "/etc/pxf-${project.version}/conf"
-            rename { 'pxf-profiles.xml' }
         }
 
         from('src/configs/pxf-site.xml') {
@@ -310,7 +309,7 @@ project('pxf-service') {
     }
 
     project.distTar {
-        from('src/main/resources/pxf-profiles-default.xml') { into 'conf' rename { 'pxf-profiles.xml'
} }
+        from('src/main/resources/pxf-profiles.xml') { into 'conf' }
         from("src/main/resources") { into 'conf' include '**/pxf-private*.classpath'}
         from("src/main/resources/pxf-private${hddist}.classpath") { into 'conf' rename {'pxf-private.classpath'}
}
         from('src/main/resources/pxf-public.classpath') { into 'conf' }

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e89dea51/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml b/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
index df17969..a98d05e 100644
--- a/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
+++ b/pxf/pxf-service/src/main/resources/pxf-profiles-default.xml
@@ -20,17 +20,9 @@ under the License.
 -->
 
 <!--
-    PXF profiles definition file.
-    New profiles can be added in the form:
-        <profile>
-            <name>...</name>
-            <description>...</description>
-            <plugins>
-                <plugin_A>...</plugin_A>
-                <plugin_B>...</plugin_B>
-                ...
-            </plugins>
-         </profile>
+    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>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e89dea51/pxf/pxf-service/src/main/resources/pxf-profiles.xml
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/resources/pxf-profiles.xml b/pxf/pxf-service/src/main/resources/pxf-profiles.xml
new file mode 100644
index 0000000..796f49b
--- /dev/null
+++ b/pxf/pxf-service/src/main/resources/pxf-profiles.xml
@@ -0,0 +1,36 @@
+<?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 custom profiles definition file.
+    New profiles can be added in the form:
+        <profile>
+            <name>...</name>
+            <description>...</description>
+            <plugins>
+                <plugin_A>...</plugin_A>
+                <plugin_B>...</plugin_B>
+                ...
+            </plugins>
+         </profile>
+-->
+<profiles>
+</profiles>
\ No newline at end of file


Mime
View raw message