--- old/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java	2017-06-16 17:01:34.596660944 +0100
+++ new/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java	2017-06-16 17:01:34.540660943 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,90 +25,88 @@
 
 package com.sun.xml.internal.ws.resources;
 
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.annotation.Generated;
 import com.sun.istack.internal.localization.Localizable;
 import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
 import com.sun.istack.internal.localization.Localizer;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class StreamingMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.streaming";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, StreamingMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.streaming";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new StreamingMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    public static Localizable localizableFASTINFOSET_DECODING_NOT_ACCEPTED() {
-        return messageFactory.getMessage("fastinfoset.decodingNotAccepted");
+    public static Localizable localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState.message", arg0, arg1, arg2);
     }
 
     /**
-     * Fast Infoset decoding is not accepted
+     * unexpected XML reader state. expected: {0} but found: {1}. {2}
      *
      */
-    public static String FASTINFOSET_DECODING_NOT_ACCEPTED() {
-        return localizer.localize(localizableFASTINFOSET_DECODING_NOT_ACCEPTED());
+    public static String XMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableSTAX_CANT_CREATE() {
-        return messageFactory.getMessage("stax.cantCreate");
+    public static Localizable localizableXMLRECORDER_RECORDING_ENDED() {
+        return MESSAGE_FACTORY.getMessage("xmlrecorder.recording.ended");
     }
 
     /**
-     * Unable to create StAX reader or writer
+     * no more recorded elements available
      *
      */
-    public static String STAX_CANT_CREATE() {
-        return localizer.localize(localizableSTAX_CANT_CREATE());
+    public static String XMLRECORDER_RECORDING_ENDED() {
+        return LOCALIZER.localize(localizableXMLRECORDER_RECORDING_ENDED());
     }
 
-    public static Localizable localizableSTREAMING_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("streaming.ioException", arg0);
+    public static Localizable localizableXMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState.tag", arg0, arg1);
     }
 
     /**
-     * XML parsing error: {0}
+     * unexpected XML tag. expected: {0} but found: {1}
      *
      */
-    public static String STREAMING_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableSTREAMING_IO_EXCEPTION(arg0));
+    public static String XMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE_TAG(arg0, arg1));
     }
 
-    public static Localizable localizableSOURCEREADER_INVALID_SOURCE(Object arg0) {
-        return messageFactory.getMessage("sourcereader.invalidSource", arg0);
+    public static Localizable localizableFASTINFOSET_NO_IMPLEMENTATION() {
+        return MESSAGE_FACTORY.getMessage("fastinfoset.noImplementation");
     }
 
     /**
-     * Unable to create reader from source "{0}"
+     * Unable to locate compatible implementation of Fast Infoset in classpath
      *
      */
-    public static String SOURCEREADER_INVALID_SOURCE(Object arg0) {
-        return localizer.localize(localizableSOURCEREADER_INVALID_SOURCE(arg0));
+    public static String FASTINFOSET_NO_IMPLEMENTATION() {
+        return LOCALIZER.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
     }
 
-    public static Localizable localizableXMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("xmlreader.unexpectedState", arg0, arg1);
+    public static Localizable localizableXMLREADER_NESTED_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.nestedError", arg0);
     }
 
     /**
-     * unexpected XML reader state. expected: {0} but found: {1}
+     * XML reader error: {0}
      *
      */
-    public static String XMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
+    public static String XMLREADER_NESTED_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_NESTED_ERROR(arg0));
     }
 
     public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) {
-        return messageFactory.getMessage("woodstox.cant.load", arg0);
+        return MESSAGE_FACTORY.getMessage("woodstox.cant.load", arg0);
     }
 
     /**
@@ -116,199 +114,210 @@
      *
      */
     public static String WOODSTOX_CANT_LOAD(Object arg0) {
-        return localizer.localize(localizableWOODSTOX_CANT_LOAD(arg0));
+        return LOCALIZER.localize(localizableWOODSTOX_CANT_LOAD(arg0));
     }
 
