Author: pmouawad
Date: Sun Sep 9 20:31:18 2018
New Revision: 1840433
URL: http://svn.apache.org/viewvc?rev=1840433&view=rev
Log:
Bug 62065 - Use Maven artifact for JAF Module instead of embedded module
Bugzilla Id: 62065
Modified:
jmeter/trunk/bin/jmeter
jmeter/trunk/bin/jmeter.bat
jmeter/trunk/bin/jmeter.sh
Modified: jmeter/trunk/bin/jmeter
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1840433&r1=1840432&r2=1840433&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sun Sep 9 20:31:18 2018
@@ -115,7 +115,7 @@ if [ -z "$JAVA_HOME" ]; then
JAVA_HOME="$JRE_HOME"
fi
-#--add-modules java.activation if JAVA 9
+#--add-opens if JAVA 9
JAVA9_OPTS=
# Minimal version to run JMeter
@@ -126,7 +126,7 @@ CURRENT_VERSION=`"${JAVA_HOME}/bin/java"
# Check if Java is present and the minimal version requirement
if [ "$CURRENT_VERSION" -gt "$MINIMAL_VERSION" ]; then
- JAVA9_OPTS="--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED
--add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/java.awt=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED"
+ JAVA9_OPTS="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens
java.desktop/sun.swing=ALL-UNNAMED --add-opens
java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/java.awt=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED"
fi
: "${JMETER_OPTS:=""}"
Modified: jmeter/trunk/bin/jmeter.bat
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1840433&r1=1840432&r2=1840433&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sun Sep 9 20:31:18 2018
@@ -80,7 +80,7 @@ rem Minimal version to run JMeter
set MINIMAL_VERSION=1.8.0
-rem --add-modules java.activation if JAVA 9
+rem --add-opens if JAVA 9
set JAVA9_OPTS=
@@ -108,7 +108,7 @@ IF "%JAVAVER:~1,2%"=="1." (
) else (
rem Java 9 at least
set current_minor=9
- set JAVA9_OPTS=--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens java.desktop/sun.swing=ALL-UNNAMED
--add-opens java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/java.awt=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED
+ set JAVA9_OPTS=--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens
java.desktop/sun.swing=ALL-UNNAMED --add-opens
java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/java.awt=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED
)
Modified: jmeter/trunk/bin/jmeter.sh
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.sh?rev=1840433&r1=1840432&r2=1840433&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.sh (original)
+++ jmeter/trunk/bin/jmeter.sh Sun Sep 9 20:31:18 2018
@@ -85,7 +85,7 @@ if [ -z "$JAVA_HOME" ]; then
JAVA_HOME="$JRE_HOME"
fi
-#--add-modules java.activation if JAVA 9
+#--add-opens if JAVA 9
JAVA9_OPTS=
# Minimal version to run JMeter
@@ -96,7 +96,7 @@ CURRENT_VERSION=`"${JAVA_HOME}/bin/java"
# Check if Java is present and the minimal version requirement
if [ "$CURRENT_VERSION" -gt "$MINIMAL_VERSION" ]; then
- JAVA9_OPTS="--add-modules java.activation --add-opens
java.desktop/sun.awt=ALL-UNNAMED --add-opens
java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
+ JAVA9_OPTS="--add-opens java.desktop/sun.awt=ALL-UNNAMED --add-opens
java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens
java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
fi
# Don't add additional arguments to the JVM start, except those needed for
Java 9
