/hg/icedtea-web: javaws made run under jdk9 (if compiled by jdk8)
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Nov 1 15:58:58 UTC 2016
changeset ef2c2def287a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ef2c2def287a
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Nov 01 17:04:13 2016 +0100
javaws made run under jdk9 (if compiled by jdk8)
* configure.ac: added check for sun.security.action.GetPropertyAction
* launcher/launchers.in: added check for jdk9 and if jdk9 detected, added many modules-related access-allowing switches.
* netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java: helping class allowing access to JarIndex for both jdk9 and jdk8 packages locations
* netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java: similar for sun.misc.Launcher. Used as used in jdk8, but in jdk9, where is missing is used BootClassLoader instead.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Using JarIndexAccess instead of JarInde
* netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java: Using SunMiscLauncher isntead of sun.misc.Launcher
* netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: same
* netx/net/sourceforge/jnlp/security/dialogs/MoreInfoPane.java: same
* netx/net/sourceforge/jnlp/util/ScreenFinder.java: Added catch for IllegalArgumentException - jdk9 is newl
diffstat:
ChangeLog | 23 ++
configure.ac | 2 +-
launcher/launchers.in | 85 ++++++++++
netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java | 67 +++++++
netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java | 55 ++++++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 8 +-
netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java | 3 +-
netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java | 4 +-
netx/net/sourceforge/jnlp/security/dialogs/MoreInfoPane.java | 12 +-
netx/net/sourceforge/jnlp/util/ScreenFinder.java | 2 +-
10 files changed, 246 insertions(+), 15 deletions(-)
diffs (406 lines):
diff -r 7e15398e117d -r ef2c2def287a ChangeLog
--- a/ChangeLog Wed Oct 26 16:06:50 2016 +0200
+++ b/ChangeLog Tue Nov 01 17:04:13 2016 +0100
@@ -1,3 +1,26 @@
+2016-11-01 Jiri Vanek <jvanek at redhat.com>
+
+ javaws made run under jdk9 (if compiled by jdk8)
+ * configure.ac: added check for sun.security.action.GetPropertyAction
+ * launcher/launchers.in: added check for jdk9 and if jdk9 detected,
+ added many modules-related access-allowing switches.
+ * netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java: helping
+ class allowing access to JarIndex for both jdk9 and jdk8 packages locations
+ * netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java:
+ similar for sun.misc.Launcher. Used as used in jdk8, but in jdk9, where
+ is missing is used BootClassLoader instead.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ Using JarIndexAccess instead of JarInde
+ * netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java:
+ Using SunMiscLauncher isntead of sun.misc.Launcher
+ * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java:
+ same
+ * netx/net/sourceforge/jnlp/security/dialogs/MoreInfoPane.java:
+ same
+ * netx/net/sourceforge/jnlp/util/ScreenFinder.java:
+ Added catch for IllegalArgumentException - jdk9 is newly smuggling
+ [0,0] size window under some conditions causing this to be thrown
+
2016-10-26 Jiri Vanek <jvanek at redhat.com>
Configure made more JDK9 friendly
diff -r 7e15398e117d -r ef2c2def287a configure.ac
--- a/configure.ac Wed Oct 26 16:06:50 2016 +0200
+++ b/configure.ac Tue Nov 01 17:04:13 2016 +0100
@@ -78,11 +78,11 @@
IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name], [some.pkg], [$JAVA_BASE])
+IT_CHECK_FOR_CLASS(SUN_SECURITY_ACTION_GETPROPERTYACTION, [sun.security.action.GetPropertyAction], [some.pkg], [$JAVA_BASE])
# the classname cant be substitued by variable, as it is substituted to inner class
if test x"$HAVE_JAVA9" = xyes ; then
IT_CHECK_FOR_CLASS(HEXDUMPENCODER, [sun.security.util.HexDumpEncoder], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_MISC_JARINDEX, [jdk.internal.util.jar.JarIndex], [some.pkg], [$JAVA_BASE])
- # jdk9 do not have sun.misc.Launcher. It must be patched in code.
else
IT_CHECK_FOR_CLASS(HEXDUMPENCODER, [sun.misc.HexDumpEncoder], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_MISC_JARINDEX, [sun.misc.JarIndex], [some.pkg], [$JAVA_BASE])
diff -r 7e15398e117d -r ef2c2def287a launcher/launchers.in
--- a/launcher/launchers.in Wed Oct 26 16:06:50 2016 +0200
+++ b/launcher/launchers.in Tue Nov 01 17:04:13 2016 +0100
@@ -33,6 +33,11 @@
fi
fi;
+JDK9="NO"
+if ${JAVA} -version 2>&1 | grep -q "version \"9-" ; then
+ JDK9="YES"
+fi
+
JAVA_ARGS=( )
ARGS=( )
COMMAND=()
@@ -72,6 +77,86 @@
k=$((k+1))
COMMAND[k]="${LAUNCHER_FLAGS}"
k=$((k+1))
+
+if [ "x$JDK9" == "xYES" ] ; then
+#COMMAND[k]="--patch-module"
+#k=$((k+1))
+#COMMAND[k]="java.base=."
+#k=$((k+1))
+#COMMAND[k]="--patch-module"
+#k=$((k+1))
+#COMMAND[k]="java.desktop=."
+#k=$((k+1))
+#COMMAND[k]="--patch-module"
+#k=$((k+1))
+#COMMAND[k]="java.naming=."
+#k=$((k+1))
+
+COMMAND[k]="--add-reads"
+k=$((k+1))
+COMMAND[k]="java.base=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-reads"
+k=$((k+1))
+COMMAND[k]="java.desktop=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-reads"
+k=$((k+1))
+COMMAND[k]="java.naming=ALL-UNNAMED"
+k=$((k+1))
+
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.desktop/sun.awt=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/sun.security.provider=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/sun.security.util=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/sun.security.x509=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/jdk.internal.util.jar=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/sun.security.validator=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.desktop/sun.awt.X11=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.naming/com.sun.jndi.toolkit.url=ALL-UNNAMED"
+k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.desktop/sun.applet=ALL-UNNAMED"
+k=$((k+1))
+
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.base/sun.security.action=ALL-UNNAMED"
+k=$((k+1))
+fi
+
+
i=0
while [ "$i" -lt "${#JAVA_ARGS[@]}" ]; do
COMMAND[k]="${JAVA_ARGS[$i]}"
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java Tue Nov 01 17:04:13 2016 +0100
@@ -0,0 +1,67 @@
+package net.sourceforge.jnlp.jdk89acesses;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import net.sourceforge.jnlp.util.JarFile;
+import net.sourceforge.jnlp.util.logging.OutputController;
+
+/**
+ * Class to access sun.misc.JarINdex for both jdk9 and 8.
+ *
+ * @author jvanek
+ */
+public class JarIndexAccess {
+
+ private static Class<?> jarIndexClass;
+ /*JarIndex*/
+ private final Object parent;
+
+ static {
+ try {
+ jarIndexClass = Class.forName("sun.misc.JarIndex");
+ } catch (ClassNotFoundException ex) {
+ try {
+ OutputController.getLogger().log(ex);
+ jarIndexClass = Class.forName("jdk.internal.util.jar.JarIndex");
+ } catch (ClassNotFoundException exx) {
+ OutputController.getLogger().log(exx);
+ throw new RuntimeException("JarIndex not found!");
+ }
+ }
+ }
+
+ private JarIndexAccess(Object parent) {
+ this.parent = parent;
+ }
+
+ public static JarIndexAccess getJarIndex(JarFile jarFile) throws IOException {
+ try {
+ return getJarIndexImpl(jarFile);
+ } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static JarIndexAccess getJarIndexImpl(JarFile jarFile) throws IOException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+ Method method = jarIndexClass.getMethod("getJarIndex", JarFile.class);
+ Object o = method.invoke(null, jarFile);
+ return new JarIndexAccess(o);
+ }
+
+ public LinkedList<String> get(String replace) {
+ try {
+ return getImpl(replace);
+ } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public LinkedList<String> getImpl(String replace) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ Method method = jarIndexClass.getMethod("get", String.class);
+ Object o = method.invoke(parent, replace);
+ return (LinkedList<String>) o;
+ }
+
+}
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/jdk89acesses/SunMiscLauncher.java Tue Nov 01 17:04:13 2016 +0100
@@ -0,0 +1,55 @@
+/*
+ Copyright (C) 2016 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ IcedTea; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is making a
+ combined work based on this library. Thus, the terms and conditions of the GNU
+ General Public License cover the whole combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules, and
+ to copy and distribute the resulting executable under terms of your choice,
+ provided that you also meet, for each linked independent module, the terms and
+ conditions of the license of that module. An independent module is a module
+ which is not derived from or based on this library. If you modify this library,
+ you may extend this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this exception
+ statement from your version.*/
+package net.sourceforge.jnlp.jdk89acesses;
+
+import javax.swing.ImageIcon;
+import net.sourceforge.jnlp.util.logging.OutputController;
+
+/**
+ * This class is summ of access to sun.misc.Launcher which was removed in jdk9.
+ *
+ * @author jvanek
+ */
+public class SunMiscLauncher {
+
+ public static ImageIcon getSecureImageIcon(String resource) {
+ try {
+ return new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource(resource));
+ } catch (java.lang.NoClassDefFoundError 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));
+ }
+ }
+
+}
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Oct 26 16:06:50 2016 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Nov 01 17:04:13 2016 +0100
@@ -65,6 +65,7 @@
import net.sourceforge.jnlp.JNLPFile;
import net.sourceforge.jnlp.JNLPMatcher;
import net.sourceforge.jnlp.JNLPMatcherException;
+import net.sourceforge.jnlp.jdk89acesses.JarIndexAccess;
import net.sourceforge.jnlp.LaunchDesc;
import net.sourceforge.jnlp.LaunchException;
import net.sourceforge.jnlp.NullJnlpFileException;
@@ -89,7 +90,6 @@
import net.sourceforge.jnlp.util.StreamUtils;
import net.sourceforge.jnlp.util.UrlUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
-import sun.misc.JarIndex;
/**
* Classloader that takes it's resources from a JNLP file. If the
@@ -180,7 +180,7 @@
* Synchronized since this field may become shared data between multiple classloading threads/
* See loadClass(String) and CodebaseClassLoader.findClassNonRecursive(String).
*/
- private final List<JarIndex> jarIndexes = Collections.synchronizedList(new ArrayList<JarIndex>());
+ private final List<JarIndexAccess> jarIndexes = Collections.synchronizedList(new ArrayList<JarIndexAccess>());
/** Set of classpath strings declared in the manifest.mf files
* Synchronized since this field may become shared data between multiple classloading threads.
@@ -1337,7 +1337,7 @@
classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath()));
}
- JarIndex index = JarIndex.getJarIndex(jarFile, null);
+ JarIndexAccess index = JarIndexAccess.getJarIndex(jarFile);
if (index != null)
jarIndexes.add(index);
}
@@ -1524,7 +1524,7 @@
// This field synchronized before iterating over it since it may
// be shared data between threads
synchronized (jarIndexes) {
- for (JarIndex index : jarIndexes) {
+ for (JarIndexAccess index : jarIndexes) {
// Non-generic code in sun.misc.JarIndex
@SuppressWarnings("unchecked")
LinkedList<String> jarList = index.get(name.replace('.', '/'));
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java Wed Oct 26 16:06:50 2016 +0200
+++ b/netx/net/sourceforge/jnlp/security/dialogs/AccessWarningPane.java Tue Nov 01 17:04:13 2016 +0100
@@ -81,6 +81,7 @@
import net.sourceforge.jnlp.util.FileUtils;
import net.sourceforge.jnlp.util.XDesktopEntry;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.PlainTextFormatter;
+import net.sourceforge.jnlp.jdk89acesses.SunMiscLauncher;
/**
* Provides a panel to show inside a SecurityDialog. These dialogs are
@@ -177,7 +178,7 @@
topLabelText = R("SNetworkAccess", "(address here)");
}
- ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/question.png"));
+ ImageIcon icon = SunMiscLauncher.getSecureImageIcon("net/sourceforge/jnlp/resources/question.png");
JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT);
topLabel.setFont(new Font(topLabel.getFont().toString(),
Font.BOLD, 12));
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Wed Oct 26 16:06:50 2016 +0200
+++ b/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Tue Nov 01 17:04:13 2016 +0100
@@ -78,6 +78,7 @@
import net.sourceforge.jnlp.security.dialogresults.YesNoSandbox;
import net.sourceforge.jnlp.util.FileUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
+import net.sourceforge.jnlp.jdk89acesses.SunMiscLauncher;
/**
* Provides the panel for using inside a SecurityDialog. These dialogs are
@@ -208,8 +209,7 @@
}
private ImageIcon getImageIcon(final String imageLocation) {
- return new ImageIcon((new sun.misc.Launcher())
- .getClassLoader().getResource(imageLocation));
+ return SunMiscLauncher.getSecureImageIcon(imageLocation);
}
private void addButtons() {
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/security/dialogs/MoreInfoPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/MoreInfoPane.java Wed Oct 26 16:06:50 2016 +0200
+++ b/netx/net/sourceforge/jnlp/security/dialogs/MoreInfoPane.java Tue Nov 01 17:04:13 2016 +0100
@@ -57,6 +57,7 @@
import net.sourceforge.jnlp.security.dialogresults.DialogResult;
import net.sourceforge.jnlp.security.dialogresults.SetValueHandler;
import net.sourceforge.jnlp.security.dialogresults.Yes;
+import net.sourceforge.jnlp.jdk89acesses.SunMiscLauncher;
/**
* Provides the panel for the More Info dialog. This dialog shows details about an
@@ -92,12 +93,11 @@
for (int i = 0; i < numLabels; i++) {
ImageIcon icon = null;
- if (details.get(i).equals(R("STrustedCertificate")))
- icon = new ImageIcon((new sun.misc.Launcher())
- .getClassLoader().getResource("net/sourceforge/jnlp/resources/info-small.png"));
- else
- icon = new ImageIcon((new sun.misc.Launcher())
- .getClassLoader().getResource("net/sourceforge/jnlp/resources/warning-small.png"));
+ if (details.get(i).equals(R("STrustedCertificate"))) {
+ icon = SunMiscLauncher.getSecureImageIcon("net/sourceforge/jnlp/resources/info-small.png");
+ } else {
+ icon = SunMiscLauncher.getSecureImageIcon("net/sourceforge/jnlp/resources/warning-small.png");
+ }
errorPanel.add(new JLabel(htmlWrap(details.get(i)), icon, SwingConstants.LEFT));
}
diff -r 7e15398e117d -r ef2c2def287a netx/net/sourceforge/jnlp/util/ScreenFinder.java
--- a/netx/net/sourceforge/jnlp/util/ScreenFinder.java Wed Oct 26 16:06:50 2016 +0200
+++ b/netx/net/sourceforge/jnlp/util/ScreenFinder.java Tue Nov 01 17:04:13 2016 +0100
@@ -102,7 +102,7 @@
Rectangle screenSize = device.getDefaultConfiguration().getBounds();
Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(device.getDefaultConfiguration());
return new Rectangle((int) screenSize.getX() + insets.left, (int) screenSize.getY() + insets.top, (int) screenSize.getWidth() - insets.left, (int) screenSize.getHeight() - insets.bottom);
- } catch (HeadlessException ex) {
+ } catch (HeadlessException | IllegalArgumentException ex) {
OutputController.getLogger().log(ex);
return new Rectangle(800, 600);
}
More information about the distro-pkg-dev
mailing list