From 256cc336cd54a48d4cec49414722654c0b1ca5f5 Mon Sep 17 00:00:00 2001
From: Roman Grigoriadi <roman.grigoriadi@oracle.com>
Date: Thu, 16 Feb 2017 13:17:55 +0300
Subject: [PATCH] 8174735: Update JAX-WS RI integration to latest version

Reviewed-by: alanb, mchung, lancea
---
 jdk/src/java.base/share/classes/module-info.java    | 3 +--
 jdk/src/java.base/share/lib/security/default.policy | 8 +++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java
index 3ad3f4a096c..2923ad5ee7a 100644
--- a/jdk/src/java.base/share/classes/module-info.java
+++ b/jdk/src/java.base/share/classes/module-info.java
@@ -239,8 +239,7 @@ module java.base {
         java.management.rmi,
         java.rmi,
         java.sql.rowset,
-        java.xml,
-        java.xml.ws;
+        java.xml;
     exports sun.security.action to
         java.desktop,
         java.security.jgss;
diff --git a/jdk/src/java.base/share/lib/security/default.policy b/jdk/src/java.base/share/lib/security/default.policy
index 36521f38e1d..1a9df589fe1 100644
--- a/jdk/src/java.base/share/lib/security/default.policy
+++ b/jdk/src/java.base/share/lib/security/default.policy
@@ -69,6 +69,8 @@ grant codeBase "jrt:/java.sql.rowset" {
 };
 
 grant codeBase "jrt:/java.xml.bind" {
+    permission java.lang.RuntimePermission
+                   "accessClassInPackage.sun.misc";
     permission java.lang.RuntimePermission
                    "accessClassInPackage.com.sun.xml.internal.*";
     permission java.lang.RuntimePermission
@@ -105,17 +107,13 @@ grant codeBase "jrt:/java.xml.ws" {
     permission java.net.NetPermission
                    "getProxySelector";
     permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.org.apache.xml.internal.resolver";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.org.apache.xml.internal.resolver.tools";
+                   "accessClassInPackage.sun.misc";
     permission java.lang.RuntimePermission
                    "accessClassInPackage.com.sun.xml.internal.*";
     permission java.lang.RuntimePermission
                    "accessClassInPackage.com.sun.istack.internal";
     permission java.lang.RuntimePermission
                    "accessClassInPackage.com.sun.istack.internal.*";
-    permission java.lang.RuntimePermission
-                   "accessClassInPackage.com.sun.org.apache.xerces.internal.*";
     permission java.lang.RuntimePermission "accessDeclaredMembers";
     permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
     permission java.util.PropertyPermission "*", "read";