-    public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("xmlreader.ioException", arg0);
+    public static Localizable localizableSOURCEREADER_INVALID_SOURCE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("sourcereader.invalidSource", arg0);
     }
 
     /**
-     * XML reader error: {0}
+     * Unable to create reader from source "{0}"
      *
      */
-    public static String XMLREADER_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableXMLREADER_IO_EXCEPTION(arg0));
+    public static String SOURCEREADER_INVALID_SOURCE(Object arg0) {
+        return LOCALIZER.localize(localizableSOURCEREADER_INVALID_SOURCE(arg0));
     }
 
-    public static Localizable localizableFASTINFOSET_NO_IMPLEMENTATION() {
-        return messageFactory.getMessage("fastinfoset.noImplementation");
+    public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
     }
 
     /**
-     * Unable to locate compatible implementation of Fast Infoset in classpath
+     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
      *
      */
-    public static String FASTINFOSET_NO_IMPLEMENTATION() {
-        return localizer.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
+    public static String INVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableINVALID_PROPERTY_VALUE_INTEGER(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
+    public static Localizable localizableXMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlwriter.noPrefixForURI", arg0);
     }
 
     /**
-     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
+     * XML writer error: no prefix for URI: "{0}"
      *
      */
-    public static String INVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableINVALID_PROPERTY_VALUE_INTEGER(arg0, arg1, arg2));
+    public static String XMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
+        return LOCALIZER.localize(localizableXMLWRITER_NO_PREFIX_FOR_URI(arg0));
     }
 
-    public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("xmlwriter.ioException", arg0);
+    public static Localizable localizableSTREAMING_PARSE_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("streaming.parseException", arg0);
     }
 
     /**
-     * XML writer error: {0}
+     * XML parsing error: {0}
      *
      */
-    public static String XMLWRITER_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableXMLWRITER_IO_EXCEPTION(arg0));
+    public static String STREAMING_PARSE_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableSTREAMING_PARSE_EXCEPTION(arg0));
     }
 
-    public static Localizable localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
-        return messageFactory.getMessage("xmlreader.unexpectedCharacterContent", arg0);
+    public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.ioException", arg0);
     }
 
     /**
-     * XML reader error: unexpected character content: "{0}"
+     * XML reader error: {0}
      *
      */
-    public static String XMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(arg0));
+    public static String XMLREADER_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_IO_EXCEPTION(arg0));
     }
 
-    public static Localizable localizableSTREAMING_PARSE_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("streaming.parseException", arg0);
+    public static Localizable localizableFASTINFOSET_DECODING_NOT_ACCEPTED() {
+        return MESSAGE_FACTORY.getMessage("fastinfoset.decodingNotAccepted");
     }
 
     /**
-     * XML parsing error: {0}
+     * Fast Infoset decoding is not accepted
      *
      */
-    public static String STREAMING_PARSE_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableSTREAMING_PARSE_EXCEPTION(arg0));
+    public static String FASTINFOSET_DECODING_NOT_ACCEPTED() {
+        return LOCALIZER.localize(localizableFASTINFOSET_DECODING_NOT_ACCEPTED());
     }
 
-    public static Localizable localizableXMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
-        return messageFactory.getMessage("xmlwriter.noPrefixForURI", arg0);
+    public static Localizable localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.illegalStateEncountered", arg0);
     }
 
     /**
-     * XML writer error: no prefix for URI: "{0}"
+     * XML reader internal error: illegal state ({0})
      *
      */
-    public static String XMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
-        return localizer.localize(localizableXMLWRITER_NO_PREFIX_FOR_URI(arg0));
+    public static String XMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(arg0));
     }
 
-    public static Localizable localizableXMLREADER_NESTED_ERROR(Object arg0) {
-        return messageFactory.getMessage("xmlreader.nestedError", arg0);
+    public static Localizable localizableSTAX_CANT_CREATE() {
+        return MESSAGE_FACTORY.getMessage("stax.cantCreate");
     }
 
     /**
-     * XML reader error: {0}
+     * Unable to create StAX reader or writer
      *
      */
-    public static String XMLREADER_NESTED_ERROR(Object arg0) {
-        return localizer.localize(localizableXMLREADER_NESTED_ERROR(arg0));
+    public static String STAX_CANT_CREATE() {
+        return LOCALIZER.localize(localizableSTAX_CANT_CREATE());
     }
 
-    public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("invalid.property.value.long", arg0, arg1, arg2);
+    public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("staxreader.xmlstreamexception", arg0);
     }
 
     /**
-     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
+     * XML stream reader exception: {0}
      *
      */
-    public static String INVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableINVALID_PROPERTY_VALUE_LONG(arg0, arg1, arg2));
+    public static String STAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableSTAXREADER_XMLSTREAMEXCEPTION(arg0));
     }
 
