/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Jul 19 14:58:45 UTC 2017
changeset a1070aa6e46f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a1070aa6e46f
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jul 19 17:06:18 2017 +0200
made usable with jdk9 again
* acinclude.m4: IT_CHECK_FOR_CLASS removed no longer valid -Xmodule usage
* launcher/launchers.in: made immune to missing plugin jar
* netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java: moved to reflection, made javaws buildable under jdk9
changeset e543b472fd2c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e543b472fd2c
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jul 19 17:09:56 2017 +0200
Pre-release tuning
* Makefile.am: (netx-html-gen.stamp) set number of changests to 236 (since 1.6)
* NEWS: date of 1.7 set
* configure.ac: (AC_INIT) set to use 1.7
diffstat:
ChangeLog | 15 +++++++++++++
Makefile.am | 2 +-
NEWS | 2 +-
acinclude.m4 | 3 +-
configure.ac | 2 +-
launcher/launchers.in | 12 ++++++---
netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java | 9 ++++++-
7 files changed, 34 insertions(+), 11 deletions(-)
diffs (123 lines):
diff -r ebb1725ebfd7 -r e543b472fd2c ChangeLog
--- a/ChangeLog Tue Jul 18 17:28:21 2017 +0200
+++ b/ChangeLog Wed Jul 19 17:09:56 2017 +0200
@@ -1,3 +1,18 @@
+2017-07-19 Jiri Vanek <jvanek at redhat.com>
+
+ Pre-release tuning
+ * Makefile.am: (netx-html-gen.stamp) set number of changests to 236 (since 1.6)
+ * NEWS: date of 1.7 set
+ * configure.ac: (AC_INIT) set to use 1.7
+
+2017-07-19 Jiri Vanek <jvanek at redhat.com>
+
+ made usable with jdk9 again
+ * acinclude.m4: IT_CHECK_FOR_CLASS removed no longer valid -Xmodule usage
+ * launcher/launchers.in: made immune to missing plugin jar
+ * netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java: moved to reflection, made javaws buildable under jdk9
+
+
2017-07-18 Jiri Vanek <jvanek at redhat.com>
* netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: HexEncoder loaded by reflection
diff -r ebb1725ebfd7 -r e543b472fd2c Makefile.am
--- a/Makefile.am Tue Jul 18 17:28:21 2017 +0200
+++ b/Makefile.am Wed Jul 19 17:09:56 2017 +0200
@@ -763,7 +763,7 @@
mkdir -p html-gen; \
cp AUTHORS NEWS COPYING ChangeLog html-gen/; \
export HTML_GEN_DEBUG=true; \
- ${SHELL} html-gen.sh 150; \
+ ${SHELL} html-gen.sh 236; \
unset HTML_GEN_DEBUG)
${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR)
rm -r $(NETX_SRCDIR)/../html-gen/
diff -r ebb1725ebfd7 -r e543b472fd2c NEWS
--- a/NEWS Tue Jul 18 17:28:21 2017 +0200
+++ b/NEWS Wed Jul 19 17:09:56 2017 +0200
@@ -8,7 +8,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.7 (2015-XX-XX):
+New in release 1.7 (2017-07-19):
* PR3366 - bash completion file was split to three, and is setup-able by bashcompdir environment variable
* added experimental support for windows
* added experimental support for java 9 (linux only)
diff -r ebb1725ebfd7 -r e543b472fd2c acinclude.m4
--- a/acinclude.m4 Tue Jul 18 17:28:21 2017 +0200
+++ b/acinclude.m4 Wed Jul 19 17:09:56 2017 +0200
@@ -506,7 +506,6 @@
# fourth, optional is module
MODULE_NAME="$4"
if test -n "$MODULE_NAME" ; then
- XMODULE="-Xmodule:$MODULE_NAME"
PATCH_MODULE="--patch-module $MODULE_NAME=."
fi
PKGPATH=`echo $3 | sed "s;\\.;/;g" `
@@ -530,7 +529,7 @@
}
]
EOF
-if $JAVAC -cp . $XMODULE $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+if $JAVAC $PATCH_MODULE -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVA $PATCH_MODULE -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_$1=yes;
else
diff -r ebb1725ebfd7 -r e543b472fd2c configure.ac
--- a/configure.ac Tue Jul 18 17:28:21 2017 +0200
+++ b/configure.ac Wed Jul 19 17:09:56 2017 +0200
@@ -1,4 +1,4 @@
-AC_INIT([icedtea-web],[1.7pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.7],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile netx.manifest])
AM_MAINTAINER_MODE([enable])
diff -r ebb1725ebfd7 -r e543b472fd2c launcher/launchers.in
--- a/launcher/launchers.in Tue Jul 18 17:28:21 2017 +0200
+++ b/launcher/launchers.in Wed Jul 19 17:09:56 2017 +0200
@@ -89,10 +89,14 @@
k=$((k+1))
# jsobject must be pathched separately from plugin
# otherwise netscape pkg would be shared by two modules, which is forbiden
-COMMAND[k]="--patch-module"
-k=$((k+1))
-COMMAND[k]="jdk.jsobject=@JSOBJECT_JAR@"
-k=$((k+1))
+JSOBJECT_JAR=@JSOBJECT_JAR@
+# plugin jar may not be built
+if [ ! "x$JSOBJECT_JAR" == "x" ] ; then
+ COMMAND[k]="--patch-module"
+ k=$((k+1))
+ COMMAND[k]="jdk.jsobject=$JSOBJECT_JAR"
+ k=$((k+1))
+fi
COMMAND[k]="--add-reads"
k=$((k+1))
diff -r ebb1725ebfd7 -r e543b472fd2c netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java
--- a/netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java Tue Jul 18 17:28:21 2017 +0200
+++ b/netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java Wed Jul 19 17:09:56 2017 +0200
@@ -32,6 +32,7 @@
statement from your version.*/
package net.sourceforge.jnlp.jdk89acesses;
+import java.lang.reflect.Method;
import javax.swing.ImageIcon;
import net.sourceforge.jnlp.util.logging.OutputController;
@@ -44,8 +45,12 @@
public static ImageIcon getSecureImageIcon(String resource) {
try {
- return new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource(resource));
- } catch (java.lang.NoClassDefFoundError ex) {
+ Class clazz = Class.forName("sun.misc.Launcher");
+ Object obj = clazz.newInstance();
+ Method m = clazz.getMethod("getClassLoader");
+ ClassLoader cl = (ClassLoader) m.invoke(obj);
+ return new ImageIcon(cl.getResource(resource));
+ } catch (Exception ex) {
OutputController.getLogger().log(ex);
OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "sun.misc.Launcher not found. Running jdk9 or higher? Using unsecure BootClassLoader");
return new ImageIcon(ClassLoader.getSystemClassLoader().getParent().getResource(resource));
More information about the distro-pkg-dev
mailing list