You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by sh...@apache.org on 2018/08/03 18:25:37 UTC
incubator-hawq git commit: HAWQ-1645. Remove autogeneration of
version number from pxf/build.gradle
Repository: incubator-hawq
Updated Branches:
refs/heads/master 59133ea40 -> 67b64bc93
HAWQ-1645. Remove autogeneration of version number from pxf/build.gradle
This enables us to use IntelliJ's code navigation and refactoring
features. Previously, IntelliJ would navigate to / refactor the
generated files rather than the source files since the generated files
were the ones that actually got compiled.
Co-authored-by: Lav Jain <lj...@pivotal.io>
Co-authored-by: Ben Christel <bc...@pivotal.io>
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/67b64bc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/67b64bc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/67b64bc9
Branch: refs/heads/master
Commit: 67b64bc93031a6ef86b3ac33a732ce02b162d71b
Parents: 59133ea
Author: Lav Jain <lj...@pivotal.io>
Authored: Fri Aug 3 11:22:19 2018 -0700
Committer: Lav Jain <lj...@pivotal.io>
Committed: Fri Aug 3 11:22:19 2018 -0700
----------------------------------------------------------------------
pxf/build.gradle | 42 +---
pxf/gradle/wrapper/gradle-wrapper.properties | 8 +-
pxf/gradlew | 209 ++++++++-----------
.../hawq/pxf/service/rest/VersionResource.java | 2 +-
pxf/pxf-service/src/main/webapp/WEB-INF/web.xml | 2 +-
5 files changed, 93 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/67b64bc9/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index 3205967..c1c86f7 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -153,46 +153,6 @@ subprojects { subProject ->
project('pxf-service') {
-// Copy existing sources and replace any occurrences of @tokenName@ with desired values
- task generateSources {
- doFirst {
- copy {
- from('src/main/java') {
- include '**/*.java'
- filter(ReplaceTokens,
- tokens:['pxfProtocolVersion': project.pxfProtocolVersion ])}
- into "tmp/generatedSources"
- }
- }
- }
-
-// Call cleanup taskAfter Java code compilation
- compileJava.doLast {
- tasks.cleanGeneratedSources.execute()
- }
-
-// Delete "tmp" directory under current project directory
-// rm -r pxf-service/tmp
- task cleanGeneratedSources() {
- doFirst {
- delete "tmp"
- }
- }
-
-// Call generateSources task before Java compilation
- gradle.projectsEvaluated {
- compileJava.dependsOn(generateSources)
- }
-
-// Use custom sources directory with generated sources
- sourceSets {
- main {
- java {
- srcDirs = ["tmp/generatedSources"]
- }
- }
- }
-
apply plugin: 'war'
tasks.war {
archiveName = 'pxf.war'
@@ -545,7 +505,7 @@ def buildNumber() {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.13'
+ gradleVersion = '3.0'
}
def distSubprojects = subprojects - project(':pxf-api')
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/67b64bc9/pxf/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/pxf/gradle/wrapper/gradle-wrapper.properties b/pxf/gradle/wrapper/gradle-wrapper.properties
index ef410fd..0530bad 100644
--- a/pxf/gradle/wrapper/gradle-wrapper.properties
+++ b/pxf/gradle/wrapper/gradle-wrapper.properties
@@ -5,9 +5,9 @@
# 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
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-#Wed Aug 05 16:07:21 PDT 2015
+#Mon Jul 09 15:02:34 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/67b64bc9/pxf/gradlew
----------------------------------------------------------------------
diff --git a/pxf/gradlew b/pxf/gradlew
index 48f44a9..7aa235e 100755
--- a/pxf/gradlew
+++ b/pxf/gradlew
@@ -16,40 +16,36 @@
# limitations under the License.
##
-## Tries to recreate Gradle's gradlew command in pure bash.
-## This way you don't have to worry about binaries in your build.
-##
-## Depdencies
-## unzip
+## Gradle start up script for UN*X
##
+##############################################################################
-set -e
-set -o pipefail
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
-# Use the maximum available, or set MAX_FD != -1 to use that value.
- MAX_FD="maximum"
-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-bin=`dirname "$0"`
-bin=`cd "$bin">/dev/null; pwd`
+DEFAULT_JVM_OPTS=""
-if [ -e "$bin/gradle/wrapper/gradle-wrapper.properties" ]; then
- . "$bin/gradle/wrapper/gradle-wrapper.properties"
-else
- # the location that the wrapper is at doesn't have a properties
- # check PWD, gradlew may be shared
- if [ -e "$PWD/gradle/wrapper/gradle-wrapper.properties" ]; then
- . "$PWD/gradle/wrapper/gradle-wrapper.properties"
- else
- echo "Unable to locate gradle-wrapper.properties. Not at $PWD/gradle/wrapper/gradle-wrapper.properties or $bin/gradle/wrapper/gradle-wrapper.properties" 1>&2
- exit 1
- fi
-fi
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
warn ( ) {
echo "$*"
@@ -63,31 +59,25 @@ die ( ) {
}
# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
darwin=false
+nonstop=false
case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
Darwin* )
darwin=true
;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -113,7 +103,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -133,88 +123,61 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# does not match gradle's hash
-# waiting for http://stackoverflow.com/questions/26642077/java-biginteger-in-bash-rewrite-gradlew
-hash() {
- local input="$1"
- if $darwin; then
- md5 -q -s "$1"
- else
- echo -n "$1" | md5sum | cut -d" " -f1
- fi
-}
-
-dist_path() {
- local dir=$(basename $distributionUrl | sed 's;.zip;;g')
- local id=$(hash "$distributionUrl")
-
- echo "$HOME/.gradle/${distributionPath:-wrapper/dists}/$dir/$id"
-}
-
-zip_path() {
- local dir=$(basename $distributionUrl | sed 's;.zip;;g')
- local id=$(hash "$distributionUrl")
-
- echo "$HOME/.gradle/${zipStorePath:-wrapper/dists}/$dir/$id"
-}
-
-download() {
- local base_path=$(dist_path)
- local file_name=$(basename $distributionUrl)
- local dir_name=$(echo "$file_name" | sed 's;-bin.zip;;g' | sed 's;-src.zip;;g' |sed 's;-all.zip;;g')
-
- if [ ! -d "$base_path" ]; then
- mkdir -p "$base_path"
- else
- # if data already exists, it means we failed to do this before
- # so cleanup last run and try again
- rm -rf $base_path/*
- fi
-
- # download dist. curl on mac doesn't like the cert provided...
- local zip_path=$(zip_path)
- curl --insecure -L -o "$zip_path/$file_name" "$distributionUrl"
-
- pushd "$base_path"
- touch "$file_name.lck"
- unzip "$zip_path/$file_name" 1> /dev/null
- touch "$file_name.ok"
- popd
-}
-
-is_cached() {
- local file_name=$(basename $distributionUrl)
-
- [ -e "$(dist_path)/$file_name.ok" ]
-}
-
-lib_path() {
- local base_path=$(dist_path)
- local file_name=$(basename $distributionUrl | sed 's;-bin.zip;;g' | sed 's;-src.zip;;g' |sed 's;-all.zip;;g')
-
- echo "$base_path/$file_name/lib"
-}
-
-classpath() {
- local dir=$(lib_path)
- local cp=$(ls -1 $dir/*.jar | tr '\n' ':')
- echo "$dir:$cp"
-}
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-main() {
- if ! is_cached; then
- download
- fi
-
- eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
- JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
- $JAVACMD "${JVM_OPTS[@]}" -cp $(classpath) org.gradle.launcher.GradleMain "$@"
-}
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+ cd "$(dirname "$0")"
+fi
-main "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/67b64bc9/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/VersionResource.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/VersionResource.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/VersionResource.java
index c9f4d20..32779d8 100644
--- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/VersionResource.java
+++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/rest/VersionResource.java
@@ -39,7 +39,7 @@ class Version {
* actual value on build stage, using pxfProtocolVersion parameter from
* gradle.properties
*/
- final static String PXF_PROTOCOL_VERSION = "@pxfProtocolVersion@";
+ final static String PXF_PROTOCOL_VERSION = "v15";
public Version() {
}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/67b64bc9/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml b/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml
index 8d033e1..4719f78 100644
--- a/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml
+++ b/pxf/pxf-service/src/main/webapp/WEB-INF/web.xml
@@ -67,7 +67,7 @@ under the License.
</filter>
<filter-mapping>
<filter-name>PXF Security Filter</filter-name>
- <url-pattern>/@pxfProtocolVersion@/*</url-pattern>
+ <url-pattern>/v15/*</url-pattern>
</filter-mapping>
<!-- log4j configuration