[cxf] branch master updated: [CXF-7971]also need to revise wadl2java

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new df43be5  [CXF-7971]also need to revise wadl2java
df43be5 is described below

commit df43be53908f920b29c0d146bda1cdaef1df6cf2
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Tue Mar 12 11:49:43 2019 +0800

    [CXF-7971]also need to revise wadl2java
---
 distribution/src/main/release/bin/wadl2java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/distribution/src/main/release/bin/wadl2java 
b/distribution/src/main/release/bin/wadl2java
index 29fc970..ce05962 100755
--- a/distribution/src/main/release/bin/wadl2java
+++ b/distribution/src/main/release/bin/wadl2java
@@ -33,6 +33,15 @@ case "`uname`" in
            ;;
 esac
 
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname $0 )" >/dev/null 2>&1 && pwd )"
+. "${DIR}/inc"
+
+# Determine the JVM version >= 9
+checkJvmVersion
+
 me=`basename $0`
 cxf_home=$CXF_HOME
 if [ ! -f  $cxf_home/lib/cxf-manifest.jar ]; then
@@ -79,7 +88,11 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
     export JAVA_MAX_MEM
 fi
 
-$JAVA_HOME/bin/java -Xmx${JAVA_MAX_MEM} 
-Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}" 
-Djava.util.logging.config.file=$log_config 
org.apache.cxf.tools.wadlto.WADLToJava "$@"
+if [ "${VERSION}" -gt "8" ]; then
+    $JAVA_HOME/bin/java -Xmx${JAVA_MAX_MEM} -cp "${cxf_classpath}" 
-Djava.util.logging.config.file=$log_config 
org.apache.cxf.tools.wadlto.WADLToJava "$@"
+else
+    $JAVA_HOME/bin/java -Xmx${JAVA_MAX_MEM} 
-Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}" 
-Djava.util.logging.config.file=$log_config 
org.apache.cxf.tools.wadlto.WADLToJava "$@"
+fi