You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/03/07 05:31:12 UTC
[cxf] branch master updated: [CXF-7971]bin/scripts does't work on
Java 11
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 cc512ac [CXF-7971]bin/scripts does't work on Java 11
cc512ac is described below
commit cc512acb8056aefac1794f88525824ef2d9b967a
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Mar 7 13:30:53 2019 +0800
[CXF-7971]bin/scripts does't work on Java 11
---
distribution/src/main/release/bin/idl2wsdl | 14 ++++++++-
distribution/src/main/release/bin/inc | 38 +++++++++++++++++++++++++
distribution/src/main/release/bin/java2js | 14 ++++++++-
distribution/src/main/release/bin/java2ws | 14 ++++++++-
distribution/src/main/release/bin/mc | 16 +++++++++--
distribution/src/main/release/bin/wsdl2corba | 14 ++++++++-
distribution/src/main/release/bin/wsdl2java | 17 ++++++++++-
distribution/src/main/release/bin/wsdl2js | 13 +++++++++
distribution/src/main/release/bin/wsdl2service | 14 ++++++++-
distribution/src/main/release/bin/wsdl2soap | 18 ++++++++++--
distribution/src/main/release/bin/wsdl2xml | 18 ++++++++++--
distribution/src/main/release/bin/wsdlvalidator | 17 +++++++++--
distribution/src/main/release/bin/xsd2wsdl | 17 +++++++++--
13 files changed, 208 insertions(+), 16 deletions(-)
diff --git a/distribution/src/main/release/bin/idl2wsdl b/distribution/src/main/release/bin/idl2wsdl
index ed6e264..20fbb9e 100755
--- a/distribution/src/main/release/bin/idl2wsdl
+++ b/distribution/src/main/release/bin/idl2wsdl
@@ -33,6 +33,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -72,8 +81,11 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.corba.IDLToWSDL "$@"
+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.corba.IDLToWSDL "$@"
-
+fi
diff --git a/distribution/src/main/release/bin/inc b/distribution/src/main/release/bin/inc
new file mode 100755
index 0000000..5868906
--- /dev/null
+++ b/distribution/src/main/release/bin/inc
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# 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.
+#
+
+
+checkJvmVersion() {
+ # Use in priority xpg4 awk or nawk on SunOS as standard awk is outdated
+ AWK=awk
+ if ${solaris}; then
+ if [ -x /usr/xpg4/bin/awk ]; then
+ AWK=/usr/xpg4/bin/awk
+ elif [ -x /usr/bin/nawk ]; then
+ AWK=/usr/bin/nawk
+ fi
+ fi
+
+ VERSION=$("${JAVA_HOME}/bin/java" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;')
+
+ # java must be at least version 8
+ if [ "${VERSION}" -lt "8" ]; then
+ die "JVM must be greater than 1.8"
+ fi
+}
+
diff --git a/distribution/src/main/release/bin/java2js b/distribution/src/main/release/bin/java2js
index 55c881d..804a387 100755
--- a/distribution/src/main/release/bin/java2js
+++ b/distribution/src/main/release/bin/java2js
@@ -34,6 +34,14 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+. "${DIR}/inc"
+
+# Determine the JVM version >= 9
+checkJvmVersion
me=`basename $0`
cxf_home=$CXF_HOME
@@ -59,7 +67,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -98,4 +106,8 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.java2js.JavaToJS "$@"
+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.java2js.JavaToJS "$@"
+fi
diff --git a/distribution/src/main/release/bin/java2ws b/distribution/src/main/release/bin/java2ws
index 3bca053..ac002b5 100755
--- a/distribution/src/main/release/bin/java2ws
+++ b/distribution/src/main/release/bin/java2ws
@@ -34,6 +34,14 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+. "${DIR}/inc"
+
+# Determine the JVM version >= 9
+checkJvmVersion
me=`basename $0`
cxf_home=$CXF_HOME
@@ -59,7 +67,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -98,4 +106,8 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.java2ws.JavaToWS "$@"
+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.java2ws.JavaToWS "$@"
+fi
diff --git a/distribution/src/main/release/bin/mc b/distribution/src/main/release/bin/mc
index ca7f49c..09163a7 100755
--- a/distribution/src/main/release/bin/mc
+++ b/distribution/src/main/release/bin/mc
@@ -33,6 +33,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+. "${DIR}/inc"
+
+# Determine the JVM version >= 9
+checkJvmVersion
+
me=`basename $0`
cxf_home=$CXF_HOME
@@ -57,7 +66,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -96,8 +105,11 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.management.utils.ManagementConsole "$@"
+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.management.utils.ManagementConsole "$@"
-
+fi
diff --git a/distribution/src/main/release/bin/wsdl2corba b/distribution/src/main/release/bin/wsdl2corba
index 87c5c1e..67e0279 100755
--- a/distribution/src/main/release/bin/wsdl2corba
+++ b/distribution/src/main/release/bin/wsdl2corba
@@ -33,6 +33,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -72,8 +81,11 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.corba.WSDLToIDL "$@"
+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.corba.WSDLToIDL "$@"
-
+fi
diff --git a/distribution/src/main/release/bin/wsdl2java b/distribution/src/main/release/bin/wsdl2java
index 67fbb8f6..7628115 100755
--- a/distribution/src/main/release/bin/wsdl2java
+++ b/distribution/src/main/release/bin/wsdl2java
@@ -21,6 +21,8 @@
#
# run the Apache CXF wsdl2java tool
#
+
+
# Check for irritating 'operating systems'.
cygwin=false;
darwin=false;
@@ -33,6 +35,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -78,8 +89,12 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
JAVA_MAX_MEM=512M
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.wsdlto.WSDLToJava "$@"
+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.wsdlto.WSDLToJava "$@"
+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.wsdlto.WSDLToJava "$@"
+fi
diff --git a/distribution/src/main/release/bin/wsdl2js b/distribution/src/main/release/bin/wsdl2js
index 596e058..0ced8c2 100755
--- a/distribution/src/main/release/bin/wsdl2js
+++ b/distribution/src/main/release/bin/wsdl2js
@@ -33,6 +33,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -72,7 +81,11 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.wsdlto.javascript.WSDLToJavaScript "$@"
+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.wsdlto.javascript.WSDLToJavaScript "$@"
+fi
diff --git a/distribution/src/main/release/bin/wsdl2service b/distribution/src/main/release/bin/wsdl2service
index eada2b7..6fc4d51 100755
--- a/distribution/src/main/release/bin/wsdl2service
+++ b/distribution/src/main/release/bin/wsdl2service
@@ -33,6 +33,14 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+. "${DIR}/inc"
+
+# Determine the JVM version >= 9
+checkJvmVersion
me=`basename $0`
cxf_home=$CXF_HOME
@@ -57,7 +65,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -96,7 +104,11 @@ if [ "x${JAVA_MAX_MEM}" = "x" ]; then
export JAVA_MAX_MEM
fi
+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.misc.WSDLToService "$@"
+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.misc.WSDLToService "$@"
+fi
diff --git a/distribution/src/main/release/bin/wsdl2soap b/distribution/src/main/release/bin/wsdl2soap
index 5b0a74e..133190d 100755
--- a/distribution/src/main/release/bin/wsdl2soap
+++ b/distribution/src/main/release/bin/wsdl2soap
@@ -32,6 +32,16 @@ case "`uname`" in
fi
;;
esac
+
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -55,7 +65,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -94,7 +104,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.misc.WSDLToSoap "$@"
+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.misc.WSDLToSoap "$@"
+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.misc.WSDLToSoap "$@"
+fi
diff --git a/distribution/src/main/release/bin/wsdl2xml b/distribution/src/main/release/bin/wsdl2xml
index 458b465..050adda 100755
--- a/distribution/src/main/release/bin/wsdl2xml
+++ b/distribution/src/main/release/bin/wsdl2xml
@@ -32,6 +32,16 @@ case "`uname`" in
;;
esac
+
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -55,7 +65,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -94,7 +104,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.misc.WSDLToXML "$@"
+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.misc.WSDLToXML "$@"
+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.misc.WSDLToXML "$@"
+fi
diff --git a/distribution/src/main/release/bin/wsdlvalidator b/distribution/src/main/release/bin/wsdlvalidator
index a83090e..1d41f8c 100755
--- a/distribution/src/main/release/bin/wsdlvalidator
+++ b/distribution/src/main/release/bin/wsdlvalidator
@@ -33,6 +33,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -55,7 +64,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -94,7 +103,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.validator.WSDLValidator "$@"
+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.validator.WSDLValidator "$@"
+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.validator.WSDLValidator "$@"
+fi
diff --git a/distribution/src/main/release/bin/xsd2wsdl b/distribution/src/main/release/bin/xsd2wsdl
index d1af9b6..3245fac 100755
--- a/distribution/src/main/release/bin/xsd2wsdl
+++ b/distribution/src/main/release/bin/xsd2wsdl
@@ -33,6 +33,15 @@ case "`uname`" in
;;
esac
+#
+# Load common functions
+#
+DIR="$( cd "$( dirname "${BASH_SOURCE[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
@@ -56,7 +65,7 @@ fi
#
sun_tool_path=""
-if [ $darwin = false ]; then
+if [ $darwin = false ] && [ "${VERSION}" -lt "9" ]; then
sun_tool_path=${JAVA_HOME}/lib/tools.jar
if [ ! -f $sun_tool_path ]; then
echo "ERROR: Set JAVA_HOME to the path where the Java Development Kit (JDK) is installed"
@@ -89,7 +98,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.misc.XSDToWSDL "$@"
+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.misc.XSDToWSDL "$@"
+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.misc.XSDToWSDL "$@"
+fi