-    public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
-        return messageFactory.getMessage("staxreader.xmlstreamexception", arg0);
+    public static Localizable localizableXMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState", arg0, arg1);
     }
 
     /**
-     * XML stream reader exception: {0}
+     * unexpected XML reader state. expected: {0} but found: {1}
      *
      */
-    public static String STAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
-        return localizer.localize(localizableSTAXREADER_XMLSTREAMEXCEPTION(arg0));
+    public static String XMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
     }
 
-    public static Localizable localizableXMLWRITER_NESTED_ERROR(Object arg0) {
-        return messageFactory.getMessage("xmlwriter.nestedError", arg0);
+    public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("invalid.property.value.long", arg0, arg1, arg2);
     }
 
     /**
-     * XML writer error: {0}
+     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
      *
      */
-    public static String XMLWRITER_NESTED_ERROR(Object arg0) {
-        return localizer.localize(localizableXMLWRITER_NESTED_ERROR(arg0));
+    public static String INVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableINVALID_PROPERTY_VALUE_LONG(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
-        return messageFactory.getMessage("xmlreader.illegalStateEncountered", arg0);
+    public static Localizable localizableSTREAMING_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("streaming.ioException", arg0);
     }
 
     /**
-     * XML reader internal error: illegal state ({0})
+     * XML parsing error: {0}
      *
      */
-    public static String XMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
-        return localizer.localize(localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(arg0));
+    public static String STREAMING_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableSTREAMING_IO_EXCEPTION(arg0));
     }
 
-    public static Localizable localizableXMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
-        return messageFactory.getMessage("xmlreader.unexpectedState.tag", arg0, arg1);
+    public static Localizable localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedCharacterContent", arg0);
     }
 
     /**
-     * unexpected XML tag. expected: {0} but found: {1}
+     * XML reader error: unexpected character content: "{0}"
      *
      */
-    public static String XMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE_TAG(arg0, arg1));
+    public static String XMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(arg0));
     }
 
-    public static Localizable localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("xmlreader.unexpectedState.message", arg0, arg1, arg2);
+    public static Localizable localizableXMLWRITER_NESTED_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlwriter.nestedError", arg0);
     }
 
     /**
-     * unexpected XML reader state. expected: {0} but found: {1}. {2}
+     * XML writer error: {0}
      *
      */
-    public static String XMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(arg0, arg1, arg2));
+    public static String XMLWRITER_NESTED_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableXMLWRITER_NESTED_ERROR(arg0));
     }
 
-    public static Localizable localizableXMLREADER_PARSE_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("xmlreader.parseException", arg0);
+    public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlwriter.ioException", arg0);
     }
 
     /**
-     * XML parsing error: {0}
+     * XML writer error: {0}
      *
      */
-    public static String XMLREADER_PARSE_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableXMLREADER_PARSE_EXCEPTION(arg0));
+    public static String XMLWRITER_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableXMLWRITER_IO_EXCEPTION(arg0));
     }
 
-    public static Localizable localizableXMLRECORDER_RECORDING_ENDED() {
-        return messageFactory.getMessage("xmlrecorder.recording.ended");
+    public static Localizable localizableXMLREADER_PARSE_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.parseException", arg0);
     }
 
     /**
-     * no more recorded elements available
+     * XML parsing error: {0}
      *
      */
-    public static String XMLRECORDER_RECORDING_ENDED() {
-        return localizer.localize(localizableXMLRECORDER_RECORDING_ENDED());
+    public static String XMLREADER_PARSE_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_PARSE_EXCEPTION(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }