--- a/ChangeLog	Tue Dec 12 15:13:04 2017 +0100
+++ b/ChangeLog	Fri Dec 15 14:30:07 2017 +0100
@@ -1,3 +1,14 @@
+2017-15-12  Fridrich Strba  <fridrich.strba@suse.com>
+
+	Set source language version for javadoc generation for jdk9, Get rid of X509Factory class usage, Plugin made work again with jdk9
+	* Makefile.am: (JAVADOC_OPTS) if HAVE_JAVA9 then -source is appended with 
+	correct IT_LANGUAGE_SOURCE_VERSION number
+	* netx/net/sourceforge/jnlp/security/CertificateUtils.java: removed import and usage of
+	X509Factory (replaced by hardcoded string). Still better then reflection.
+	* configure.ac: removed check for sun.security.provider.X509Factory
+	* launcher/launchers.in: added exports for sun.applet
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: same
+
 2017-12-08  Jiri Vanek <jvanek at redhat.com>
 
 	Added possibility to turn off https preference via deployment properties

--- a/Makefile.am	Tue Dec 12 15:13:04 2017 +0100
+++ b/Makefile.am	Fri Dec 15 14:30:07 2017 +0100
@@ -218,6 +218,9 @@
 if ENABLE_DOCS
 JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
  -bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
+if HAVE_JAVA9
+JAVADOC_OPTS+=-source $(IT_LANGUAGE_SOURCE_VERSION)
+endif
 if JAVADOC_SUPPORTS_J_OPTIONS
 JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m
 endif

--- a/configure.ac	Tue Dec 12 15:13:04 2017 +0100
+++ b/configure.ac	Fri Dec 15 14:30:07 2017 +0100
@@ -95,7 +95,6 @@
 IT_CHECK_FOR_CLASS(JAVA_NET_HTTPCOOKIE, [java.net.HttpCookie], [some.pkg], [])
 IT_CHECK_FOR_CLASS(JAVA_NET_COOKIEHANDLER, [java.net.CookieHandler], [some.pkg], [])
 # in jdk9, those classes are using internal apis, must be enabled via module cheats
-IT_CHECK_FOR_CLASS(SUN_SECURITY_PROVIDER_X509FACTORY, [sun.security.provider.X509Factory], [some.pkg], [$JAVA_BASE])
 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])

--- a/launcher/launchers.in	Tue Dec 12 15:13:04 2017 +0100
+++ b/launcher/launchers.in	Fri Dec 15 14:30:07 2017 +0100
@@ -167,6 +167,10 @@
 k=$((k+1))
 COMMAND[k]="java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop"
 k=$((k+1))
+COMMAND[k]="--add-exports"
+k=$((k+1))
+COMMAND[k]="java.desktop/sun.applet=ALL-UNNAMED,jdk.jsobject"
+k=$((k+1))
 fi
 
 

--- a/netx/net/sourceforge/jnlp/security/CertificateUtils.java	Tue Dec 12 15:13:04 2017 +0100
+++ b/netx/net/sourceforge/jnlp/security/CertificateUtils.java	Fri Dec 15 14:30:07 2017 +0100
@@ -58,7 +58,6 @@
 import net.sourceforge.jnlp.runtime.Translator;
 import net.sourceforge.jnlp.util.logging.OutputController;
 import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
-import sun.security.provider.X509Factory;
 
 /**
  * Common utilities to manipulate certificates. Provides methods to add
@@ -193,9 +192,9 @@
             CertificateException {
 
         BASE64Encoder encoder = new BASE64Encoder();
-        out.println(X509Factory.BEGIN_CERT);
+        out.println("-----BEGIN CERTIFICATE-----");
         encoder.encodeBuffer(cert.getEncoded(), out);
-        out.println(X509Factory.END_CERT);
+        out.println("-----END CERTIFICATE-----");
     }
 
     public static void dumpPKCS12(String alias, File file, KeyStore ks, char[] password)

--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Dec 12 15:13:04 2017 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Dec 15 14:30:07 2017 +0100
@@ -1588,7 +1588,8 @@
     "java.naming/com.sun.jndi.toolkit.url=ALL-UNNAMED,java.desktop",
     "java.desktop/sun.applet=ALL-UNNAMED,java.desktop",
     "java.base/sun.security.action=ALL-UNNAMED,java.desktop",
-    "java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop"
+    "java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop",
+    "java.desktop/sun.applet=ALL-UNNAMED,jdk.jsobject"
 };
 
 NPError