+ * (The current implementation looks for the {@code mailcap} file + * in the Java runtime in the directory java.home{@code /conf} + * if it exists, and otherwise in the directory + * java.home{@code /lib}, where java.home is the value + * of the "java.home" System property. Note that the "conf" directory was + * introduced in JDK 9.) + *
* Mailcap file format:
* * Mailcap files must conform to the mailcap @@ -120,6 +129,29 @@ private MailcapFile[] DB; private static final int PROG = 0; // programmatically added entries + private static final String confDir; + + static { + String dir = null; + try { + dir = (String)AccessController.doPrivileged( + new PrivilegedAction() { + public Object run() { + String home = System.getProperty("java.home"); + String newdir = home + File.separator + "conf"; + File conf = new File(newdir); + if (conf.exists()) + return newdir + File.separator; + else + return home + File.separator + "lib" + File.separator; + } + }); + } catch (Exception ex) { + // ignore any exceptions + } + confDir = dir; + } + /** * The default Constructor. */ @@ -144,11 +176,11 @@ LogSupport.log("MailcapCommandMap: load SYS"); try { // check system's home - String system_mailcap = System.getProperty("java.home") + - File.separator + "lib" + File.separator + "mailcap"; - mf = loadFile(system_mailcap); - if (mf != null) - dbv.add(mf); + if (confDir != null) { + mf = loadFile(confDir + "mailcap"); + if (mf != null) + dbv.add(mf); + } } catch (SecurityException ex) {} LogSupport.log("MailcapCommandMap: load JAR"); @@ -633,6 +665,7 @@ * entries that specify a view command for the specified * MIME type are returned. * + * @param mimeType the MIME type * @return array of native command entries * @since 1.6, JAF 1.1 */ diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.activation/share/classes/javax/activation/MimeType.java --- a/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java Thu Aug 24 16:24:37 2017 +0200 +++ b/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java Thu Aug 24 16:24:44 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, 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 @@ -58,6 +58,7 @@ * Constructor that builds a MimeType from a String. * * @param rawdata the MIME type string + * @exception MimeTypeParseException if the MIME type can't be parsed */ public MimeType(String rawdata) throws MimeTypeParseException { parse(rawdata); @@ -258,6 +259,7 @@ * * @param rawdata the MIME type string to compare with * @return true if they match + * @exception MimeTypeParseException if the MIME type can't be parsed */ public boolean match(String rawdata) throws MimeTypeParseException { return match(new MimeType(rawdata)); diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java --- a/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java Thu Aug 24 16:24:37 2017 +0200 +++ b/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java Thu Aug 24 16:24:44 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, 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 @@ -58,6 +58,7 @@ * Constructs a new MimeTypeParameterList with the passed in data. * * @param parameterList an RFC 2045, 2046 compliant parameter list. + * @exception MimeTypeParseException if the MIME type can't be parsed */ public MimeTypeParameterList(String parameterList) throws MimeTypeParseException { @@ -71,6 +72,7 @@ * A routine for parsing the parameter list out of a String. * * @param parameterList an RFC 2045, 2046 compliant parameter list. + * @exception MimeTypeParseException if the MIME type can't be parsed */ protected void parse(String parameterList) throws MimeTypeParseException { if (parameterList == null) diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java --- a/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java Thu Aug 24 16:24:37 2017 +0200 +++ b/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java Thu Aug 24 16:24:44 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, 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 @@ -28,6 +28,8 @@ import java.io.*; import java.net.*; import java.util.*; +import java.security.AccessController; +import java.security.PrivilegedAction; import com.sun.activation.registries.MimeTypeFile; import com.sun.activation.registries.LogSupport; @@ -43,12 +45,19 @@ *
+ * (The current implementation looks for the {@code mime.types} file + * in the Java runtime in the directory java.home{@code /conf} + * if it exists, and otherwise in the directory + * java.home{@code /lib}, where java.home is the value + * of the "java.home" System property. Note that the "conf" directory was + * introduced in JDK 9.) + *
* MIME types file format: * *
{@code
@@ -72,7 +81,30 @@
private MimeTypeFile[] DB;
private static final int PROG = 0; // programmatically added entries
- private static String defaultType = "application/octet-stream";
+ private static final String defaultType = "application/octet-stream";
+
+ private static final String confDir;
+
+ static {
+ String dir = null;
+ try {
+ dir = (String)AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public Object run() {
+ String home = System.getProperty("java.home");
+ String newdir = home + File.separator + "conf";
+ File conf = new File(newdir);
+ if (conf.exists())
+ return newdir + File.separator;
+ else
+ return home + File.separator + "lib" + File.separator;
+ }
+ });
+ } catch (Exception ex) {
+ // ignore any exceptions
+ }
+ confDir = dir;
+ }
/**
* The default constructor.
@@ -97,11 +129,11 @@
LogSupport.log("MimetypesFileTypeMap: load SYS");
try {
// check system's home
- String system_mimetypes = System.getProperty("java.home") +
- File.separator + "lib" + File.separator + "mime.types";
- mf = loadFile(system_mimetypes);
- if (mf != null)
- dbv.addElement(mf);
+ if (confDir != null) {
+ mf = loadFile(confDir + "mime.types");
+ if (mf != null)
+ dbv.addElement(mf);
+ }
} catch (SecurityException ex) {}
LogSupport.log("MimetypesFileTypeMap: load JAR");
@@ -239,6 +271,7 @@
* added from the named file.
*
* @param mimeTypeFileName the file name
+ * @exception IOException for errors reading the file
*/
public MimetypesFileTypeMap(String mimeTypeFileName) throws IOException {
this();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.activation/share/classes/module-info.java
--- a/jaxws/src/java.activation/share/classes/module-info.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.activation/share/classes/module-info.java Thu Aug 24 16:24:44 2017 +0200
@@ -26,13 +26,16 @@
/**
* Defines the JavaBeans Activation Framework (JAF) API.
*
+ * This module is upgradeble.
+ *
* @moduleGraph
* @since 9
*/
@Deprecated(since="9", forRemoval=true)
module java.activation {
+ requires java.logging;
+
requires transitive java.datatransfer;
- requires java.logging;
exports javax.activation;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -48,10 +48,10 @@
int limit = start+length;
for (int i = start; i < limit; i++) {
char c = ch[i];
- if(c == '&' || c == '<' || c == '>' || c == '\r' || (c == '\"' && isAttVal) ) {
- if(i!=start)
- out.write(ch,start,i-start);
- start = i+1;
+ if (c == '&' || c == '<' || c == '>' || c == '\r' || (c == '\n' && isAttVal) || (c == '\"' && isAttVal)) {
+ if (i != start)
+ out.write(ch, start, i - start);
+ start = i + 1;
switch (ch[i]) {
case '&':
out.write("&");
@@ -65,6 +65,14 @@
case '\"':
out.write(""");
break;
+ case '\n':
+ case '\r':
+ out.write("&#");
+ out.write(Integer.toString(c));
+ out.write(';');
+ break;
+ default:
+ throw new IllegalArgumentException("Cannot escape: '" + c + "'");
}
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.bind.marshaller;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Performs no character escaping.
+ *
+ * @author
+ * Roman Grigoriadi (roman.grigoriadi@oracle.com)
+ */
+public class NoEscapeHandler implements CharacterEscapeHandler {
+
+ public static final NoEscapeHandler theInstance = new NoEscapeHandler();
+
+ @Override
+ public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException {
+ out.write(ch, start, length);
+ }
+}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -76,7 +76,7 @@
public void marshal(Marshaller _m, T t, XMLStreamWriter output) throws JAXBException {
MarshallerImpl m = (MarshallerImpl)_m;
- m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context),new StAXPostInitAction(output,m.serializer));
+ m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context, m.getEscapeHandler()),new StAXPostInitAction(output,m.serializer));
}
public void marshal(Marshaller _m, T t, OutputStream output, NamespaceContext nsContext) throws JAXBException {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, 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
@@ -165,7 +165,7 @@
@Override
public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException {
- write(obj, XMLStreamWriterOutput.create(writer,context), new StAXPostInitAction(writer,serializer));
+ write(obj, XMLStreamWriterOutput.create(writer,context, escapeHandler), new StAXPostInitAction(writer,serializer));
}
@Override
@@ -371,6 +371,15 @@
}
+ /**
+ * Returns escape handler provided with JAXB context parameters.
+ *
+ * @return escape handler
+ */
+ CharacterEscapeHandler getEscapeHandler() {
+ return escapeHandler;
+ }
+
//
//
// create XMLWriter by specifing various type of output.
@@ -436,13 +445,14 @@
if(encoding.equals("UTF-8")) {
Encoded[] table = context.getUTF8NameTable();
final UTF8XmlOutput out;
+ CharacterEscapeHandler ceh = createEscapeHandler(encoding);
if(isFormattedOutput())
- out = new IndentingUTF8XmlOutput(os, indent, table, escapeHandler);
+ out = new IndentingUTF8XmlOutput(os, indent, table, ceh);
else {
if(c14nSupport)
- out = new C14nXmlOutput(os, table, context.c14nSupport, escapeHandler);
+ out = new C14nXmlOutput(os, table, context.c14nSupport, ceh);
else
- out = new UTF8XmlOutput(os, table, escapeHandler);
+ out = new UTF8XmlOutput(os, table, ceh);
}
if(header!=null)
out.setHeader(header);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, 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,21 +25,22 @@
package com.sun.xml.internal.bind.v2.runtime.output;
+import com.sun.xml.internal.bind.marshaller.NoEscapeHandler;
import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.internal.bind.v2.runtime.Name;
import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
-import javax.xml.stream.XMLStreamException;
-
import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
import com.sun.xml.internal.fastinfoset.EncodingConstants;
import com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer;
+import com.sun.xml.internal.org.jvnet.fastinfoset.VocabularyApplicationData;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.stream.XMLStreamException;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
import java.util.WeakHashMap;
-import javax.xml.bind.JAXBContext;
-import com.sun.xml.internal.org.jvnet.fastinfoset.VocabularyApplicationData;
-import org.xml.sax.SAXException;
/**
* {@link XmlOutput} for {@link StAXDocumentSerializer}.
@@ -220,7 +221,7 @@
public FastInfosetStreamWriterOutput(StAXDocumentSerializer out,
JAXBContextImpl context) {
- super(out);
+ super(out, NoEscapeHandler.theInstance);
this.fiout = out;
this.localNames = context.getUTF8NameTable();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -27,6 +27,7 @@
import javax.xml.stream.XMLStreamException;
+import com.sun.xml.internal.bind.marshaller.NoEscapeHandler;
import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
@@ -40,7 +41,7 @@
private final XMLStreamWriterEx out;
public StAXExStreamWriterOutput(XMLStreamWriterEx out) {
- super(out);
+ super(out, NoEscapeHandler.theInstance);
this.out = out;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -26,15 +26,16 @@
package com.sun.xml.internal.bind.v2.runtime.output;
import java.io.IOException;
+import java.io.Writer;
import java.lang.reflect.Constructor;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import com.sun.xml.internal.bind.marshaller.CharacterEscapeHandler;
import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallerImpl;
import org.xml.sax.SAXException;
/**
@@ -53,7 +54,7 @@
* Creates a new {@link XmlOutput} from a {@link XMLStreamWriter}.
* This method recognizes an FI StAX writer.
*/
- public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context) {
+ public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context, CharacterEscapeHandler escapeHandler) {
// try optimized path
final Class writerClass = out.getClass();
if (writerClass==FI_STAX_WRITER_CLASS) {
@@ -69,17 +70,26 @@
}
}
+ CharacterEscapeHandler xmlStreamEscapeHandler = escapeHandler != null ?
+ escapeHandler : NewLineEscapeHandler.theInstance;
+
// otherwise the normal writer.
- return new XMLStreamWriterOutput(out);
+ return new XMLStreamWriterOutput(out, xmlStreamEscapeHandler);
}
private final XMLStreamWriter out;
+ private final CharacterEscapeHandler escapeHandler;
+
+ private final XmlStreamOutWriterAdapter writerWrapper;
+
protected final char[] buf = new char[256];
- protected XMLStreamWriterOutput(XMLStreamWriter out) {
+ protected XMLStreamWriterOutput(XMLStreamWriter out, CharacterEscapeHandler escapeHandler) {
this.out = out;
+ this.escapeHandler = escapeHandler;
+ this.writerWrapper = new XmlStreamOutWriterAdapter(out);
}
// not called if we are generating fragments
@@ -137,7 +147,7 @@
public void text(String value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException {
if(needsSeparatingWhitespace)
out.writeCharacters(" ");
- out.writeCharacters(value);
+ escapeHandler.escape(value.toCharArray(), 0, value.length(), false, writerWrapper);
}
public void text(Pcdata value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException {
@@ -207,4 +217,81 @@
}
}
+ /**
+ * Performs character escaping only for new lines.
+ */
+ private static class NewLineEscapeHandler implements CharacterEscapeHandler {
+
+ public static final NewLineEscapeHandler theInstance = new NewLineEscapeHandler();
+
+ @Override
+ public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException {
+ int limit = start+length;
+ int lastEscaped = start;
+ for (int i = start; i < limit; i++) {
+ char c = ch[i];
+ if (c == '\r' || c == '\n') {
+ if (i != lastEscaped) {
+ out.write(ch, lastEscaped, i - lastEscaped);
+ }
+ lastEscaped = i + 1;
+ if (out instanceof XmlStreamOutWriterAdapter) {
+ try {
+ ((XmlStreamOutWriterAdapter)out).writeEntityRef("#x" + Integer.toHexString(c));
+ } catch (XMLStreamException e) {
+ throw new IOException("Error writing xml stream", e);
+ }
+ } else {
+ out.write("&#x");
+ out.write(Integer.toHexString(c));
+ out.write(';');
+ }
+ }
+ }
+
+ if (lastEscaped != limit) {
+ out.write(ch, lastEscaped, length - lastEscaped);
+ }
+ }
+ }
+
+ private static final class XmlStreamOutWriterAdapter extends Writer {
+
+ private final XMLStreamWriter writer;
+
+ private XmlStreamOutWriterAdapter(XMLStreamWriter writer) {
+ this.writer = writer;
+ }
+
+ @Override
+ public void write(char[] cbuf, int off, int len) throws IOException {
+ try {
+ writer.writeCharacters(cbuf, off, len);
+ } catch (XMLStreamException e) {
+ throw new IOException("Error writing XML stream", e);
+ }
+ }
+
+ public void writeEntityRef(String entityReference) throws XMLStreamException {
+ writer.writeEntityRef(entityReference);
+ }
+
+ @Override
+ public void flush() throws IOException {
+ try {
+ writer.flush();
+ } catch (XMLStreamException e) {
+ throw new IOException("Error flushing XML stream", e);
+ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ try {
+ writer.close();
+ } catch (XMLStreamException e) {
+ throw new IOException("Error closing XML stream", e);
+ }
+ }
+ }
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java Thu Aug 24 16:24:44 2017 +0200
@@ -150,13 +150,14 @@
* Create an instance of a class using the specified ClassLoader
*/
static JAXBContext newInstance(String contextPath,
+ Class[] contextPathClasses,
String className,
ClassLoader classLoader,
Map properties) throws JAXBException {
try {
Class spFactory = ServiceLoaderUtil.safeLoadClass(className, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader);
- return newInstance(contextPath, spFactory, classLoader, properties);
+ return newInstance(contextPath, contextPathClasses, spFactory, classLoader, properties);
} catch (ClassNotFoundException x) {
throw new JAXBException(Messages.format(Messages.DEFAULT_PROVIDER_NOT_FOUND), x);
@@ -175,6 +176,7 @@
}
static JAXBContext newInstance(String contextPath,
+ Class[] contextPathClasses,
Class spFactory,
ClassLoader classLoader,
Map properties) throws JAXBException {
@@ -212,6 +214,9 @@
// the cast would fail, so generate an exception with a nice message
throw handleClassCastException(context.getClass(), JAXBContext.class);
}
+
+ ModuleUtil.delegateAddOpensToImplModule(contextPathClasses, spFactory);
+
return (JAXBContext) context;
} catch (InvocationTargetException x) {
// throw if it is exception not to be wrapped
@@ -277,6 +282,7 @@
// the cast would fail, so generate an exception with a nice message
throw handleClassCastException(context.getClass(), JAXBContext.class);
}
+ ModuleUtil.delegateAddOpensToImplModule(classes, spFactory);
return (JAXBContext) context;
} catch (NoSuchMethodException | IllegalAccessException e) {
@@ -295,50 +301,52 @@
ClassLoader classLoader,
Map properties) throws JAXBException {
- StringTokenizer packages = new StringTokenizer(contextPath, ":");
- if (!packages.hasMoreTokens()) {
+ if (contextPath == null || contextPath.isEmpty()) {
// no context is specified
throw new JAXBException(Messages.format(Messages.NO_PACKAGE_IN_CONTEXTPATH));
}
- // search for jaxb.properties in the class loader of each class first
- logger.fine("Searching jaxb.properties");
- while (packages.hasMoreTokens()) {
- // com.acme.foo - > com/acme/foo/jaxb.properties
- String factoryClassName =
- classNameFromPackageProperties(
- classLoader,
- packages.nextToken(":").replace('.', '/'),
- factoryId,
- JAXB_CONTEXT_FACTORY_DEPRECATED);
+ //ModuleUtil is mr-jar class, scans context path for jaxb classes on jdk9 and higher
+ Class[] contextPathClasses = ModuleUtil.getClassesFromContextPath(contextPath, classLoader);
- if (factoryClassName != null) {
- return newInstance(contextPath, factoryClassName, classLoader, properties);
- }
+ //first try with classloader#getResource
+ String factoryClassName = jaxbProperties(contextPath, classLoader, factoryId);
+ if (factoryClassName == null && contextPathClasses != null) {
+ //try with class#getResource
+ factoryClassName = jaxbProperties(contextPathClasses, factoryId);
}
+ if (factoryClassName != null) {
+ return newInstance(contextPath, contextPathClasses, factoryClassName, classLoader, properties);
+ }
+
+
String factoryName = classNameFromSystemProperties();
- if (factoryName != null) return newInstance(contextPath, factoryName, classLoader, properties);
+ if (factoryName != null) return newInstance(contextPath, contextPathClasses, factoryName, classLoader, properties);
JAXBContextFactory obj = ServiceLoaderUtil.firstByServiceLoader(
JAXBContextFactory.class, logger, EXCEPTION_HANDLER);
- if (obj != null) return obj.createContext(contextPath, classLoader, properties);
+ if (obj != null) {
+ JAXBContext context = obj.createContext(contextPath, classLoader, properties);
+ ModuleUtil.delegateAddOpensToImplModule(contextPathClasses, obj.getClass());
+ return context;
+ }
// to ensure backwards compatibility
factoryName = firstByServiceLoaderDeprecated(JAXBContext.class, classLoader);
- if (factoryName != null) return newInstance(contextPath, factoryName, classLoader, properties);
+ if (factoryName != null) return newInstance(contextPath, contextPathClasses, factoryName, classLoader, properties);
Class ctxFactory = (Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader(
"javax.xml.bind.JAXBContext", logger);
if (ctxFactory != null) {
- return newInstance(contextPath, ctxFactory, classLoader, properties);
+ return newInstance(contextPath, contextPathClasses, ctxFactory, classLoader, properties);
}
// else no provider found
logger.fine("Trying to create the platform default provider");
- return newInstance(contextPath, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader, properties);
+ return newInstance(contextPath, contextPathClasses, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader, properties);
}
static JAXBContext find(Class[] classes, Map properties) throws JAXBException {
@@ -356,13 +364,18 @@
// TODO: it's easier to look things up from the class
// c.getResourceAsStream("jaxb.properties");
- String factoryClassName =
- classNameFromPackageProperties(
- getClassClassLoader(c),
- c.getPackage().getName().replace('.', '/'),
- JAXBContext.JAXB_CONTEXT_FACTORY, JAXB_CONTEXT_FACTORY_DEPRECATED);
+ URL jaxbPropertiesUrl = getResourceUrl(c, "jaxb.properties");
+
+ if (jaxbPropertiesUrl != null) {
- if (factoryClassName != null) return newInstance(classes, properties, factoryClassName);
+ String factoryClassName =
+ classNameFromPackageProperties(
+ jaxbPropertiesUrl,
+ JAXBContext.JAXB_CONTEXT_FACTORY, JAXB_CONTEXT_FACTORY_DEPRECATED);
+
+ return newInstance(classes, properties, factoryClassName);
+ }
+
}
String factoryClassName = classNameFromSystemProperties();
@@ -371,7 +384,11 @@
JAXBContextFactory factory =
ServiceLoaderUtil.firstByServiceLoader(JAXBContextFactory.class, logger, EXCEPTION_HANDLER);
- if (factory != null) return factory.createContext(classes, properties);
+ if (factory != null) {
+ JAXBContext context = factory.createContext(classes, properties);
+ ModuleUtil.delegateAddOpensToImplModule(classes, factory.getClass());
+ return context;
+ }
// to ensure backwards compatibility
String className = firstByServiceLoaderDeprecated(JAXBContext.class, getContextClassLoader());
@@ -395,22 +412,20 @@
* first factoryId should be the preferred one,
* more of those can be provided to support backwards compatibility
*/
- private static String classNameFromPackageProperties(ClassLoader classLoader,
- String packageName,
+ private static String classNameFromPackageProperties(URL packagePropertiesUrl,
String ... factoryIds) throws JAXBException {
- String resourceName = packageName + "/jaxb.properties";
- logger.log(Level.FINE, "Trying to locate {0}", resourceName);
- Properties props = loadJAXBProperties(classLoader, resourceName);
- if (props != null) {
- for(String factoryId : factoryIds) {
- if (props.containsKey(factoryId)) {
- return props.getProperty(factoryId);
- }
+ logger.log(Level.FINE, "Trying to locate {0}", packagePropertiesUrl.toString());
+ Properties props = loadJAXBProperties(packagePropertiesUrl);
+ for(String factoryId : factoryIds) {
+ if (props.containsKey(factoryId)) {
+ return props.getProperty(factoryId);
}
- throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, factoryIds[0]));
}
- return null;
+ //Factory key not found
+ String propertiesUrl = packagePropertiesUrl.toExternalForm();
+ String packageName = propertiesUrl.substring(0, propertiesUrl.indexOf("/jaxb.properties"));
+ throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, factoryIds[0]));
}
private static String classNameFromSystemProperties() throws JAXBException {
@@ -452,30 +467,40 @@
return value;
}
- private static Properties loadJAXBProperties(ClassLoader classLoader,
- String propFileName) throws JAXBException {
+ private static Properties loadJAXBProperties(URL url) throws JAXBException {
- Properties props = null;
try {
- URL url;
- if (classLoader == null)
- url = ClassLoader.getSystemResource(propFileName);
- else
- url = classLoader.getResource(propFileName);
-
- if (url != null) {
- logger.log(Level.FINE, "loading props from {0}", url);
- props = new Properties();
- InputStream is = url.openStream();
- props.load(is);
- is.close();
- }
+ Properties props;
+ logger.log(Level.FINE, "loading props from {0}", url);
+ props = new Properties();
+ InputStream is = url.openStream();
+ props.load(is);
+ is.close();
+ return props;
} catch (IOException ioe) {
- logger.log(Level.FINE, "Unable to load " + propFileName, ioe);
+ logger.log(Level.FINE, "Unable to load " + url.toString(), ioe);
throw new JAXBException(ioe.toString(), ioe);
}
+ }
- return props;
+ /**
+ * If run on JPMS package containing resource must be open unconditionally.
+ *
+ * @param classLoader classloader to load resource with
+ * @param resourceName qualified name of the resource
+ * @return resource url if found
+ */
+ private static URL getResourceUrl(ClassLoader classLoader, String resourceName) {
+ URL url;
+ if (classLoader == null)
+ url = ClassLoader.getSystemResource(resourceName);
+ else
+ url = classLoader.getResource(resourceName);
+ return url;
+ }
+
+ private static URL getResourceUrl(Class clazz, String resourceName) {
+ return clazz.getResource(resourceName);
}
@@ -606,4 +631,28 @@
}
}
+ private static String jaxbProperties(String contextPath, ClassLoader classLoader, String factoryId) throws JAXBException {
+ String[] packages = contextPath.split(":");
+
+ for (String pkg : packages) {
+ String pkgUrl = pkg.replace('.', '/');
+ URL jaxbPropertiesUrl = getResourceUrl(classLoader, pkgUrl + "/jaxb.properties");
+ if (jaxbPropertiesUrl != null) {
+ return classNameFromPackageProperties(jaxbPropertiesUrl,
+ factoryId, JAXB_CONTEXT_FACTORY_DEPRECATED);
+ }
+ }
+ return null;
+ }
+
+ private static String jaxbProperties(Class[] classesFromContextPath, String factoryId) throws JAXBException {
+ for (Class c : classesFromContextPath) {
+ URL jaxbPropertiesUrl = getResourceUrl(c, "jaxb.properties");
+ if (jaxbPropertiesUrl != null) {
+ return classNameFromPackageProperties(jaxbPropertiesUrl, factoryId, JAXB_CONTEXT_FACTORY_DEPRECATED);
+ }
+ }
+ return null;
+ }
+
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -27,11 +27,11 @@
import org.w3c.dom.Node;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
-import java.io.IOException;
-import java.io.InputStream;
/**
* The {@code JAXBContext} class provides the client's entry point to the
@@ -227,6 +227,9 @@
* This phase of the look up allows some packages to force the use of a certain JAXB implementation.
* (For example, perhaps the schema compiler has generated some vendor extension in the code.)
*
+ *
+ * This configuration method is deprecated.
+ *
*
* If the system property {@link #JAXB_CONTEXT_FACTORY} exists, then its value is assumed to be the provider
* factory class. If no such property exists, properties {@code "javax.xml.bind.context.factory"} and
@@ -332,7 +335,14 @@
* the context class loader of the current thread.
*
* @throws JAXBException if an error was encountered while creating the
- * {@code JAXBContext}. See {@link JAXBContext#newInstance(String, ClassLoader, Map)} for details.
+ * {@code JAXBContext} such as
+ *
+ * - failure to locate either ObjectFactory.class or jaxb.index in the packages
+ * - an ambiguity among global elements contained in the contextPath
+ * - failure to locate a value for the context factory provider property
+ * - mixing schema derived packages from different providers on the same contextPath
+ * - packages are not open to {@code java.xml.bind} module
+ *
*/
public static JAXBContext newInstance( String contextPath )
throws JAXBException {
@@ -414,16 +424,26 @@
*
* The steps involved in discovering the JAXB implementation is discussed in the class javadoc.
*
- * @param contextPath list of java package names that contain schema
- * derived class and/or java to schema (JAXB-annotated)
- * mapped classes
+ * @param contextPath
+ * List of java package names that contain schema
+ * derived class and/or java to schema (JAXB-annotated)
+ * mapped classes.
+ * Packages in {@code contextPath} that are in named modules must be
+ * {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
* @param classLoader
* This class loader will be used to locate the implementation
* classes.
*
* @return a new instance of a {@code JAXBContext}
* @throws JAXBException if an error was encountered while creating the
- * {@code JAXBContext}. See {@link JAXBContext#newInstance(String, ClassLoader, Map)} for details.
+ * {@code JAXBContext} such as
+ *
+ * - failure to locate either ObjectFactory.class or jaxb.index in the packages
+ * - an ambiguity among global elements contained in the contextPath
+ * - failure to locate a value for the context factory provider property
+ * - mixing schema derived packages from different providers on the same contextPath
+ * - packages are not open to {@code java.xml.bind} module
+ *
*/
public static JAXBContext newInstance( String contextPath, ClassLoader classLoader ) throws JAXBException {
@@ -442,7 +462,12 @@
* The interpretation of properties is up to implementations. Implementations must
* throw {@code JAXBException} if it finds properties that it doesn't understand.
*
- * @param contextPath list of java package names that contain schema derived classes
+ * @param contextPath
+ * List of java package names that contain schema
+ * derived class and/or java to schema (JAXB-annotated)
+ * mapped classes.
+ * Packages in {@code contextPath} that are in named modules must be
+ * {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
* @param classLoader
* This class loader will be used to locate the implementation classes.
* @param properties
@@ -457,6 +482,7 @@
* an ambiguity among global elements contained in the contextPath
* failure to locate a value for the context factory provider property
* mixing schema derived packages from different providers on the same contextPath
+ * packages are not open to {@code java.xml.bind} module
*
* @since 1.6, JAXB 2.0
*/
@@ -588,15 +614,27 @@
* The steps involved in discovering the JAXB implementation is discussed in the class javadoc.
*
* @param classesToBeBound
- * list of java classes to be recognized by the new {@link JAXBContext}.
+ * List of java classes to be recognized by the new {@link JAXBContext}.
+ * Classes in {@code classesToBeBound} that are in named modules must be in a package
+ * that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
* Can be empty, in which case a {@link JAXBContext} that only knows about
* spec-defined classes will be returned.
*
* @return
* A new instance of a {@code JAXBContext}.
*
- * @throws JAXBException if an error was encountered while creating the
- * {@code JAXBContext}. See {@link JAXBContext#newInstance(Class[], Map)} for details.
+ * @throws JAXBException
+ * if an error was encountered while creating the
+ * {@code JAXBContext}, such as (but not limited to):
+ *
+ * - No JAXB implementation was discovered
+ *
- Classes use JAXB annotations incorrectly
+ *
- Classes have colliding annotations (i.e., two classes with the same type name)
+ *
- The JAXB implementation was unable to locate
+ * provider-specific out-of-band information (such as additional
+ * files generated at the development time.)
+ *
- {@code classesToBeBound} are not open to {@code java.xml.bind} module
+ *
*
* @throws IllegalArgumentException
* if the parameter contains {@code null} (i.e., {@code newInstance(null);})
@@ -621,7 +659,9 @@
* throw {@code JAXBException} if it finds properties that it doesn't understand.
*
* @param classesToBeBound
- * list of java classes to be recognized by the new {@link JAXBContext}.
+ * List of java classes to be recognized by the new {@link JAXBContext}.
+ * Classes in {@code classesToBeBound} that are in named modules must be in a package
+ * that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
* Can be empty, in which case a {@link JAXBContext} that only knows about
* spec-defined classes will be returned.
* @param properties
@@ -641,6 +681,7 @@
* The JAXB implementation was unable to locate
* provider-specific out-of-band information (such as additional
* files generated at the development time.)
+ * {@code classesToBeBound} are not open to {@code java.xml.bind} module
*
*
* @throws IllegalArgumentException
@@ -702,6 +743,7 @@
* {@code Validator} object
* @deprecated since JAXB2.0
*/
+ @Deprecated
public abstract Validator createValidator() throws JAXBException;
/**
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -44,7 +44,9 @@
* For semantics see {@link javax.xml.bind.JAXBContext#newInstance(Class[], java.util.Map)}
*
* @param classesToBeBound
- * list of java classes to be recognized by the new {@link JAXBContext}.
+ * List of java classes to be recognized by the new {@link JAXBContext}.
+ * Classes in {@code classesToBeBound} that are in named modules must be in a package
+ * that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
* Can be empty, in which case a {@link JAXBContext} that only knows about
* spec-defined classes will be returned.
* @param properties
@@ -56,7 +58,16 @@
*
* @throws JAXBException
* if an error was encountered while creating the
- * {@code JAXBContext}. See {@link JAXBContext#newInstance(Class[], Map)} for details.
+ * {@code JAXBContext}, such as (but not limited to):
+ *
+ * - No JAXB implementation was discovered
+ *
- Classes use JAXB annotations incorrectly
+ *
- Classes have colliding annotations (i.e., two classes with the same type name)
+ *
- The JAXB implementation was unable to locate
+ * provider-specific out-of-band information (such as additional
+ * files generated at the development time.)
+ *
- {@code classesToBeBound} are not open to {@code java.xml.bind} module
+ *
*
* @throws IllegalArgumentException
* if the parameter contains {@code null} (i.e., {@code newInstance(null,someMap);})
@@ -77,7 +88,10 @@
* The interpretation of properties is up to implementations. Implementations must
* throw {@code JAXBException} if it finds properties that it doesn't understand.
*
- * @param contextPath list of java package names that contain schema derived classes
+ * @param contextPath
+ * List of java package names that contain schema derived classes.
+ * Classes in {@code classesToBeBound} that are in named modules must be in a package
+ * that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
* @param classLoader
* This class loader will be used to locate the implementation classes.
* @param properties
@@ -86,7 +100,14 @@
*
* @return a new instance of a {@code JAXBContext}
* @throws JAXBException if an error was encountered while creating the
- * {@code JAXBContext}. See {@link JAXBContext#newInstance(String, ClassLoader, Map)} for details.
+ * {@code JAXBContext} such as
+ *
+ * - failure to locate either ObjectFactory.class or jaxb.index in the packages
+ * - an ambiguity among global elements contained in the contextPath
+ * - failure to locate a value for the context factory provider property
+ * - mixing schema derived packages from different providers on the same contextPath
+ * - packages are not open to {@code java.xml.bind} module
+ *
*
* @since 9, JAXB 2.3
*/
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java Thu Aug 24 16:24:44 2017 +0200
@@ -91,4 +91,10 @@
static final String ILLEGAL_CAST = // 2 args
"JAXBContext.IllegalCast";
+
+ static final String ERROR_LOAD_CLASS = // 2 args
+ "ContextFinder.ErrorLoadClass";
+
+ static final String JAXB_CLASSES_NOT_OPEN = // 1 arg
+ "JAXBClasses.notOpen";
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties Thu Aug 24 16:24:44 2017 +0200
@@ -44,6 +44,11 @@
ContextFinder.NoPackageInContextPath = \
No package name is given
+ContextFinder.ErrorLoadClass = \
+ Error loading class {0} listed in {1}, make sure that entries are accessable \
+ on CLASSPATH and of the form ClassName or OuterClass.InnerClass \
+ not ClassName.class or fully.qualified.ClassName
+
PropertyException.NameValue = \
name: {0} value: {1}
@@ -52,3 +57,6 @@
JAXBContext.IllegalCast = \
ClassCastException: attempting to cast {0} to {1}. Please make sure that you are specifying the proper ClassLoader.
+
+JAXBClasses.notOpen = \
+ Package {0} with JAXB class {1} defined in a module {2} must be open to at least java.xml.bind module.
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.xml.bind;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.Module;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Propagates openness of JAXB annottated classess packages to JAXB impl module.
+ *
+ * @author Roman Grigoriadi
+ */
+class ModuleUtil {
+
+ private static Logger logger = Logger.getLogger("javax.xml.bind");
+
+ /**
+ * Resolves classes from context path.
+ * Only one class per package is needed to access its {@link java.lang.Module}
+ */
+ static Class[] getClassesFromContextPath(String contextPath, ClassLoader classLoader) throws JAXBException {
+ List classes = new ArrayList<>();
+ if (contextPath == null || contextPath.isEmpty()){
+ return classes.toArray(new Class[]{});
+ }
+
+ String [] tokens = contextPath.split(":");
+ for (String pkg : tokens){
+
+ // look for ObjectFactory and load it
+ final Class o;
+ try {
+ o = classLoader.loadClass(pkg+".ObjectFactory");
+ classes.add(o);
+ continue;
+ } catch (ClassNotFoundException e) {
+ // not necessarily an error
+ }
+
+ // look for jaxb.index and load the list of classes
+ try {
+ final Class firstByJaxbIndex = findFirstByJaxbIndex(pkg, classLoader);
+ if (firstByJaxbIndex != null) {
+ classes.add(firstByJaxbIndex);
+ }
+ } catch (IOException e) {
+ throw new JAXBException(e);
+ }
+ }
+
+ if (logger.isLoggable(Level.FINE)) {
+ logger.log(Level.FINE, "Resolved classes from context path: {0}", classes);
+ }
+ return classes.toArray(new Class[]{});
+ }
+
+ /**
+ * Find first class in package by {@code jaxb.index} file.
+ */
+ static Class findFirstByJaxbIndex(String pkg, ClassLoader classLoader) throws IOException, JAXBException {
+ final String resource = pkg.replace('.', '/') + "/jaxb.index";
+ final InputStream resourceAsStream = classLoader.getResourceAsStream(resource);
+
+ if (resourceAsStream == null) {
+ return null;
+ }
+
+ BufferedReader in =
+ new BufferedReader(new InputStreamReader(resourceAsStream, "UTF-8"));
+ try {
+ String className = in.readLine();
+ while (className != null) {
+ className = className.trim();
+ if (className.startsWith("#") || (className.length() == 0)) {
+ className = in.readLine();
+ continue;
+ }
+
+ try {
+ return classLoader.loadClass(pkg + '.' + className);
+ } catch (ClassNotFoundException e) {
+ throw new JAXBException(Messages.format(Messages.ERROR_LOAD_CLASS, className, pkg), e);
+ }
+
+ }
+ } finally {
+ in.close();
+ }
+ return null;
+ }
+
+ /**
+ * Implementation may be defined in other module than {@code java.xml.bind}. In that case openness
+ * {@linkplain Module#isOpen open} of classes should be delegated to implementation module.
+ *
+ * @param classes used to resolve module for {@linkplain Module#addOpens(String, Module)}
+ * @param factorySPI used to resolve {@link Module} of the implementation.
+ *
+ * @throws JAXBException if ony of a classes package is not open to {@code java.xml.bind} module.
+ */
+ static void delegateAddOpensToImplModule(Class[] classes, Class factorySPI) throws JAXBException {
+ final Module implModule = factorySPI.getModule();
+ if (!implModule.isNamed()) {
+ return;
+ }
+
+ Module jaxbModule = JAXBContext.class.getModule();
+
+ for (Class cls : classes) {
+ final Module classModule = cls.getModule();
+ final String packageName = cls.getPackageName();
+ //no need for unnamed
+ if (!classModule.isNamed()) {
+ continue;
+ }
+ //report error if they are not open to java.xml.bind
+ if (!classModule.isOpen(packageName, jaxbModule)) {
+ throw new JAXBException(Messages.format(Messages.JAXB_CLASSES_NOT_OPEN,
+ packageName, cls.getName(), classModule.getName()));
+ }
+ //propagate openness to impl module
+ classModule.addOpens(packageName, implModule);
+ if (logger.isLoggable(Level.FINE)) {
+ logger.log(Level.FINE, "Propagating openness of package {0} in {1} to {2}.",
+ new String[]{ packageName, classModule.getName(), implModule.getName() });
+ }
+ }
+ }
+
+}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -23,6 +23,8 @@
* questions.
*/
+
+
package javax.xml.bind;
import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -975,7 +977,6 @@
* {@link #isValidating()} API as well as access to the Schema object.
* To determine if the Unmarshaller has validation enabled, simply
* test the return type for null:
- *
*
{@code
* boolean isValidating = u.getSchema()!=null;
* }
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.bind/share/classes/module-info.java
--- a/jaxws/src/java.xml.bind/share/classes/module-info.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/module-info.java Thu Aug 24 16:24:44 2017 +0200
@@ -26,6 +26,8 @@
/**
* Defines the Java Architecture for XML Binding (JAXB) API.
*
+ * This module is upgradeble.
+ *
* @uses javax.xml.bind.JAXBContextFactory
*
* @moduleGraph
@@ -33,14 +35,13 @@
*/
@Deprecated(since="9", forRemoval=true)
module java.xml.bind {
- requires transitive java.activation;
- requires transitive java.xml;
requires java.compiler;
requires java.desktop;
requires java.logging;
requires jdk.unsupported;
- uses javax.xml.bind.JAXBContextFactory;
+ requires transitive java.activation;
+ requires transitive java.xml;
exports javax.xml.bind;
exports javax.xml.bind.annotation;
@@ -48,6 +49,7 @@
exports javax.xml.bind.attachment;
exports javax.xml.bind.helpers;
exports javax.xml.bind.util;
+
exports com.sun.istack.internal to
java.xml.ws,
jdk.xml.bind,
@@ -147,4 +149,7 @@
java.xml.ws,
jdk.xml.bind,
jdk.xml.ws;
+
+ uses javax.xml.bind.JAXBContextFactory;
+
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws.annotation/share/classes/module-info.java
--- a/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java Thu Aug 24 16:24:44 2017 +0200
@@ -27,6 +27,8 @@
* Defines a subset of the Common Annotations API to support programs running
* on the Java SE Platform.
*
+ *
This module is upgradeble.
+ *
* @moduleGraph
* @since 9
*/
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java Thu Aug 24 16:24:44 2017 +0200
@@ -76,6 +76,7 @@
}
}
+ @Override
public void close() throws SOAPException {
if (closed) {
log.severe("SAAJ0002.p2p.close.already.closed.conn");
@@ -86,6 +87,7 @@
closed = true;
}
+ @Override
public SOAPMessage call(SOAPMessage message, Object endPoint)
throws SOAPException {
if (closed) {
@@ -348,6 +350,7 @@
// Object identifies where the request should be sent.
// It is required to support objects of type String and java.net.URL.
+ @Override
public SOAPMessage get(Object endPoint) throws SOAPException {
if (closed) {
log.severe("SAAJ0011.p2p.get.already.closed.conn");
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -34,6 +34,7 @@
*/
public class HttpSOAPConnectionFactory extends SOAPConnectionFactory {
+ @Override
public SOAPConnection createConnection()
throws SOAPException
{
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -116,6 +116,7 @@
* Produce the message, include the message from the nested
* exception if there is one.
*/
+ @Override
public String getMessage() {
if (next == null)
return super.getMessage();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java Thu Aug 24 16:24:44 2017 +0200
@@ -28,18 +28,20 @@
*/
-
package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
-import java.io.*;
-import java.util.BitSet;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.ASCIIUtility;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.OutputUtil;
+import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
import javax.activation.DataSource;
-
-import com.sun.xml.internal.messaging.saaj.packaging.mime.*;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.*;
-
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.BitSet;
/**
* The MimeMultipart class is an implementation of the abstract Multipart
@@ -67,11 +69,10 @@
* subtype by using the MimeMultipart(String subtype)
* constructor. For example, to create a "multipart/alternative" object,
* use new MimeMultipart("alternative").
- *
*/
//TODO: cleanup the SharedInputStream handling
-public class BMMimeMultipart extends MimeMultipart {
+public class BMMimeMultipart extends MimeMultipart {
/*
* When true it indicates parsing hasnt been done at all
@@ -120,12 +121,12 @@
*/
public BMMimeMultipart(String subtype) {
super(subtype);
- /*
- * Compute a boundary string.
- String boundary = UniqueValue.getUniqueBoundaryValue();
- ContentType cType = new ContentType("multipart", subtype, null);
+ /*
+ * Compute a boundary string.
+ String boundary = UniqueValue.getUniqueBoundaryValue();
+ ContentType cType = new ContentType("multipart", subtype, null);
contentType.setParameter("boundary", boundary);
- */
+ */
}
/**
@@ -144,25 +145,25 @@
* skips the 'preamble' and reads bytes till the terminating
* boundary and creates MimeBodyParts for each part of the stream.
*
- * @param ds DataSource, can be a MultipartDataSource.
- * @param ct content type.
- * @exception MessagingException in case of error.
+ * @param ct content type.
+ * @param ds DataSource, can be a MultipartDataSource.
+ * @throws MessagingException in case of error.
*/
public BMMimeMultipart(DataSource ds, ContentType ct)
- throws MessagingException {
- super(ds,ct);
+ throws MessagingException {
+ super(ds, ct);
boundary = ct.getParameter("boundary");
/*
- if (ds instanceof MultipartDataSource) {
- // ask super to do this for us.
- setMultipartDataSource((MultipartDataSource)ds);
- return;
- }
+ if (ds instanceof MultipartDataSource) {
+ // ask super to do this for us.
+ setMultipartDataSource((MultipartDataSource)ds);
+ return;
+ }
- // 'ds' was not a MultipartDataSource, we have
- // to parse this ourself.
- parsed = false;
- this.ds = ds;
+ // 'ds' was not a MultipartDataSource, we have
+ // to parse this ourself.
+ parsed = false;
+ this.ds = ds;
if (ct==null)
contentType = new ContentType(ds.getContentType());
else
@@ -177,8 +178,8 @@
try {
in = ds.getInputStream();
if (!(in instanceof ByteArrayInputStream) &&
- !(in instanceof BufferedInputStream) &&
- !(in instanceof SharedInputStream))
+ !(in instanceof BufferedInputStream) &&
+ !(in instanceof SharedInputStream))
in = new BufferedInputStream(in);
} catch (Exception ex) {
throw new MessagingException("No inputstream from datasource");
@@ -186,7 +187,7 @@
if (!in.markSupported()) {
throw new MessagingException(
- "InputStream does not support Marking");
+ "InputStream does not support Marking");
}
}
return in;
@@ -199,10 +200,10 @@
* method is called by all other methods that need data for
* the body parts, to make sure the data has been parsed.
*
- * @since JavaMail 1.2
+ * @since JavaMail 1.2
*/
@Override
- protected void parse() throws MessagingException {
+ protected void parse() throws MessagingException {
if (parsed)
return;
@@ -210,7 +211,7 @@
SharedInputStream sin = null;
if (in instanceof SharedInputStream) {
- sin = (SharedInputStream)in;
+ sin = (SharedInputStream) in;
}
String bnd = "--" + boundary;
@@ -231,8 +232,8 @@
}
public MimeBodyPart getNextPart(
- InputStream stream, byte[] pattern, SharedInputStream sin)
- throws Exception {
+ InputStream stream, byte[] pattern, SharedInputStream sin)
+ throws Exception {
if (!stream.markSupported()) {
throw new Exception("InputStream does not support Marking");
@@ -242,7 +243,7 @@
compile(pattern);
if (!skipPreamble(stream, pattern, sin)) {
throw new Exception(
- "Missing Start Boundary, or boundary does not start on a new line");
+ "Missing Start Boundary, or boundary does not start on a new line");
}
begining = false;
}
@@ -256,7 +257,7 @@
b = readHeaders(stream);
if (b == -1) {
throw new Exception(
- "End of Stream encountered while reading part headers");
+ "End of Stream encountered while reading part headers");
}
long[] v = new long[1];
v[0] = -1; // just to ensure the code later sets it correctly
@@ -276,7 +277,7 @@
} else {
InternetHeaders headers = createInternetHeaders(stream);
ByteOutputStream baos = new ByteOutputStream();
- b = readBody(stream, pattern, null,baos, null);
+ b = readBody(stream, pattern, null, baos, null);
// looks like this check has to be disabled
// in the old impl it is allowed to have Mime Package
// without closing boundary
@@ -286,7 +287,7 @@
}
}
MimeBodyPart mbp = createMimeBodyPart(
- headers, baos.getBytes(), baos.getCount());
+ headers, baos.getBytes(), baos.getCount());
addBodyPart(mbp);
return mbp;
}
@@ -294,11 +295,11 @@
}
public boolean parse(
- InputStream stream, byte[] pattern, SharedInputStream sin)
- throws Exception {
+ InputStream stream, byte[] pattern, SharedInputStream sin)
+ throws Exception {
while (!lastPartFound.get(0) && (b != -1)) {
- getNextPart(stream, pattern, sin);
+ getNextPart(stream, pattern, sin);
}
return true;
}
@@ -307,7 +308,7 @@
// if the headers are to end properly then there has to be CRLF
// actually we just need to mark the start and end positions
int b = is.read();
- while(b != -1) {
+ while (b != -1) {
// when it is a shared input stream no need to copy
if (b == '\r') {
b = is.read();
@@ -316,7 +317,7 @@
if (b == '\r') {
b = is.read();
if (b == '\n') {
- return b;
+ return b;
} else {
continue;
}
@@ -331,43 +332,43 @@
}
if (b == -1) {
throw new Exception(
- "End of inputstream while reading Mime-Part Headers");
+ "End of inputstream while reading Mime-Part Headers");
}
return b;
}
private int readBody(
- InputStream is, byte[] pattern, long[] posVector,
- ByteOutputStream baos, SharedInputStream sin)
- throws Exception {
+ InputStream is, byte[] pattern, long[] posVector,
+ ByteOutputStream baos, SharedInputStream sin)
+ throws Exception {
if (!find(is, pattern, posVector, baos, sin)) {
throw new Exception(
- "Missing boundary delimitier while reading Body Part");
+ "Missing boundary delimitier while reading Body Part");
}
return b;
}
private boolean skipPreamble(
- InputStream is, byte[] pattern, SharedInputStream sin)
- throws Exception {
+ InputStream is, byte[] pattern, SharedInputStream sin)
+ throws Exception {
if (!find(is, pattern, sin)) {
return false;
}
if (lastPartFound.get(0)) {
throw new Exception(
- "Found closing boundary delimiter while trying to skip preamble");
+ "Found closing boundary delimiter while trying to skip preamble");
}
return true;
}
- public int readNext(InputStream is, byte[] buff, int patternLength,
- BitSet eof, long[] posVector, SharedInputStream sin)
- throws Exception {
+ public int readNext(InputStream is, byte[] buff, int patternLength,
+ BitSet eof, long[] posVector, SharedInputStream sin)
+ throws Exception {
int bufferLength = is.read(buffer, 0, patternLength);
if (bufferLength == -1) {
- eof.flip(0);
+ eof.flip(0);
} else if (bufferLength < patternLength) {
//repeatedly read patternLength - bufferLength
int temp = 0;
@@ -385,18 +386,18 @@
}
break;
}
- buffer[i] = (byte)temp;
+ buffer[i] = (byte) temp;
}
- bufferLength=i;
+ bufferLength = i;
}
return bufferLength;
}
public boolean find(InputStream is, byte[] pattern, SharedInputStream sin)
- throws Exception {
+ throws Exception {
int i;
int l = pattern.length;
- int lx = l -1;
+ int lx = l - 1;
BitSet eof = new BitSet(1);
long[] posVector = new long[1];
@@ -409,12 +410,12 @@
}
/*
- if (bufferLength < l) {
- //is.reset();
- return false;
- }*/
+ if (bufferLength < l) {
+ //is.reset();
+ return false;
+ }*/
- for(i = lx; i >= 0; i--) {
+ for (i = lx; i >= 0; i--) {
if (buffer[i] != pattern[i]) {
break;
}
@@ -435,11 +436,11 @@
}
public boolean find(
- InputStream is, byte[] pattern, long[] posVector,
- ByteOutputStream out, SharedInputStream sin) throws Exception {
+ InputStream is, byte[] pattern, long[] posVector,
+ ByteOutputStream out, SharedInputStream sin) throws Exception {
int i;
int l = pattern.length;
- int lx = l -1;
+ int lx = l - 1;
int bufferLength = 0;
int s = 0;
long endPos = -1;
@@ -466,7 +467,7 @@
// looks like it is allowed to not have a closing boundary
//return false;
//if (sin != null) {
- // posVector[0] = endPos;
+ // posVector[0] = endPos;
//}
b = -1;
if ((s == l) && (sin == null)) {
@@ -482,7 +483,7 @@
} else {
// looks like it is allowed to not have a closing boundary
// in the old implementation
- out.write(buffer, 0, bufferLength);
+ out.write(buffer, 0, bufferLength);
}
// looks like it is allowed to not have a closing boundary
// in the old implementation
@@ -491,7 +492,7 @@
return true;
}
- for(i = lx; i >= 0; i--) {
+ for (i = lx; i >= 0; i--) {
if (buffer[i] != pattern[i]) {
break;
}
@@ -507,7 +508,7 @@
if (s == 2) {
if (prevBuffer[1] == '\n') {
if (prevBuffer[0] != '\r' && prevBuffer[0] != '\n') {
- out.write(prevBuffer,0,1);
+ out.write(prevBuffer, 0, 1);
}
if (sin != null) {
posVector[0] = endPos;
@@ -516,15 +517,15 @@
} else {
throw new Exception(
"Boundary characters encountered in part Body " +
- "without a preceeding CRLF");
+ "without a preceeding CRLF");
}
- } else if (s==1) {
+ } else if (s == 1) {
if (prevBuffer[0] != '\n') {
throw new Exception(
"Boundary characters encountered in part Body " +
- "without a preceeding CRLF");
- }else {
+ "without a preceeding CRLF");
+ } else {
if (sin != null) {
posVector[0] = endPos;
}
@@ -532,13 +533,13 @@
}
} else if (s > 2) {
- if ((prevBuffer[s-2] == '\r') && (prevBuffer[s-1] == '\n')) {
+ if ((prevBuffer[s - 2] == '\r') && (prevBuffer[s - 1] == '\n')) {
if (sin != null) {
posVector[0] = endPos - 2;
} else {
out.write(prevBuffer, 0, s - 2);
}
- } else if (prevBuffer[s-1] == '\n') {
+ } else if (prevBuffer[s - 1] == '\n') {
//old impl allowed just a \n
if (sin != null) {
posVector[0] = endPos - 1;
@@ -547,8 +548,8 @@
}
} else {
throw new Exception(
- "Boundary characters encountered in part Body " +
- "without a preceeding CRLF");
+ "Boundary characters encountered in part Body " +
+ "without a preceeding CRLF");
}
}
}
@@ -561,22 +562,22 @@
}
if ((s > 0) && (sin == null)) {
- if (prevBuffer[s-1] == (byte)13) {
+ if (prevBuffer[s - 1] == (byte) 13) {
// if buffer[0] == (byte)10
- if (buffer[0] == (byte)10) {
+ if (buffer[0] == (byte) 10) {
int j;
- for(j = lx-1; j > 0; j--) {
- if (buffer[j+1] != pattern[j]) {
+ for (j = lx - 1; j > 0; j--) {
+ if (buffer[j + 1] != pattern[j]) {
break;
- }
- }
- if (j == 0) {
- // matched the pattern excluding the last char of the pattern
- // so dont write the CR into stream
- out.write(prevBuffer,0,s-1);
- } else {
- out.write(prevBuffer,0,s);
- }
+ }
+ }
+ if (j == 0) {
+ // matched the pattern excluding the last char of the pattern
+ // so dont write the CR into stream
+ out.write(prevBuffer, 0, s - 1);
+ } else {
+ out.write(prevBuffer, 0, s);
+ }
} else {
out.write(prevBuffer, 0, s);
}
@@ -612,20 +613,20 @@
return true;
} else {
throw new Exception(
- "transport padding after a Mime Boundary should end in a CRLF, found CR only");
+ "transport padding after a Mime Boundary should end in a CRLF, found CR only");
}
}
if (b == '-') {
b = is.read();
if (b != '-') {
- throw new Exception(
- "Unexpected singular '-' character after Mime Boundary");
+ throw new Exception(
+ "Unexpected singular '-' character after Mime Boundary");
} else {
//System.out.println("Last Part Found");
lastPartFound.flip(0);
// read the next char
- b = is.read();
+ b = is.read();
}
}
@@ -641,7 +642,7 @@
b = is.read();
}
if (b == '\n') {
- return true;
+ return true;
}
}
}
@@ -673,7 +674,8 @@
// Initialise Good Suffix Shift table
gss = new int[l];
- NEXT: for (i = l; i > 0; i--) {
+ NEXT:
+ for (i = l; i > 0; i--) {
// j is the beginning index of suffix being considered
for (j = l - 1; j >= i; j--) {
// Testing for good suffix
@@ -681,9 +683,9 @@
// pattern[j..len] is a good suffix
gss[j - 1] = i;
} else {
- // No match. The array has already been
- // filled up with correct values before.
- continue NEXT;
+ // No match. The array has already been
+ // filled up with correct values before.
+ continue NEXT;
}
}
while (j > 0) {
@@ -756,6 +758,7 @@
this.contentType.setParameter("boundary", bnd);
}
}
+
public String getBoundary() {
return this.boundary;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java Thu Aug 24 16:24:44 2017 +0200
@@ -320,15 +320,15 @@
* @return list of header lines.
*/
public List getAllHeaderLines() {
- if(headerValueView==null)
+ if (headerValueView == null)
headerValueView = new AbstractList() {
@Override
- public String get(int index) {
+ public String get(int index) {
return headers.get(index).line;
}
@Override
- public int size() {
+ public int size() {
return headers.size();
}
};
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java Thu Aug 24 16:24:44 2017 +0200
@@ -31,15 +31,21 @@
package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
-import java.io.*;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MultipartDataSource;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.ASCIIUtility;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.LineInputStream;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.OutputUtil;
+import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
+import com.sun.xml.internal.messaging.saaj.util.FinalArrayList;
+import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
import javax.activation.DataSource;
-
-import com.sun.xml.internal.messaging.saaj.packaging.mime.*;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.*;
-import com.sun.xml.internal.messaging.saaj.util.FinalArrayList;
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
/**
* The MimeMultipart class is an implementation
@@ -211,7 +217,7 @@
* @exception MessagingException if no such MimeBodyPart exists
*/
public MimeBodyPart getBodyPart(int index)
- throws MessagingException {
+ throws MessagingException {
parse();
if (parts == null)
throw new IndexOutOfBoundsException("No such BodyPart");
@@ -228,19 +234,19 @@
* @exception MessagingException if no such MimeBodyPart exists.
*/
public MimeBodyPart getBodyPart(String CID)
- throws MessagingException {
+ throws MessagingException {
parse();
int count = getCount();
for (int i = 0; i < count; i++) {
MimeBodyPart part = getBodyPart(i);
String s = part.getContentID();
- // Old versions of AXIS2 put angle brackets around the content
- // id but not the start param
- String sNoAngle = (s!= null) ? s.replaceFirst("^<", "").replaceFirst(">$", "")
- :null;
+ // Old versions of AXIS2 put angle brackets around the content
+ // id but not the start param
+ String sNoAngle = (s!= null) ? s.replaceFirst("^<", "").replaceFirst(">$", "")
+ :null;
if (s != null && (s.equals(CID) || CID.equals(sNoAngle)))
- return part;
+ return part;
}
return null;
}
@@ -319,14 +325,14 @@
try {
in = ds.getInputStream();
if (!(in instanceof ByteArrayInputStream) &&
- !(in instanceof BufferedInputStream) &&
- !(in instanceof SharedInputStream))
+ !(in instanceof BufferedInputStream) &&
+ !(in instanceof SharedInputStream))
in = new BufferedInputStream(in);
} catch (Exception ex) {
throw new MessagingException("No inputstream from datasource");
}
if (in instanceof SharedInputStream)
- sin = (SharedInputStream)in;
+ sin = (SharedInputStream) in;
String boundary = "--" + contentType.getParameter("boundary");
byte[] bndbytes = ASCIIUtility.getBytes(boundary);
@@ -338,12 +344,12 @@
LineInputStream lin = new LineInputStream(in);
String line;
while ((line = lin.readLine()) != null) {
- /*
- * Strip trailing whitespace. Can't use trim method
- * because it's too aggressive. Some bogus MIME
- * messages will include control characters in the
- * boundary string.
- */
+ /*
+ * Strip trailing whitespace. Can't use trim method
+ * because it's too aggressive. Some bogus MIME
+ * messages will include control characters in the
+ * boundary string.
+ */
int i;
for (i = line.length() - 1; i >= 0; i--) {
char c = line.charAt(i);
@@ -357,12 +363,12 @@
if (line == null)
throw new MessagingException("Missing start boundary");
- /*
- * Read and process body parts until we see the
- * terminating boundary line (or EOF).
- */
+ /*
+ * Read and process body parts until we see the
+ * terminating boundary line (or EOF).
+ */
boolean done = false;
- getparts:
+ getparts:
while (!done) {
InternetHeaders headers = null;
if (sin != null) {
@@ -372,7 +378,7 @@
;
if (line == null) {
if (!ignoreMissingEndBoundary) {
- throw new MessagingException("Missing End Boundary for Mime Package : EOF while skipping headers");
+ throw new MessagingException("Missing End Boundary for Mime Package : EOF while skipping headers");
}
// assume there's just a missing end boundary
break getparts;
@@ -397,7 +403,7 @@
/*
* Read and save the content bytes in buf.
*/
- for (;;) {
+ for (; ; ) {
if (bol) {
/*
* At the beginning of a line, check whether the
@@ -416,7 +422,7 @@
if (in.read() == '-') {
done = true;
foundClosingBoundary = true;
- break; // ignore trailing text
+ break; // ignore trailing text
}
}
// skip linear whitespace
@@ -424,12 +430,12 @@
b2 = in.read();
// check for end of line
if (b2 == '\n')
- break; // got it! break out of the loop
+ break; // got it! break out of the loop
if (b2 == '\r') {
in.mark(1);
if (in.read() != '\n')
in.reset();
- break; // got it! break out of the loop
+ break; // got it! break out of the loop
}
}
// failed to match, reset and proceed normally
@@ -491,7 +497,7 @@
buf.close();
}
- if (!ignoreMissingEndBoundary && !foundClosingBoundary && sin== null) {
+ if (!ignoreMissingEndBoundary && !foundClosingBoundary && sin == null) {
throw new MessagingException("Missing End Boundary for Mime Package : EOF while skipping headers");
}
parsed = true;
@@ -510,7 +516,7 @@
* @since JavaMail 1.2
*/
protected InternetHeaders createInternetHeaders(InputStream is)
- throws MessagingException {
+ throws MessagingException {
return new InternetHeaders(is);
}
@@ -523,12 +529,12 @@
*
* @param headers the headers for the body part.
* @param content the content of the body part.
- * @param len the content length.
+ * @param len the content length.
* @return MimeBodyPart
* @since JavaMail 1.2
*/
protected MimeBodyPart createMimeBodyPart(InternetHeaders headers, byte[] content, int len) {
- return new MimeBodyPart(headers, content,len);
+ return new MimeBodyPart(headers, content,len);
}
/**
@@ -544,7 +550,7 @@
* @since JavaMail 1.2
*/
protected MimeBodyPart createMimeBodyPart(InputStream is) throws MessagingException {
- return new MimeBodyPart(is);
+ return new MimeBodyPart(is);
}
/**
@@ -564,7 +570,7 @@
* @exception MessagingException in case of error.
*/
protected void setMultipartDataSource(MultipartDataSource mp)
- throws MessagingException {
+ throws MessagingException {
contentType = new ContentType(mp.getContentType());
int count = mp.getCount();
@@ -582,7 +588,7 @@
* @see #contentType
*/
public ContentType getContentType() {
- return contentType;
+ return contentType;
}
/**
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java Thu Aug 24 16:24:44 2017 +0200
@@ -28,21 +28,21 @@
*/
-
package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
-import java.io.*;
-import java.net.UnknownServiceException;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
import javax.activation.DataSource;
-
-import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.UnknownServiceException;
/**
* A utility class that implements a DataSource out of
* a MimeBodyPart. This class is primarily meant for service providers.
*
- * @author John Mani
+ * @author John Mani
*/
public final class MimePartDataSource implements DataSource {
@@ -68,13 +68,13 @@
* using the getContentStream() method and decodes
* it using the MimeUtility.decode() method.
*
- * @return decoded input stream
+ * @return decoded input stream
*/
@Override
public InputStream getInputStream() throws IOException {
try {
- InputStream is = part.getContentStream();
+ InputStream is = part.getContentStream();
String encoding = part.getEncoding();
if (encoding != null)
@@ -92,7 +92,7 @@
* This implementation throws the UnknownServiceException.
*/
@Override
- public OutputStream getOutputStream() throws IOException {
+ public OutputStream getOutputStream() throws IOException {
throw new UnknownServiceException();
}
@@ -113,11 +113,11 @@
* This implementation just returns an empty string.
*/
@Override
- public String getName() {
+ public String getName() {
try {
- return part.getFileName();
+ return part.getFileName();
} catch (MessagingException mex) {
- return "";
+ return "";
}
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -113,6 +113,7 @@
parsed = true;
}
+ @Override
protected void parse() throws MessagingException {
parseAll();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -50,7 +50,7 @@
* No-arg Constructor.
*/
public ParameterList() {
- this.list = new HashMap();
+ this.list = new HashMap<>();
}
private ParameterList(HashMap m) {
@@ -73,7 +73,7 @@
int type;
String name;
- list = new HashMap();
+ list = new HashMap<>();
while (true) {
tk = h.next();
type = tk.getType();
@@ -171,6 +171,7 @@
*
* @return String
*/
+ @Override
public String toString() {
return toString(0);
}
@@ -232,6 +233,6 @@
}
public ParameterList copy() {
- return new ParameterList((HashMap)list.clone());
+ return new ParameterList((HashMap)list.clone());
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java Thu Aug 24 16:24:44 2017 +0200
@@ -32,12 +32,14 @@
import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
public class ASCIIUtility {
// Private constructor so that this class is not instantiated
- private ASCIIUtility() { }
+ private ASCIIUtility() {
+ }
/**
@@ -47,16 +49,14 @@
*
* Based on java.lang.Integer.parseInt().
*
- * @param b bytes to convert to integer.
+ * @param b bytes to convert to integer.
* @param start start of the range.
- * @param end end of the range (not including).
+ * @param end end of the range (not including).
* @param radix radix.
- *
* @return integer.
- *
*/
public static int parseInt(byte[] b, int start, int end, int radix)
- throws NumberFormatException {
+ throws NumberFormatException {
if (b == null)
throw new NumberFormatException("null");
@@ -77,18 +77,18 @@
}
multmin = limit / radix;
if (i < end) {
- digit = Character.digit((char)b[i++], radix);
+ digit = Character.digit((char) b[i++], radix);
if (digit < 0) {
throw new NumberFormatException(
- "illegal number: " + toString(b, start, end)
- );
+ "illegal number: " + toString(b, start, end)
+ );
} else {
result = -digit;
}
}
while (i < end) {
// Accumulating negatively avoids surprises near MAX_VALUE
- digit = Character.digit((char)b[i++], radix);
+ digit = Character.digit((char) b[i++], radix);
if (digit < 0) {
throw new NumberFormatException("illegal number");
}
@@ -120,56 +120,48 @@
* array into a String. The range extends from start
* till, but not including end.
*
- * @param b bytes to convert to integer.
+ * @param b bytes to convert to integer.
* @param start start of the range.
- * @param end end of the range (not including).
- *
+ * @param end end of the range (not including).
* @return integer.
- *
*/
public static String toString(byte[] b, int start, int end) {
int size = end - start;
char[] theChars = new char[size];
for (int i = 0, j = start; i < size; )
- theChars[i++] = (char)(b[j++]&0xff);
+ theChars[i++] = (char) (b[j++] & 0xff);
return new String(theChars);
}
- /**
- * Encodes specified String into a sequence of bytes using the platform's
- * default charset, storing the result into a new byte array.
- *
- * @param s string to encode into byte array.
- *
- * @return byte array.
- *
- */
+ /**
+ * Encodes specified String into a sequence of bytes using the platform's
+ * default charset, storing the result into a new byte array.
+ *
+ * @param s string to encode into byte array.
+ * @return byte array.
+ */
public static byte[] getBytes(String s) {
- char [] chars= s.toCharArray();
+ char[] chars = s.toCharArray();
int size = chars.length;
byte[] bytes = new byte[size];
- for (int i = 0; i < size;)
+ for (int i = 0; i < size; )
bytes[i] = (byte) chars[i++];
return bytes;
}
/**
- * Converts input stream to array.
- *
- * @param is stream to convert to array.
- *
- * @return byte array.
- *
- * @throws IOException if an I/O error occurs.
+ * Converts input stream to array.
*
- * @deprecated
- * this is an expensive operation that require an additional
- * buffer reallocation just to get the array of an exact size.
- * Unless you absolutely need the exact size array, don't use this.
- * Use {@link ByteOutputStream} and {@link ByteOutputStream#write(InputStream)}.
+ * @param is stream to convert to array.
+ * @return byte array.
+ * @throws IOException if an I/O error occurs.
+ * @deprecated this is an expensive operation that require an additional
+ * buffer reallocation just to get the array of an exact size.
+ * Unless you absolutely need the exact size array, don't use this.
+ * Use {@link ByteOutputStream} and {@link ByteOutputStream#write(InputStream)}.
*/
@Deprecated
public static byte[] getBytes(InputStream is) throws IOException {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -63,6 +63,7 @@
* stream is reached.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public int read() throws IOException {
int c = in.read();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -67,6 +67,7 @@
* stream is reached.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public int read() throws IOException {
if (spaces > 0) {
// We have cached space characters, return one
@@ -150,6 +151,7 @@
* the stream has been reached.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public int read(byte[] buf, int off, int len) throws IOException {
int i, c;
for (i = 0; i < len; i++) {
@@ -167,6 +169,7 @@
* Tests if this input stream supports marks. Currently this class
* does not support marks
*/
+ @Override
public boolean markSupported() {
return false;
}
@@ -178,6 +181,7 @@
* this method just invokes the available method
* of the original input stream.
*/
+ @Override
public int available() throws IOException {
// This is bogus ! We don't really know how much
// bytes are available *after* decoding
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -81,6 +81,7 @@
* @param len the number of bytes to write.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public void write(byte[] b, int off, int len) throws IOException {
for (int i = 0; i < len; i++)
write(b[off + i]);
@@ -91,6 +92,7 @@
* @param b the data to be written.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public void write(byte[] b) throws IOException {
write(b, 0, b.length);
}
@@ -100,6 +102,7 @@
* @param c the byte.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public void write(int c) throws IOException {
c = c & 0xff; // Turn off the MSB.
if (gotSpace) { // previous character was
@@ -139,6 +142,7 @@
* to be encoded out to the stream.
* @exception IOException if an I/O error occurs.
*/
+ @Override
public void flush() throws IOException {
out.flush();
}
@@ -147,6 +151,7 @@
* Forces any buffered output bytes to be encoded out to the stream
* and closes this output stream
*/
+ @Override
public void close() throws IOException {
out.close();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -78,6 +78,7 @@
* @see java.io.FilterInputStream#in
*/
+ @Override
public int read() throws IOException {
if (index >= bufsize) {
readPrefix();
@@ -88,6 +89,7 @@
return buffer[index++] & 0xff; // return lower byte
}
+ @Override
public int read(byte[] buf, int off, int len) throws IOException {
int i, c;
for (i = 0; i < len; i++) {
@@ -101,10 +103,12 @@
return i;
}
+ @Override
public boolean markSupported() {
return false;
}
+ @Override
public int available() throws IOException {
// This is only an estimate, since in.available()
// might include CRLFs too ..
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -88,6 +88,7 @@
}
}
+ @Override
public int getSize() throws SOAPException {
if (mimePart != null) {
try {
@@ -124,6 +125,7 @@
}
}
+ @Override
public void clearContent() {
if (mimePart != null) {
mimePart.close();
@@ -133,6 +135,7 @@
rawContent = null;
}
+ @Override
public Object getContent() throws SOAPException {
try {
if (mimePart != null) {
@@ -153,6 +156,7 @@
}
}
+ @Override
public void setContent(Object object, String contentType)
throws IllegalArgumentException {
if (mimePart != null) {
@@ -165,23 +169,28 @@
}
+ @Override
public DataHandler getDataHandler() throws SOAPException {
if (mimePart != null) {
//return an inputstream
return new DataHandler(new DataSource() {
+ @Override
public InputStream getInputStream() throws IOException {
return mimePart.read();
}
+ @Override
public OutputStream getOutputStream() throws IOException {
throw new UnsupportedOperationException("getOutputStream cannot be supported : You have enabled LazyAttachments Option");
}
+ @Override
public String getContentType() {
return mimePart.getContentType();
}
+ @Override
public String getName() {
return "MIMEPart Wrapper DataSource";
}
@@ -197,6 +206,7 @@
return dataHandler;
}
+ @Override
public void setDataHandler(DataHandler dataHandler)
throws IllegalArgumentException {
if (mimePart != null) {
@@ -216,35 +226,43 @@
setMimeHeader("Content-Type", dataHandler.getContentType());
}
+ @Override
public void removeAllMimeHeaders() {
headers.removeAllHeaders();
}
+ @Override
public void removeMimeHeader(String header) {
headers.removeHeader(header);
}
+ @Override
public String[] getMimeHeader(String name) {
return headers.getHeader(name);
}
+ @Override
public void setMimeHeader(String name, String value) {
headers.setHeader(name, value);
}
+ @Override
public void addMimeHeader(String name, String value) {
headers.addHeader(name, value);
}
- public Iterator getAllMimeHeaders() {
+ @Override
+ public Iterator getAllMimeHeaders() {
return headers.getAllHeaders();
}
- public Iterator getMatchingMimeHeaders(String[] names) {
+ @Override
+ public Iterator getMatchingMimeHeaders(String[] names) {
return headers.getMatchingHeaders(names);
}
- public Iterator getNonMatchingMimeHeaders(String[] names) {
+ @Override
+ public Iterator getNonMatchingMimeHeaders(String[] names) {
return headers.getNonMatchingHeaders(names);
}
@@ -329,6 +347,7 @@
}
}
+ @Override
public void setBase64Content(InputStream content, String contentType)
throws SOAPException {
@@ -365,6 +384,7 @@
}
}
+ @Override
public InputStream getBase64Content() throws SOAPException {
InputStream stream;
if (mimePart != null) {
@@ -425,6 +445,7 @@
}
}
+ @Override
public void setRawContent(InputStream content, String contentType)
throws SOAPException {
if (mimePart != null) {
@@ -475,6 +496,7 @@
}
} */
+ @Override
public void setRawContentBytes(
byte[] content, int off, int len, String contentType)
throws SOAPException {
@@ -498,6 +520,7 @@
}
}
+ @Override
public InputStream getRawContent() throws SOAPException {
if (mimePart != null) {
return mimePart.read();
@@ -522,6 +545,7 @@
}
}
+ @Override
public byte[] getRawContentBytes() throws SOAPException {
InputStream ret;
if (mimePart != null) {
@@ -556,12 +580,14 @@
}
// attachments are equal if they are the same reference
+ @Override
public boolean equals(Object o) {
return (this == o);
}
// In JDK 8 we get a warning if we implement equals() but not hashCode().
// There is no intuitive value for this, the default one in Object is fine.
+ @Override
public int hashCode() {
return super.hashCode();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -71,6 +71,7 @@
private static ClassLoader getContextClassLoader() {
return AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public ClassLoader run() {
ClassLoader cl = null;
try {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -63,6 +63,7 @@
return oldListener;
}
+ @Override
public SOAPMessage createMessage() throws SOAPException {
throw new UnsupportedOperationException();
}
@@ -105,6 +106,7 @@
"Unable to parse content type: " + e.getMessage());
}
}
+ @Override
public SOAPMessage createMessage(MimeHeaders headers, InputStream in)
throws SOAPException, IOException {
String contentTypeString = MessageImpl.getContentType(headers);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -87,7 +87,7 @@
protected boolean saved = false;
protected byte[] messageBytes;
protected int messageByteCount;
- protected HashMap properties = new HashMap();
+ protected Map properties = new HashMap<>();
// used for lazy attachment initialization
protected MimeMultipart multiPart = null;
@@ -883,17 +883,17 @@
throw new RuntimeException(e);
}
if (attachments == null)
- attachments = new FinalArrayList();
+ attachments = new FinalArrayList<>();
attachments.add(attachment);
needsSave();
}
- static private final Iterator nullIter = Collections.EMPTY_LIST.iterator();
+ static private final Iterator nullIter = Collections.EMPTY_LIST.iterator();
@Override
- public Iterator getAttachments() {
+ public Iterator getAttachments() {
try {
initializeAllAttachments();
} catch (Exception e) {
@@ -963,7 +963,7 @@
}
@Override
- public Iterator getAttachments(MimeHeaders headers) {
+ public Iterator getAttachments(MimeHeaders headers) {
try {
initializeAllAttachments();
} catch (Exception e) {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -42,6 +42,7 @@
Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
"com.sun.xml.internal.messaging.saaj.soap.LocalStrings");
+ @Override
protected MessageFactory newMessageFactory(String protocol)
throws SOAPException {
if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol)) {
@@ -60,6 +61,7 @@
}
}
+ @Override
protected SOAPFactory newSOAPFactory(String protocol)
throws SOAPException {
if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol)) {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.messaging.saaj.soap;
+
+import com.sun.xml.internal.messaging.saaj.soap.impl.NodeListImpl;
+import org.w3c.dom.*;
+
+/**
+ * SAAJ wrapper for {@link DocumentFragment}
+ *
+ * @author Yan GAO.
+ */
+public class SOAPDocumentFragment implements DocumentFragment {
+
+ private SOAPDocumentImpl soapDocument;
+ private DocumentFragment documentFragment;
+
+ public SOAPDocumentFragment(SOAPDocumentImpl ownerDoc) {
+ this.soapDocument = ownerDoc;
+ this.documentFragment = soapDocument.getDomDocument().createDocumentFragment();
+ }
+
+ public SOAPDocumentFragment() {}
+
+ @Override
+ public boolean hasAttributes() {
+ return documentFragment.hasAttributes();
+ }
+
+ @Override
+ public boolean isSameNode(Node other) {
+ return documentFragment.isSameNode(getDomNode(other));
+ }
+
+ @Override
+ public String lookupNamespaceURI(String prefix) {
+ return documentFragment.lookupNamespaceURI(prefix);
+ }
+
+ @Override
+ public Node getParentNode() {
+ return soapDocument.findIfPresent(documentFragment.getParentNode());
+ }
+
+ @Override
+ public Node getFirstChild() {
+ return soapDocument.findIfPresent(documentFragment.getFirstChild());
+ }
+
+ @Override
+ public Object getUserData(String key) {
+ return documentFragment.getUserData(key);
+ }
+
+ @Override
+ public String getTextContent() throws DOMException {
+ return documentFragment.getTextContent();
+ }
+ @Override
+ public short getNodeType() {
+ return documentFragment.getNodeType();
+ }
+
+ public Node getDomNode(Node node) {
+ return soapDocument.getDomNode(node);
+ }
+
+ @Override
+ public Node appendChild(Node newChild) throws DOMException {
+ Node node = soapDocument.importNode(newChild, true);
+ return soapDocument.findIfPresent(documentFragment.appendChild(getDomNode(node)));
+ }
+
+ @Override
+ public Node removeChild(Node oldChild) throws DOMException {
+ return soapDocument.findIfPresent(documentFragment.removeChild(getDomNode(oldChild)));
+ }
+
+ @Override
+ public NamedNodeMap getAttributes() {
+ return documentFragment.getAttributes();
+ }
+
+ @Override
+ public short compareDocumentPosition(Node other) throws DOMException {
+ return documentFragment.compareDocumentPosition(getDomNode(other));
+ }
+ @Override
+ public void setTextContent(String textContent) throws DOMException {
+ documentFragment.setTextContent(textContent);
+ }
+ @Override
+ public Node insertBefore(Node newChild, Node refChild) throws DOMException {
+ Node node = soapDocument.importNode(newChild, true);
+ return soapDocument.findIfPresent(documentFragment.insertBefore(getDomNode(node), getDomNode(refChild)));
+ }
+ @Override
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ return documentFragment.setUserData(key, data, handler);
+ }
+ @Override
+ public boolean isDefaultNamespace(String namespaceURI) {
+ return documentFragment.isDefaultNamespace(namespaceURI);
+ }
+
+ @Override
+ public Node getLastChild() {
+ return soapDocument.findIfPresent(documentFragment.getLastChild());
+ }
+
+ @Override
+ public void setPrefix(String prefix) throws DOMException {
+ documentFragment.setPrefix(prefix);
+ }
+ @Override
+ public String getNodeName() {
+ return documentFragment.getNodeName();
+ }
+
+ @Override
+ public void setNodeValue(String nodeValue) throws DOMException {
+ documentFragment.setNodeValue(nodeValue);
+ }
+ @Override
+ public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
+ Node node = soapDocument.importNode(newChild, true);
+ return soapDocument.findIfPresent(documentFragment.replaceChild(getDomNode(node), getDomNode(oldChild)));
+ }
+ @Override
+ public String getLocalName() {
+ return documentFragment.getLocalName();
+ }
+
+ @Override
+ public void normalize() {
+ documentFragment.normalize();
+ }
+
+ @Override
+ public Node cloneNode(boolean deep) {
+ Node node= documentFragment.cloneNode(deep);
+ soapDocument.registerChildNodes(node, deep);
+ return soapDocument.findIfPresent(node);
+ }
+
+ @Override
+ public boolean isSupported(String feature, String version) {
+ return documentFragment.isSupported(feature, version);
+ }
+
+ @Override
+ public boolean isEqualNode(Node arg) {
+ return documentFragment.isEqualNode(getDomNode(arg));
+ }
+
+ @Override
+ public boolean hasChildNodes() {
+ return documentFragment.hasChildNodes();
+ }
+
+ @Override
+ public String lookupPrefix(String namespaceURI) {
+ return documentFragment.lookupPrefix(namespaceURI);
+ }
+
+ @Override
+ public String getNodeValue() throws DOMException {
+ return documentFragment.getNodeValue();
+ }
+ @Override
+ public Document getOwnerDocument() {
+ return documentFragment.getOwnerDocument();
+ }
+ @Override
+ public Object getFeature(String feature, String version) {
+ return documentFragment.getFeature(feature, version);
+ }
+
+ @Override
+ public Node getPreviousSibling() {
+ return soapDocument.findIfPresent(documentFragment.getPreviousSibling());
+ }
+
+ @Override
+ public NodeList getChildNodes() {
+ return new NodeListImpl(soapDocument, documentFragment.getChildNodes());
+ }
+
+ @Override
+ public String getBaseURI() {
+ return documentFragment.getBaseURI();
+ }
+
+ @Override
+ public Node getNextSibling() {
+ return soapDocument.findIfPresent(documentFragment.getNextSibling());
+ }
+
+ @Override
+ public String getPrefix() {
+ return documentFragment.getPrefix();
+ }
+
+ @Override
+ public String getNamespaceURI() {
+ return documentFragment.getNamespaceURI();
+ }
+ public Document getSoapDocument() {
+ return soapDocument;
+ }
+}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -32,6 +32,8 @@
import com.sun.xml.internal.messaging.saaj.soap.impl.CDATAImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.ElementFactory;
import com.sun.xml.internal.messaging.saaj.soap.impl.ElementImpl;
+import com.sun.xml.internal.messaging.saaj.soap.impl.NamedNodeMapImpl;
+import com.sun.xml.internal.messaging.saaj.soap.impl.NodeListImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.SOAPCommentImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.SOAPTextImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
@@ -39,6 +41,7 @@
import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
+import org.w3c.dom.CharacterData;
import org.w3c.dom.Comment;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
@@ -52,6 +55,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
import org.w3c.dom.UserDataHandler;
import javax.xml.parsers.DocumentBuilder;
@@ -59,13 +63,14 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
+import java.lang.reflect.Constructor;
import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
import java.util.logging.Logger;
public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Document {
+ public static final String SAAJ_NODE = "javax.xml.soap.Node";
+
private static final String XMLNS = "xmlns".intern();
protected static final Logger log =
Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
@@ -75,8 +80,6 @@
private Document document;
- private Map domToSoap = new HashMap<>();
-
public SOAPDocumentImpl(SOAPPartImpl enclosingDocument) {
document = createDocument();
this.enclosingSOAPPart = enclosingDocument;
@@ -105,6 +108,7 @@
// super(doctype, grammarAccess);
// }
+ @Override
public SOAPPartImpl getSOAPPart() {
if (enclosingSOAPPart == null) {
log.severe("SAAJ0541.soap.fragment.not.bound.to.part");
@@ -113,19 +117,23 @@
return enclosingSOAPPart;
}
+ @Override
public SOAPDocumentImpl getDocument() {
return this;
}
+ @Override
public DocumentType getDoctype() {
// SOAP means no DTD, No DTD means no doctype (SOAP 1.2 only?)
return null;
}
+ @Override
public DOMImplementation getImplementation() {
return document.getImplementation();
}
+ @Override
public Element getDocumentElement() {
// This had better be an Envelope!
getSOAPPart().doGetDocumentElement();
@@ -136,6 +144,7 @@
return document.getDocumentElement();
}
+ @Override
public Element createElement(String tagName) throws DOMException {
return ElementFactory.createElement(
this,
@@ -144,22 +153,27 @@
null);
}
+ @Override
public DocumentFragment createDocumentFragment() {
- return document.createDocumentFragment();
+ return new SOAPDocumentFragment(this);
}
+ @Override
public org.w3c.dom.Text createTextNode(String data) {
return new SOAPTextImpl(this, data);
}
+ @Override
public Comment createComment(String data) {
return new SOAPCommentImpl(this, data);
}
+ @Override
public CDATASection createCDATASection(String data) throws DOMException {
return new CDATAImpl(this, data);
}
+ @Override
public ProcessingInstruction createProcessingInstruction(
String target,
String data)
@@ -168,6 +182,7 @@
throw new UnsupportedOperationException("Processing Instructions are not allowed in SOAP documents");
}
+ @Override
public Attr createAttribute(String name) throws DOMException {
boolean isQualifiedName = (name.indexOf(":") > 0);
if (isQualifiedName) {
@@ -184,24 +199,70 @@
return document.createAttribute(name);
}
+ @Override
public EntityReference createEntityReference(String name)
throws DOMException {
log.severe("SAAJ0543.soap.entity.refs.not.allowed.in.docs");
throw new UnsupportedOperationException("Entity References are not allowed in SOAP documents");
}
+ @Override
public NodeList getElementsByTagName(String tagname) {
- return document.getElementsByTagName(tagname);
+ return new NodeListImpl(this, document.getElementsByTagName(tagname));
}
+ @Override
public org.w3c.dom.Node importNode(Node importedNode, boolean deep)
throws DOMException {
- final Node node = document.importNode(getDomNode(importedNode), deep);
- return node instanceof Element ?
- ElementFactory.createElement(this, (Element) node)
- : node;
+ Node domNode = getDomNode(importedNode);
+ final Node newNode = document.importNode(domNode, deep);
+
+ if (importedNode instanceof javax.xml.soap.Node) {
+ Node newSoapNode = createSoapNode(importedNode.getClass(), newNode);
+ newNode.setUserData(SAAJ_NODE, newSoapNode, null);
+ if (deep && importedNode.hasChildNodes()) {
+ NodeList childNodes = importedNode.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ registerChildNodes(childNodes.item(i), deep);
+ }
+ }
+ return newSoapNode;
+ }
+
+ registerChildNodes(newNode, deep);
+ return findIfPresent(newNode);
}
+ //If the parentNode is not registered to domToSoap, create soap wapper for parentNode and register it to domToSoap
+ //If deep = true, also register all children of parentNode to domToSoap map.
+ public void registerChildNodes(Node parentNode, boolean deep) {
+ if (parentNode.getUserData(SAAJ_NODE) == null) {
+ if (parentNode instanceof Element) {
+ ElementFactory.createElement(this, (Element) parentNode);
+ } else if (parentNode instanceof CharacterData) {
+ switch (parentNode.getNodeType()) {
+ case CDATA_SECTION_NODE:
+ new CDATAImpl(this, (CharacterData) parentNode);
+ break;
+ case COMMENT_NODE:
+ new SOAPCommentImpl(this, (CharacterData) parentNode);
+ break;
+ case TEXT_NODE:
+ new SOAPTextImpl(this, (CharacterData) parentNode);
+ break;
+ }
+ }
+ }
+ if (deep) {
+ NodeList nodeList = parentNode.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node nextChild = nodeList.item(i);
+ registerChildNodes(nextChild, true);
+ }
+ }
+ }
+
+ @Override
public Element createElementNS(String namespaceURI, String qualifiedName)
throws DOMException {
return ElementFactory.createElement(
@@ -211,19 +272,22 @@
namespaceURI);
}
+ @Override
public Attr createAttributeNS(String namespaceURI, String qualifiedName)
throws DOMException {
return document.createAttributeNS(namespaceURI, qualifiedName);
}
+ @Override
public NodeList getElementsByTagNameNS(
String namespaceURI,
String localName) {
- return document.getElementsByTagNameNS(namespaceURI, localName);
+ return new NodeListImpl(this, document.getElementsByTagNameNS(namespaceURI, localName));
}
+ @Override
public Element getElementById(String elementId) {
- return document.getElementById(elementId);
+ return (Element) findIfPresent(document.getElementById(elementId));
}
@Override
@@ -293,7 +357,7 @@
@Override
public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
- return document.renameNode(n, namespaceURI, qualifiedName);
+ return findIfPresent(document.renameNode(n, namespaceURI, qualifiedName));
}
@Override
@@ -318,37 +382,37 @@
@Override
public Node getParentNode() {
- return document.getParentNode();
+ return findIfPresent(document.getParentNode());
}
@Override
public NodeList getChildNodes() {
- return document.getChildNodes();
+ return new NodeListImpl(this, document.getChildNodes());
}
@Override
public Node getFirstChild() {
- return document.getFirstChild();
+ return findIfPresent(document.getFirstChild());
}
@Override
public Node getLastChild() {
- return document.getLastChild();
+ return findIfPresent(document.getLastChild());
}
@Override
public Node getPreviousSibling() {
- return document.getPreviousSibling();
+ return findIfPresent(document.getPreviousSibling());
}
@Override
public Node getNextSibling() {
- return document.getNextSibling();
+ return findIfPresent(document.getNextSibling());
}
@Override
public NamedNodeMap getAttributes() {
- return document.getAttributes();
+ return new NamedNodeMapImpl(document.getAttributes(), this);
}
@Override
@@ -383,7 +447,9 @@
@Override
public Node cloneNode(boolean deep) {
- return document.cloneNode(deep);
+ Node node = document.cloneNode(deep);
+ registerChildNodes(node, deep);
+ return findIfPresent(node);
}
@Override
@@ -428,7 +494,7 @@
@Override
public short compareDocumentPosition(Node other) throws DOMException {
- return document.compareDocumentPosition(other);
+ return document.compareDocumentPosition(getDomNode(other));
}
@Override
@@ -443,7 +509,7 @@
@Override
public boolean isSameNode(Node other) {
- return document.isSameNode(other);
+ return document.isSameNode(getDomNode(other));
}
@Override
@@ -463,7 +529,7 @@
@Override
public boolean isEqualNode(Node arg) {
- return document.isEqualNode(arg);
+ return document.isEqualNode(getDomNode(arg));
}
@Override
@@ -496,11 +562,11 @@
*/
public void register(javax.xml.soap.Node node) {
final Node domElement = getDomNode(node);
- if (domToSoap.containsKey(domElement)) {
+ if (domElement.getUserData(SAAJ_NODE) != null) {
throw new IllegalStateException("Element " + domElement.getNodeName()
+ " is already registered");
}
- domToSoap.put(domElement, node);
+ domElement.setUserData(SAAJ_NODE, node, null);
}
/**
@@ -522,7 +588,7 @@
if (node instanceof javax.xml.soap.Node) {
return (javax.xml.soap.Node) node;
}
- final javax.xml.soap.Node found = domToSoap.get(node);
+ final javax.xml.soap.Node found = (javax.xml.soap.Node) node.getUserData(SAAJ_NODE);
if (found == null && required) {
throw new IllegalArgumentException(MessageFormat.format("Cannot find SOAP wrapper for element {0}", node));
}
@@ -562,6 +628,24 @@
return node;
}
+
+ private Node createSoapNode(Class nodeType, Node node) {
+ if (SOAPTextImpl.class.isAssignableFrom(nodeType)) {
+ return new SOAPTextImpl(this, (Text) node);
+ } else if (SOAPCommentImpl.class.isAssignableFrom(nodeType)) {
+ return new SOAPCommentImpl(this, (Comment) node);
+ } else if (CDATAImpl.class.isAssignableFrom(nodeType)) {
+ return new CDATAImpl(this, (CDATASection) node);
+ }
+ try {
+ Constructor constructor = nodeType.getConstructor(SOAPDocumentImpl.class, Element.class);
+ return constructor.newInstance(this, node);
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+
public Document getDomElement() {
return document;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -49,6 +49,7 @@
protected abstract SOAPDocumentImpl createDocument();
+ @Override
public SOAPElement createElement(String tagName) throws SOAPException {
if (tagName == null) {
log.log(
@@ -60,6 +61,7 @@
NameImpl.createFromTagName(tagName));
}
+ @Override
public SOAPElement createElement(Name name) throws SOAPException {
// @since SAAJ 1.3
// If the Name was null it would cause a NullPointerException in earlier release
@@ -71,6 +73,7 @@
return ElementFactory.createElement(createDocument(), name);
}
+ @Override
public SOAPElement createElement(QName qname) throws SOAPException {
if (qname == null) {
log.log(Level.SEVERE,"SAAJ0567.soap.null.input",
@@ -80,6 +83,7 @@
return ElementFactory.createElement(createDocument(),qname);
}
+ @Override
public SOAPElement createElement(
String localName,
String prefix,
@@ -96,6 +100,7 @@
return ElementFactory.createElement(createDocument(), localName, prefix, uri);
}
+ @Override
public Name createName(String localName, String prefix, String uri)
throws SOAPException {
// @since SAAJ 1.3
@@ -110,6 +115,7 @@
return NameImpl.create(localName, prefix, uri);
}
+ @Override
public Name createName(String localName) throws SOAPException {
// @since SAAJ 1.3
// if localName==null, earlier impl would create Name with localName=null
@@ -125,6 +131,7 @@
// Note: the child elements might still be org.w3c.dom.Element's, but the
// getChildElements will do the conversion to SOAPElement when called.
+ @Override
public SOAPElement createElement(Element domElement) throws SOAPException {
if (domElement == null) {
return null;
@@ -163,14 +170,17 @@
return copy;
}
+ @Override
public Detail createDetail() throws SOAPException {
throw new UnsupportedOperationException();
}
+ @Override
public SOAPFault createFault(String reasonText, QName faultCode) throws SOAPException {
throw new UnsupportedOperationException();
}
+ @Override
public SOAPFault createFault() throws SOAPException {
throw new UnsupportedOperationException();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -64,6 +64,7 @@
soapException.fillInStackTrace();
}
+ @Override
public Throwable fillInStackTrace() {
if (soapException != null) {
soapException.fillInStackTrace();
@@ -71,26 +72,32 @@
return this;
}
+ @Override
public String getLocalizedMessage() {
return soapException.getLocalizedMessage();
}
+ @Override
public String getMessage() {
return soapException.getMessage();
}
+ @Override
public void printStackTrace() {
soapException.printStackTrace();
}
+ @Override
public void printStackTrace(PrintStream s) {
soapException.printStackTrace(s);
}
+ @Override
public void printStackTrace(PrintWriter s) {
soapException.printStackTrace(s);
}
+ @Override
public String toString() {
return soapException.toString();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -75,6 +75,7 @@
import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.xml.soap.MimeHeader;
/**
* SOAPPartImpl is the first attachment. This contains the XML/SOAP document.
@@ -136,6 +137,7 @@
return (message != null) ? message.isFastInfoset() : false;
}
+ @Override
public SOAPEnvelope getEnvelope() throws SOAPException {
// If there is no SOAP envelope already created, then create
@@ -185,38 +187,47 @@
}
}
+ @Override
public void removeAllMimeHeaders() {
headers.removeAllHeaders();
}
+ @Override
public void removeMimeHeader(String header) {
headers.removeHeader(header);
}
+ @Override
public String[] getMimeHeader(String name) {
return headers.getHeader(name);
}
+ @Override
public void setMimeHeader(String name, String value) {
headers.setHeader(name, value);
}
+ @Override
public void addMimeHeader(String name, String value) {
headers.addHeader(name, value);
}
- public Iterator getAllMimeHeaders() {
+ @Override
+ public Iterator getAllMimeHeaders() {
return headers.getAllHeaders();
}
- public Iterator getMatchingMimeHeaders(String[] names) {
+ @Override
+ public Iterator getMatchingMimeHeaders(String[] names) {
return headers.getMatchingHeaders(names);
}
- public Iterator getNonMatchingMimeHeaders(String[] names) {
+ @Override
+ public Iterator getNonMatchingMimeHeaders(String[] names) {
return headers.getNonMatchingHeaders(names);
}
+ @Override
public Source getContent() throws SOAPException {
if (source != null) {
InputStream bis = null;
@@ -248,6 +259,7 @@
return ((Envelope) getEnvelope()).getContent();
}
+ @Override
public void setContent(Source source) throws SOAPException {
try {
if (source instanceof StreamSource) {
@@ -376,18 +388,22 @@
DataHandler getDataHandler() {
DataSource ds = new DataSource() {
+ @Override
public OutputStream getOutputStream() throws IOException {
throw new IOException("Illegal Operation");
}
+ @Override
public String getContentType() {
return getContentTypeString();
}
+ @Override
public String getName() {
return getContentId();
}
+ @Override
public InputStream getInputStream() throws IOException {
return getContentAsStream();
}
@@ -395,15 +411,18 @@
return new DataHandler(ds);
}
+ @Override
public SOAPDocumentImpl getDocument() {
handleNewSource();
return document;
}
+ @Override
public SOAPPartImpl getSOAPPart() {
return this;
}
+ @Override
public DocumentType getDoctype() {
return document.getDoctype();
}
@@ -412,10 +431,12 @@
// same way whether they are called from here or directly from the document.
// If the document needs any help from this SOAPPart then
// Make it use a call-back as in doGetDocumentElement() below
+ @Override
public DOMImplementation getImplementation() {
return document.getImplementation();
}
+ @Override
public Element getDocumentElement() {
// If there is no SOAP envelope already created, then create
// one from a source if one exists. If there is a newer source
@@ -435,26 +456,32 @@
}
}
+ @Override
public Element createElement(String tagName) throws DOMException {
return document.createElement(tagName);
}
+ @Override
public DocumentFragment createDocumentFragment() {
return document.createDocumentFragment();
}
+ @Override
public org.w3c.dom.Text createTextNode(String data) {
return document.createTextNode(data);
}
+ @Override
public Comment createComment(String data) {
return document.createComment(data);
}
+ @Override
public CDATASection createCDATASection(String data) throws DOMException {
return document.createCDATASection(data);
}
+ @Override
public ProcessingInstruction createProcessingInstruction(
String target,
String data)
@@ -462,20 +489,24 @@
return document.createProcessingInstruction(target, data);
}
+ @Override
public Attr createAttribute(String name) throws DOMException {
return document.createAttribute(name);
}
+ @Override
public EntityReference createEntityReference(String name)
throws DOMException {
return document.createEntityReference(name);
}
+ @Override
public NodeList getElementsByTagName(String tagname) {
handleNewSource();
return document.getElementsByTagName(tagname);
}
+ @Override
public org.w3c.dom.Node importNode(
org.w3c.dom.Node importedNode,
boolean deep)
@@ -484,16 +515,19 @@
return document.importNode(importedNode, deep);
}
+ @Override
public Element createElementNS(String namespaceURI, String qualifiedName)
throws DOMException {
return document.createElementNS(namespaceURI, qualifiedName);
}
+ @Override
public Attr createAttributeNS(String namespaceURI, String qualifiedName)
throws DOMException {
return document.createAttributeNS(namespaceURI, qualifiedName);
}
+ @Override
public NodeList getElementsByTagNameNS(
String namespaceURI,
String localName) {
@@ -501,16 +535,19 @@
return document.getElementsByTagNameNS(namespaceURI, localName);
}
+ @Override
public Element getElementById(String elementId) {
handleNewSource();
return document.getElementById(elementId);
}
+ @Override
public org.w3c.dom.Node appendChild(org.w3c.dom.Node newChild)
throws DOMException {
handleNewSource();
return document.appendChild(newChild);
}
+ @Override
public org.w3c.dom.Node cloneNode(boolean deep) {
handleNewSource();
return document.cloneNode(deep);
@@ -525,75 +562,92 @@
return newSoapPart;
}
+ @Override
public NamedNodeMap getAttributes() {
return document.getDomDocument().getAttributes();
}
+ @Override
public NodeList getChildNodes() {
handleNewSource();
return document.getChildNodes();
}
+ @Override
public org.w3c.dom.Node getFirstChild() {
handleNewSource();
return document.getFirstChild();
}
+ @Override
public org.w3c.dom.Node getLastChild() {
handleNewSource();
return document.getLastChild();
}
+ @Override
public String getLocalName() {
return document.getDomDocument().getLocalName();
}
+ @Override
public String getNamespaceURI() {
return document.getDomDocument().getNamespaceURI();
}
+ @Override
public org.w3c.dom.Node getNextSibling() {
handleNewSource();
return document.getNextSibling();
}
+ @Override
public String getNodeName() {
return document.getDomDocument().getNodeName();
}
+ @Override
public short getNodeType() {
return document.getDomDocument().getNodeType();
}
+ @Override
public String getNodeValue() throws DOMException {
return document.getNodeValue();
}
+ @Override
public Document getOwnerDocument() {
return document.getDomDocument().getOwnerDocument();
}
+ @Override
public org.w3c.dom.Node getParentNode() {
return document.getDomDocument().getParentNode();
}
+ @Override
public String getPrefix() {
return document.getDomDocument().getPrefix();
}
+ @Override
public org.w3c.dom.Node getPreviousSibling() {
return document.getDomDocument().getPreviousSibling();
}
+ @Override
public boolean hasAttributes() {
return document.getDomDocument().hasAttributes();
}
+ @Override
public boolean hasChildNodes() {
handleNewSource();
return document.hasChildNodes();
}
+ @Override
public org.w3c.dom.Node insertBefore(
org.w3c.dom.Node arg0,
org.w3c.dom.Node arg1)
@@ -602,21 +656,25 @@
return document.insertBefore(arg0, arg1);
}
+ @Override
public boolean isSupported(String arg0, String arg1) {
return document.getDomDocument().isSupported(arg0, arg1);
}
+ @Override
public void normalize() {
handleNewSource();
document.normalize();
}
+ @Override
public org.w3c.dom.Node removeChild(org.w3c.dom.Node arg0)
throws DOMException {
handleNewSource();
return document.removeChild(arg0);
}
+ @Override
public org.w3c.dom.Node replaceChild(
org.w3c.dom.Node arg0,
org.w3c.dom.Node arg1)
@@ -625,10 +683,12 @@
return document.replaceChild(arg0, arg1);
}
+ @Override
public void setNodeValue(String arg0) throws DOMException {
document.setNodeValue(arg0);
}
+ @Override
public void setPrefix(String arg0) throws DOMException {
document.setPrefix(arg0);
}
@@ -703,141 +763,173 @@
this.sourceCharsetEncoding = charset;
}
+ @Override
public org.w3c.dom.Node renameNode(org.w3c.dom.Node n, String namespaceURI, String qualifiedName)
throws DOMException {
handleNewSource();
return document.renameNode(n, namespaceURI, qualifiedName);
}
+ @Override
public void normalizeDocument() {
document.normalizeDocument();
}
+ @Override
public DOMConfiguration getDomConfig() {
return document.getDomDocument().getDomConfig();
}
+ @Override
public org.w3c.dom.Node adoptNode(org.w3c.dom.Node source) throws DOMException {
handleNewSource();
return document.adoptNode(source);
}
+ @Override
public void setDocumentURI(String documentURI) {
document.setDocumentURI(documentURI);
}
+ @Override
public String getDocumentURI() {
return document.getDomDocument().getDocumentURI();
}
+ @Override
public void setStrictErrorChecking(boolean strictErrorChecking) {
document.setStrictErrorChecking(strictErrorChecking);
}
+ @Override
public String getInputEncoding() {
return document.getDomDocument().getInputEncoding();
}
+ @Override
public String getXmlEncoding() {
return document.getDomDocument().getXmlEncoding();
}
+ @Override
public boolean getXmlStandalone() {
return document.getDomDocument().getXmlStandalone();
}
+ @Override
public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
document.setXmlStandalone(xmlStandalone);
}
+ @Override
public String getXmlVersion() {
return document.getDomDocument().getXmlVersion();
}
+ @Override
public void setXmlVersion(String xmlVersion) throws DOMException {
document.setXmlVersion(xmlVersion);
}
+ @Override
public boolean getStrictErrorChecking() {
return document.getDomDocument().getStrictErrorChecking();
}
// DOM L3 methods from org.w3c.dom.Node
+ @Override
public String getBaseURI() {
return document.getDomDocument().getBaseURI();
}
+ @Override
public short compareDocumentPosition(org.w3c.dom.Node other)
throws DOMException {
return document.compareDocumentPosition(other);
}
+ @Override
public String getTextContent()
throws DOMException {
return document.getTextContent();
}
+ @Override
public void setTextContent(String textContent) throws DOMException {
document.setTextContent(textContent);
}
+ @Override
public boolean isSameNode(org.w3c.dom.Node other) {
return document.isSameNode(other);
}
+ @Override
public String lookupPrefix(String namespaceURI) {
return document.getDomDocument().lookupPrefix(namespaceURI);
}
+ @Override
public boolean isDefaultNamespace(String namespaceURI) {
return document.isDefaultNamespace(namespaceURI);
}
+ @Override
public String lookupNamespaceURI(String prefix) {
return document.lookupNamespaceURI(prefix);
}
+ @Override
public boolean isEqualNode(org.w3c.dom.Node arg) {
return document.getDomDocument().isEqualNode(arg);
}
+ @Override
public Object getFeature(String feature,
String version) {
return document.getFeature(feature,version);
}
+ @Override
public Object setUserData(String key,
Object data,
UserDataHandler handler) {
return document.setUserData(key, data, handler);
}
+ @Override
public Object getUserData(String key) {
return document.getDomDocument().getUserData(key);
}
+ @Override
public void recycleNode() {
// Nothing seems to be required to be done here
}
+ @Override
public String getValue() {
return null;
}
+ @Override
public void setValue(String value) {
log.severe("SAAJ0571.soappart.setValue.not.defined");
throw new IllegalStateException("Setting value of a soap part is not defined");
}
+ @Override
public void setParentElement(SOAPElement parent) throws SOAPException {
log.severe("SAAJ0570.soappart.parent.element.not.defined");
throw new SOAPExceptionImpl("The parent element of a soap part is not defined");
}
+ @Override
public SOAPElement getParentElement() {
return null;
}
+ @Override
public void detachNode() {
// Nothing seems to be required to be done here
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -42,38 +42,39 @@
* @author shih-chang.chen@oracle.com
*/
public class StaxLazySourceBridge extends StaxBridge {
- private LazyEnvelopeSource lazySource;
+ private LazyEnvelopeSource lazySource;
- public StaxLazySourceBridge(LazyEnvelopeSource src, SOAPPartImpl soapPart) throws SOAPException {
- super(soapPart);
- lazySource = src;
- final String soapEnvNS = soapPart.getSOAPNamespace();
- try {
- breakpoint = new XMLStreamReaderToXMLStreamWriter.Breakpoint(src.readToBodyStarTag(), saajWriter) {
- public boolean proceedAfterStartElement() {
- if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
- return false;
- } else
- return true;
- }
- };
- } catch (XMLStreamException e) {
- throw new SOAPException(e);
+ public StaxLazySourceBridge(LazyEnvelopeSource src, SOAPPartImpl soapPart) throws SOAPException {
+ super(soapPart);
+ lazySource = src;
+ final String soapEnvNS = soapPart.getSOAPNamespace();
+ try {
+ breakpoint = new XMLStreamReaderToXMLStreamWriter.Breakpoint(src.readToBodyStarTag(), saajWriter) {
+ @Override
+ public boolean proceedAfterStartElement() {
+ if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
+ return false;
+ } else
+ return true;
}
+ };
+ } catch (XMLStreamException e) {
+ throw new SOAPException(e);
}
+ }
- @Override
+ @Override
public XMLStreamReader getPayloadReader() {
return lazySource.readPayload();
// throw new UnsupportedOperationException();
}
- @Override
+ @Override
public QName getPayloadQName() {
return lazySource.getPayloadQName();
}
- @Override
+ @Override
public String getPayloadAttributeValue(String attName) {
if (lazySource.isPayloadStreamReader()) {
XMLStreamReader reader = lazySource.readPayload();
@@ -84,7 +85,7 @@
return null;
}
- @Override
+ @Override
public String getPayloadAttributeValue(QName attName) {
if (lazySource.isPayloadStreamReader()) {
XMLStreamReader reader = lazySource.readPayload();
@@ -95,12 +96,13 @@
return null;
}
- public void bridgePayload() throws XMLStreamException {
- //Assuming out is at Body
- writePayloadTo(saajWriter);
- }
+ @Override
+ public void bridgePayload() throws XMLStreamException {
+ //Assuming out is at Body
+ writePayloadTo(saajWriter);
+ }
- public void writePayloadTo(XMLStreamWriter writer) throws XMLStreamException {
+ public void writePayloadTo(XMLStreamWriter writer) throws XMLStreamException {
lazySource.writePayloadTo(writer);
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -38,41 +38,46 @@
* @author shih-chang.chen@oracle.com
*/
public class StaxReaderBridge extends StaxBridge {
- private XMLStreamReader in;
+ private XMLStreamReader in;
- public StaxReaderBridge(XMLStreamReader reader, SOAPPartImpl soapPart) throws SOAPException {
- super(soapPart);
- in = reader;
- final String soapEnvNS = soapPart.getSOAPNamespace();
- breakpoint = new XMLStreamReaderToXMLStreamWriter.Breakpoint(reader, saajWriter) {
- boolean seenBody = false;
- boolean stopedAtBody = false;
- public boolean proceedBeforeStartElement() {
- if (stopedAtBody) return true;
- if (seenBody) {
- stopedAtBody = true;
- return false;
- }
- if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
- seenBody = true;
- }
- return true;
+ public StaxReaderBridge(XMLStreamReader reader, SOAPPartImpl soapPart) throws SOAPException {
+ super(soapPart);
+ in = reader;
+ final String soapEnvNS = soapPart.getSOAPNamespace();
+ breakpoint = new XMLStreamReaderToXMLStreamWriter.Breakpoint(reader, saajWriter) {
+ boolean seenBody = false;
+ boolean stopedAtBody = false;
+ @Override
+ public boolean proceedBeforeStartElement() {
+ if (stopedAtBody) return true;
+ if (seenBody) {
+ stopedAtBody = true;
+ return false;
}
- };
- }
+ if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
+ seenBody = true;
+ }
+ return true;
+ }
+ };
+ }
+ @Override
public XMLStreamReader getPayloadReader() {
return in;
}
+ @Override
public QName getPayloadQName() {
return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getName() : null;
}
+ @Override
public String getPayloadAttributeValue(String attName) {
return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getAttributeValue(null, attName) : null;
}
+ @Override
public String getPayloadAttributeValue(QName attName) {
return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getAttributeValue(attName.getNamespaceURI(), attName.getLocalPart()) : null;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -36,10 +36,12 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPFactoryImpl;
public class SOAPFactoryDynamicImpl extends SOAPFactoryImpl {
+ @Override
protected SOAPDocumentImpl createDocument() {
return null;
}
+ @Override
public Detail createDetail() throws SOAPException {
throw new UnsupportedOperationException(
"createDetail() not supported for Dynamic Protocol");
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -35,6 +35,7 @@
import com.sun.xml.internal.messaging.saaj.soap.MessageFactoryImpl;
public class SOAPMessageFactoryDynamicImpl extends MessageFactoryImpl {
+ @Override
public SOAPMessage createMessage() throws SOAPException {
throw new UnsupportedOperationException(
"createMessage() not supported for Dynamic Protocol");
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -29,6 +29,7 @@
import javax.xml.soap.*;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import org.w3c.dom.Element;
/**
* All elements of the SOAP-ENV:BODY.
@@ -47,6 +48,11 @@
super(ownerDoc, qname);
}
+ public BodyElementImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public void setParentElement(SOAPElement element) throws SOAPException {
if (! (element instanceof SOAPBody)) {
log.severe("SAAJ0101.impl.parent.of.body.elem.mustbe.body");
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -30,21 +30,30 @@
import java.util.logging.Level;
import javax.xml.namespace.QName;
-import javax.xml.soap.*;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
-import org.w3c.dom.*;
-import org.w3c.dom.Node;
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.StaxBridge;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* The implementation of SOAP-ENV:BODY or the SOAPBody abstraction.
@@ -72,6 +81,7 @@
protected abstract SOAPFault createFaultElement();
protected abstract QName getDefaultFaultCode();
+ @Override
public SOAPFault addFault() throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0110.impl.fault.already.exists");
@@ -88,6 +98,7 @@
return fault;
}
+ @Override
public SOAPFault addFault(
Name faultCode,
String faultString,
@@ -100,6 +111,7 @@
return fault;
}
+ @Override
public SOAPFault addFault(
QName faultCode,
String faultString,
@@ -112,6 +124,7 @@
return fault;
}
+ @Override
public SOAPFault addFault(Name faultCode, String faultString)
throws SOAPException {
@@ -121,6 +134,7 @@
return fault;
}
+ @Override
public SOAPFault addFault(QName faultCode, String faultString)
throws SOAPException {
@@ -147,6 +161,7 @@
return null;
}
+ @Override
public boolean hasFault() {
QName payloadQName = getPayloadQName();
return getFaultQName().equals(payloadQName);
@@ -156,6 +171,7 @@
return new QName(getNamespaceURI(), "Fault");
}
+ @Override
public SOAPFault getFault() {
if (hasFault()) {
if (fault == null) {
@@ -167,6 +183,7 @@
return null;
}
+ @Override
public SOAPBodyElement addBodyElement(Name name) throws SOAPException {
SOAPBodyElement newBodyElement =
(SOAPBodyElement) ElementFactory.createNamedElement(
@@ -181,6 +198,7 @@
return newBodyElement;
}
+ @Override
public SOAPBodyElement addBodyElement(QName qname) throws SOAPException {
SOAPBodyElement newBodyElement =
(SOAPBodyElement) ElementFactory.createNamedElement(
@@ -195,6 +213,7 @@
return newBodyElement;
}
+ @Override
public void setParentElement(SOAPElement element) throws SOAPException {
if (!(element instanceof SOAPEnvelope)) {
@@ -204,10 +223,12 @@
super.setParentElement(element);
}
+ @Override
protected SOAPElement addElement(Name name) throws SOAPException {
return addBodyElement(name);
}
+ @Override
protected SOAPElement addElement(QName name) throws SOAPException {
return addBodyElement(name);
}
@@ -226,6 +247,7 @@
// return super.replaceChild(newElement, ref);
// }
+ @Override
public SOAPBodyElement addDocument(Document document)
throws SOAPException {
/*
@@ -252,7 +274,7 @@
org.w3c.dom.Node replacingNode = ownerDoc.importNode(docFrag, true);
// Adding replacingNode at the last of the children list of body
addNode(replacingNode);
- Iterator i =
+ Iterator i =
getChildElements(NameImpl.copyElementName(rootElement));
// Return the child element with the required name which is at the
// end of the list
@@ -263,6 +285,7 @@
//*/
}
+ @Override
protected SOAPElement convertToSoapElement(Element element) {
final Node soapNode = getSoapDocument().findIfPresent(element);
if ((soapNode instanceof SOAPBodyElement) &&
@@ -278,6 +301,7 @@
}
}
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
log.log(Level.SEVERE,
"SAAJ0146.impl.invalid.name.change.requested",
@@ -288,9 +312,10 @@
+ newName.getLocalPart());
}
+ @Override
public Document extractContentAsDocument() throws SOAPException {
- Iterator eachChild = getChildElements();
+ Iterator eachChild = getChildElements();
javax.xml.soap.Node firstBodyElement = null;
while (eachChild.hasNext() &&
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -25,325 +25,61 @@
package com.sun.xml.internal.messaging.saaj.soap.impl;
-import java.util.logging.Logger;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
import org.w3c.dom.CDATASection;
+import org.w3c.dom.CharacterData;
import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.w3c.dom.UserDataHandler;
-public class CDATAImpl implements CDATASection, javax.xml.soap.Text {
-
- protected static final Logger log =
- Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
- "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
+public class CDATAImpl extends TextImpl implements CDATASection {
static final String cdataUC = "() {
+ @Override
+ public Iterator getDetailEntries() {
+ return new Iterator() {
Iterator eachNode = getChildElementNodes();
SOAPElement next = null;
SOAPElement last = null;
+ @Override
public boolean hasNext() {
if (next == null) {
while (eachNode.hasNext()) {
@@ -101,15 +107,17 @@
return next != null;
}
- public SOAPElement next() {
+ @Override
+ public DetailEntry next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
last = next;
next = null;
- return last;
+ return (DetailEntry) last;
}
+ @Override
public void remove() {
if (last == null) {
throw new IllegalStateException();
@@ -121,6 +129,7 @@
};
}
+ @Override
protected boolean isStandardFaultElement() {
return true;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java Thu Aug 24 16:24:44 2017 +0200
@@ -106,9 +106,9 @@
}
if ("Fault".equalsIgnoreCase(localName)) {
if (NameImpl.SOAP11_NAMESPACE.equals(namespaceUri)) {
- return new Fault1_1Impl(element, ownerDocument);
+ return new Fault1_1Impl(ownerDocument, element);
} else if (NameImpl.SOAP12_NAMESPACE.equals(namespaceUri)) {
- return new Fault1_2Impl(element, ownerDocument);
+ return new Fault1_2Impl(ownerDocument, element);
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -27,21 +27,37 @@
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
-import javax.xml.soap.*;
-import org.w3c.dom.*;
import org.w3c.dom.Node;
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
-import com.sun.xml.internal.messaging.saaj.util.*;
+import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import com.sun.xml.internal.messaging.saaj.util.NamespaceContextIterator;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
+import org.w3c.dom.UserDataHandler;
public class ElementImpl implements SOAPElement, SOAPBodyElement {
@@ -108,7 +124,7 @@
@Override
public NodeList getElementsByTagName(String name) {
- return new NodeListImpl(getSoapDocument(), element.getElementsByTagName(name));
+ return new NodeListImpl(soapDocument, element.getElementsByTagName(name));
}
@Override
@@ -139,21 +155,21 @@
this.soapDocument = ownerDoc;
this.element = ownerDoc.getDomDocument().createElementNS(name.getURI(), name.getQualifiedName());
elementQName = NameImpl.convertToQName(name);
- getSoapDocument().register(this);
+ soapDocument.register(this);
}
public ElementImpl(SOAPDocumentImpl ownerDoc, QName name) {
this.soapDocument = ownerDoc;
this.element = ownerDoc.getDomDocument().createElementNS(name.getNamespaceURI(), getQualifiedName(name));
elementQName = name;
- getSoapDocument().register(this);
+ soapDocument.register(this);
}
public ElementImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
this.element = domElement;
this.soapDocument = ownerDoc;
this.elementQName = new QName(domElement.getNamespaceURI(), domElement.getLocalName());
- getSoapDocument().register(this);
+ soapDocument.register(this);
}
public ElementImpl(
@@ -165,7 +181,7 @@
this.element = ownerDoc.getDomDocument().createElementNS(uri, qualifiedName);
elementQName =
new QName(uri, getLocalPart(qualifiedName), getPrefix(qualifiedName));
- getSoapDocument().register(this);
+ soapDocument.register(this);
}
public void ensureNamespaceIsDeclared(String prefix, String uri) {
@@ -178,28 +194,29 @@
}
}
+ @Override
public Document getOwnerDocument() {
return soapDocument;
}
@Override
public Node insertBefore(Node newChild, Node refChild) throws DOMException {
- return element.insertBefore(getSoapDocument().getDomNode(newChild), getSoapDocument().getDomNode(refChild));
+ return soapDocument.findIfPresent(element.insertBefore(soapDocument.getDomNode(newChild), soapDocument.getDomNode(refChild)));
}
@Override
public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
- return element.replaceChild(getSoapDocument().getDomNode(newChild), getSoapDocument().getDomNode(oldChild));
+ return soapDocument.findIfPresent(element.replaceChild(soapDocument.getDomNode(newChild), soapDocument.getDomNode(oldChild)));
}
@Override
public Node removeChild(Node oldChild) throws DOMException {
- return element.removeChild(getSoapDocument().getDomNode(oldChild));
+ return soapDocument.findIfPresent(element.removeChild(soapDocument.getDomNode(oldChild)));
}
@Override
public Node appendChild(Node newChild) throws DOMException {
- return element.appendChild(getSoapDocument().getDomNode(newChild));
+ return soapDocument.findIfPresent(element.appendChild(soapDocument.getDomNode(newChild)));
}
@Override
@@ -209,7 +226,9 @@
@Override
public Node cloneNode(boolean deep) {
- return element.cloneNode(deep);
+ Node elementNSNode = element.cloneNode(deep);
+ soapDocument.registerChildNodes(elementNSNode, deep);
+ return soapDocument.findIfPresent(soapDocument.getDomNode(elementNSNode));
}
@Override
@@ -254,7 +273,7 @@
@Override
public short compareDocumentPosition(Node other) throws DOMException {
- return element.compareDocumentPosition(other);
+ return element.compareDocumentPosition(soapDocument.getDomNode(other));
}
@Override
@@ -269,7 +288,7 @@
@Override
public boolean isSameNode(Node other) {
- return element.isSameNode(other);
+ return element.isSameNode(soapDocument.getDomNode(other));
}
@Override
@@ -289,7 +308,7 @@
@Override
public boolean isEqualNode(Node arg) {
- return element.isEqualNode(arg);
+ return element.isEqualNode(soapDocument.getDomNode(arg));
}
@Override
@@ -307,14 +326,17 @@
return element.getUserData(key);
}
+ @Override
public SOAPElement addChildElement(Name name) throws SOAPException {
return addElement(name);
}
+ @Override
public SOAPElement addChildElement(QName qname) throws SOAPException {
return addElement(qname);
}
+ @Override
public SOAPElement addChildElement(String localName) throws SOAPException {
String nsUri = getNamespaceURI("");
Name name = (nsUri == null || nsUri.isEmpty())
@@ -323,6 +345,7 @@
return addChildElement(name);
}
+ @Override
public SOAPElement addChildElement(String localName, String prefix)
throws SOAPException {
String uri = getNamespaceURI(prefix);
@@ -337,6 +360,7 @@
return addChildElement(localName, prefix, uri);
}
+ @Override
public String getNamespaceURI(String prefix) {
if ("xmlns".equals(prefix)) {
@@ -415,12 +439,14 @@
return null;
}
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
ElementImpl copy =
new ElementImpl((SOAPDocumentImpl) getOwnerDocument(), newName);
return replaceElementWithSOAPElement(this,copy);
}
+ @Override
public QName createQName(String localName, String prefix)
throws SOAPException {
String uri = getNamespaceURI(prefix);
@@ -485,6 +511,7 @@
return new NamespaceContextIterator(this, traverseStack);
}
+ @Override
public SOAPElement addChildElement(
String localName,
String prefix,
@@ -496,6 +523,7 @@
return convertToSoapElement(newElement);
}
+ @Override
public SOAPElement addChildElement(SOAPElement element)
throws SOAPException {
@@ -531,7 +559,7 @@
log.severe("SAAJ0158.impl.version.mismatch.fault");
throw new SOAPExceptionImpl("SOAP Version mismatch encountered when trying to add SOAPFault to SOAPBody");
}
- Iterator it = this.getChildElements();
+ Iterator it = this.getChildElements();
if (it.hasNext()) {
log.severe("SAAJ0156.impl.adding.fault.error");
throw new SOAPExceptionImpl("Cannot add SOAPFault as a child of a non-Empty SOAPBody");
@@ -542,8 +570,7 @@
// preserve the encodingStyle attr as it may get lost in the import
String encodingStyle = element.getEncodingStyle();
- final Element domElement = ((ElementImpl) element).getDomElement();
- final Element importedElement = importElement(domElement);
+ final Element importedElement = importElement(element);
addNode(importedElement);
final SOAPElement converted = convertToSoapElement(importedElement);
@@ -603,7 +630,7 @@
}
protected void addNode(org.w3c.dom.Node newElement) throws SOAPException {
- insertBefore(getSoapDocument().getDomNode(newElement), null);
+ insertBefore(soapDocument.getDomNode(newElement), null);
if (getOwnerDocument() instanceof DocumentFragment)
return;
@@ -623,7 +650,7 @@
Node child = getFirstChild();
while (child != null) {
if (child instanceof Element) {
- return (Element) getSoapDocument().find(child);
+ return (Element) soapDocument.find(child);
}
child = child.getNextSibling();
}
@@ -634,7 +661,7 @@
Node eachChild = getFirstChild();
while (eachChild != null) {
if (eachChild instanceof Element) {
- SOAPElement eachChildSoap = (SOAPElement) getSoapDocument().find(eachChild);
+ SOAPElement eachChildSoap = (SOAPElement) soapDocument.find(eachChild);
if (eachChildSoap != null) {
if (eachChildSoap.getElementName().equals(name)) {
return eachChildSoap;
@@ -658,6 +685,7 @@
return null;
}
+ @Override
public SOAPElement addTextNode(String text) throws SOAPException {
if (text.startsWith(CDATAImpl.cdataUC)
|| text.startsWith(CDATAImpl.cdataLC))
@@ -680,6 +708,7 @@
return this;
}
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
addAttributeBare(name, value);
@@ -689,6 +718,7 @@
return this;
}
+ @Override
public SOAPElement addAttribute(QName qname, String value)
throws SOAPException {
addAttributeBare(qname, value);
@@ -731,6 +761,7 @@
}
}
+ @Override
public SOAPElement addNamespaceDeclaration(String prefix, String uri)
throws SOAPException {
if (prefix.length() > 0) {
@@ -743,10 +774,12 @@
return this;
}
+ @Override
public String getAttributeValue(Name name) {
return getAttributeValueFrom(this, name);
}
+ @Override
public String getAttributeValue(QName qname) {
return getAttributeValueFrom(
this,
@@ -756,9 +789,10 @@
getQualifiedName(qname));
}
- public Iterator getAllAttributes() {
+ @Override
+ public Iterator getAllAttributes() {
Iterator i = getAllAttributesFrom(this);
- ArrayList list = new ArrayList();
+ ArrayList list = new ArrayList<>();
while (i.hasNext()) {
Name name = i.next();
if (!"xmlns".equalsIgnoreCase(name.getPrefix()))
@@ -767,9 +801,10 @@
return list.iterator();
}
- public Iterator getAllAttributesAsQNames() {
+ @Override
+ public Iterator getAllAttributesAsQNames() {
Iterator i = getAllAttributesFrom(this);
- ArrayList list = new ArrayList();
+ ArrayList list = new ArrayList<>();
while (i.hasNext()) {
Name name = i.next();
if (!"xmlns".equalsIgnoreCase(name.getPrefix())) {
@@ -780,11 +815,13 @@
}
- public Iterator getNamespacePrefixes() {
+ @Override
+ public Iterator getNamespacePrefixes() {
return doGetNamespacePrefixes(false);
}
- public Iterator getVisibleNamespacePrefixes() {
+ @Override
+ public Iterator getVisibleNamespacePrefixes() {
return doGetNamespacePrefixes(true);
}
@@ -805,11 +842,13 @@
}
}
+ @Override
public boolean hasNext() {
findNext();
return next != null;
}
+ @Override
public String next() {
findNext();
if (next == null) {
@@ -821,6 +860,7 @@
return last;
}
+ @Override
public void remove() {
if (last == null) {
throw new IllegalStateException();
@@ -832,18 +872,22 @@
};
}
+ @Override
public Name getElementName() {
return NameImpl.convertToName(elementQName);
}
+ @Override
public QName getElementQName() {
return elementQName;
}
+ @Override
public boolean removeAttribute(Name name) {
return removeAttribute(name.getURI(), name.getLocalName());
}
+ @Override
public boolean removeAttribute(QName name) {
return removeAttribute(name.getNamespaceURI(), name.getLocalPart());
}
@@ -860,6 +904,7 @@
return true;
}
+ @Override
public boolean removeNamespaceDeclaration(String prefix) {
org.w3c.dom.Attr declaration = getNamespaceAttr(prefix);
if (declaration == null) {
@@ -873,12 +918,13 @@
return true;
}
- public Iterator getChildElements() {
+ @Override
+ public Iterator getChildElements() {
return getChildElementsFrom(this);
}
protected SOAPElement convertToSoapElement(Element element) {
- final Node soapNode = getSoapDocument().findIfPresent(element);
+ final Node soapNode = soapDocument.findIfPresent(element);
if (soapNode instanceof SOAPElement) {
return (SOAPElement) soapNode;
} else {
@@ -888,6 +934,36 @@
}
}
+ protected TextImpl convertToSoapText(CharacterData characterData) {
+ final Node soapNode = getSoapDocument().findIfPresent(characterData);
+ if (soapNode instanceof TextImpl) {
+ return (TextImpl) soapNode;
+ } else {
+ TextImpl t = null;
+ switch (characterData.getNodeType()) {
+ case CDATA_SECTION_NODE:
+ t = new CDATAImpl(getSoapDocument(), characterData.getData());
+ break;
+ case COMMENT_NODE:
+ t = new SOAPCommentImpl(getSoapDocument(), characterData.getData());
+ break;
+ case TEXT_NODE:
+ t = new SOAPTextImpl(getSoapDocument(), characterData.getData());
+ break;
+ }
+ Node parent = getSoapDocument().find(characterData.getParentNode());
+ if (parent != null) {
+ parent.replaceChild(t, characterData);
+ } // XXX else throw an exception?
+
+ return t;
+
+// return replaceElementWithSOAPElement(
+// element,
+// (ElementImpl) createElement(NameImpl.copyElementName(element)));
+ }
+ }
+
protected SOAPElement replaceElementWithSOAPElement(
Element element,
ElementImpl copy) {
@@ -898,13 +974,13 @@
copy.addAttributeBare(name, getAttributeValueFrom(element, name));
}
- Iterator eachChild = getChildElementsFrom(element);
+ Iterator eachChild = getChildElementsFromDOM(element);
while (eachChild.hasNext()) {
Node nextChild = eachChild.next();
copy.insertBefore(nextChild, null);
}
- Node parent = getSoapDocument().find(element.getParentNode());
+ Node parent = soapDocument.find(element.getParentNode());
if (parent != null) {
parent.replaceChild(copy, element);
} // XXX else throw an exception?
@@ -912,18 +988,71 @@
return copy;
}
+ private Iterator getChildElementsFromDOM(final Element el) {
+ return new Iterator() {
+ Node next = el.getFirstChild();
+ Node nextNext = null;
+ Node last = null;
+ Node soapElement = getSoapDocument().findIfPresent(el);
+
+ @Override
+ public boolean hasNext() {
+ if (next != null) {
+ return true;
+ }
+ if (nextNext != null) {
+ next = nextNext;
+ }
+
+ return next != null;
+ }
+
+ public Node next() {
+ if (hasNext()) {
+ last = next;
+ next = null;
+
+ if ((soapElement instanceof ElementImpl)
+ && (last instanceof Element)) {
+ last =
+ ((ElementImpl) soapElement).convertToSoapElement(
+ (Element) last);
+ } else if ((soapElement instanceof ElementImpl) && (last instanceof CharacterData)) {
+ last = ((ElementImpl) soapElement).convertToSoapText(
+ (CharacterData) last);
+ }
+
+ nextNext = last.getNextSibling();
+ return last;
+ }
+ throw new NoSuchElementException();
+ }
+
+ @Override
+ public void remove() {
+ if (last == null) {
+ throw new IllegalStateException();
+ }
+ Node target = last;
+ last = null;
+ el.removeChild(target);
+ }
+ };
+ }
+
protected Iterator getChildElementNodes() {
return new Iterator() {
- Iterator eachNode = getChildElements();
+ Iterator eachNode = getChildElements();
Node next = null;
Node last = null;
+ @Override
public boolean hasNext() {
if (next == null) {
while (eachNode.hasNext()) {
Node node = eachNode.next();
if (node instanceof Element) {
- next = getSoapDocument().findIfPresent(node);
+ next = soapDocument.findIfPresent(node);
break;
}
}
@@ -931,15 +1060,17 @@
return next != null;
}
- public Node next() {
+ @Override
+ public javax.xml.soap.Node next() {
if (hasNext()) {
last = next;
next = null;
- return last;
+ return (javax.xml.soap.Node) last;
}
throw new NoSuchElementException();
}
+ @Override
public void remove() {
if (last == null) {
throw new IllegalStateException();
@@ -951,20 +1082,23 @@
};
}
- public Iterator getChildElements(final Name name) {
+ @Override
+ public Iterator getChildElements(final Name name) {
return getChildElements(name.getURI(), name.getLocalName());
}
- public Iterator getChildElements(final QName qname) {
+ @Override
+ public Iterator getChildElements(final QName qname) {
return getChildElements(qname.getNamespaceURI(), qname.getLocalPart());
}
- private Iterator getChildElements(final String nameUri, final String nameLocal) {
- return new Iterator() {
+ private Iterator getChildElements(final String nameUri, final String nameLocal) {
+ return new Iterator() {
Iterator eachElement = getChildElementNodes();
Node next = null;
Node last = null;
+ @Override
public boolean hasNext() {
if (next == null) {
while (eachElement.hasNext()) {
@@ -982,15 +1116,17 @@
return next != null;
}
- public Node next() {
+ @Override
+ public javax.xml.soap.Node next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
last = next;
next = null;
- return last;
+ return (javax.xml.soap.Node) last;
}
+ @Override
public void remove() {
if (last == null) {
throw new IllegalStateException();
@@ -1002,6 +1138,7 @@
};
}
+ @Override
public void removeContents() {
Node currentChild = getFirstChild();
@@ -1020,6 +1157,7 @@
}
}
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
if (!"".equals(encodingStyle)) {
try {
@@ -1037,6 +1175,7 @@
tryToFindEncodingStyleAttributeName();
}
+ @Override
public String getEncodingStyle() {
String encodingStyle = encodingStyleAttribute.getValue();
if (encodingStyle != null)
@@ -1058,11 +1197,13 @@
}
// Node methods
+ @Override
public String getValue() {
javax.xml.soap.Node valueNode = getValueNode();
return valueNode == null ? null : valueNode.getValue();
}
+ @Override
public void setValue(String value) {
Node valueNode = getValueNodeStrict();
if (valueNode != null) {
@@ -1092,7 +1233,7 @@
}
protected javax.xml.soap.Node getValueNode() {
- Iterator i = getChildElements();
+ Iterator i = getChildElements();
while (i.hasNext()) {
Node n = i.next();
if (n.getNodeType() == org.w3c.dom.Node.TEXT_NODE ||
@@ -1101,12 +1242,13 @@
normalize();
// Should remove the normalization step when this gets fixed in
// DOM/Xerces.
- return getSoapDocument().find(n);
+ return soapDocument.find(n);
}
}
return null;
}
+ @Override
public void setParentElement(SOAPElement element) throws SOAPException {
if (element == null) {
log.severe("SAAJ0106.impl.no.null.to.parent.elem");
@@ -1138,12 +1280,13 @@
encodingStyleAttribute.setName(encodingStyleAttributeName);
}
+ @Override
public SOAPElement getParentElement() {
Node parentNode = getParentNode();
if (parentNode instanceof SOAPDocument) {
return null;
}
- return (SOAPElement) getSoapDocument().find(parentNode);
+ return (SOAPElement) soapDocument.find(parentNode);
}
protected String getSOAPNamespace() {
@@ -1167,6 +1310,7 @@
return soapNamespace;
}
+ @Override
public void detachNode() {
Node parent = getParentNode();
if (parent != null) {
@@ -1184,6 +1328,7 @@
}
}
+ @Override
public void recycleNode() {
detachNode();
// TBD
@@ -1260,10 +1405,12 @@
int attributeIndex = 0;
String currentName;
+ @Override
public boolean hasNext() {
return attributeIndex < attributesLength;
}
+ @Override
public Name next() {
if (!hasNext()) {
throw new NoSuchElementException();
@@ -1283,6 +1430,7 @@
}
}
+ @Override
public void remove() {
if (currentName == null) {
throw new IllegalStateException();
@@ -1331,13 +1479,14 @@
return attribute == null ? null : attribute.getValue();
}
- protected Iterator getChildElementsFrom(final Element element) {
- return new Iterator() {
+ protected Iterator getChildElementsFrom(final Element element) {
+ return new Iterator() {
Node next = element.getFirstChild();
Node nextNext = null;
Node last = null;
- Node soapElement = getSoapDocument().findIfPresent(element);
+ Node soapElement = soapDocument.findIfPresent(element);
+ @Override
public boolean hasNext() {
if (next != null) {
return true;
@@ -1349,7 +1498,8 @@
return next != null;
}
- public Node next() {
+ @Override
+ public javax.xml.soap.Node next() {
if (hasNext()) {
last = next;
next = null;
@@ -1362,11 +1512,12 @@
}
nextNext = last.getNextSibling();
- return getSoapDocument().findIfPresent(last);
+ return (javax.xml.soap.Node) soapDocument.findIfPresent(last);
}
throw new NoSuchElementException();
}
+ @Override
public void remove() {
if (last == null) {
throw new IllegalStateException();
@@ -1428,6 +1579,7 @@
//TODO: This is a temporary SAAJ workaround for optimizing XWS
// should be removed once the corresponding JAXP bug is fixed
// It appears the bug will be fixed in JAXP 1.4 (not by Appserver 9 timeframe)
+ @Override
public void setAttributeNS(
String namespaceURI,String qualifiedName, String value) {
int index = qualifiedName.indexOf(':');
@@ -1483,7 +1635,7 @@
@Override
public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
- return new NodeListImpl(getSoapDocument(), element.getElementsByTagNameNS(namespaceURI, localName));
+ return new NodeListImpl(soapDocument, element.getElementsByTagNameNS(namespaceURI, localName));
}
@Override
@@ -1538,37 +1690,37 @@
@Override
public Node getParentNode() {
- return getSoapDocument().find(element.getParentNode());
+ return soapDocument.find(element.getParentNode());
}
@Override
public NodeList getChildNodes() {
- return new NodeListImpl(getSoapDocument(), element.getChildNodes());
+ return new NodeListImpl(soapDocument, element.getChildNodes());
}
@Override
public Node getFirstChild() {
- return getSoapDocument().findIfPresent(element.getFirstChild());
+ return soapDocument.findIfPresent(element.getFirstChild());
}
@Override
public Node getLastChild() {
- return getSoapDocument().findIfPresent(element.getLastChild());
+ return soapDocument.findIfPresent(element.getLastChild());
}
@Override
public Node getPreviousSibling() {
- return getSoapDocument().findIfPresent(element.getPreviousSibling());
+ return soapDocument.findIfPresent(element.getPreviousSibling());
}
@Override
public Node getNextSibling() {
- return getSoapDocument().findIfPresent(element.getNextSibling());
+ return soapDocument.findIfPresent(element.getNextSibling());
}
@Override
public NamedNodeMap getAttributes() {
- return element.getAttributes();
+ return new NamedNodeMapImpl(element.getAttributes(), soapDocument);
}
public Element getDomElement() {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -100,6 +100,7 @@
protected abstract NameImpl getHeaderName(String prefix);
protected abstract NameImpl getBodyName(String prefix);
+ @Override
public SOAPHeader addHeader() throws SOAPException {
return addHeader(null);
}
@@ -140,6 +141,7 @@
header = hdr;
}
+ @Override
public SOAPHeader getHeader() throws SOAPException {
lookForHeader();
return header;
@@ -152,6 +154,7 @@
body = bodyChildElement;
}
+ @Override
public SOAPBody addBody() throws SOAPException {
return addBody(null);
}
@@ -176,6 +179,7 @@
return body;
}
+ @Override
protected SOAPElement addElement(Name name) throws SOAPException {
if (getBodyName(null).equals(name)) {
return addBody(name.getPrefix());
@@ -187,6 +191,7 @@
return super.addElement(name);
}
+ @Override
protected SOAPElement addElement(QName name) throws SOAPException {
if (getBodyName(null).equals(NameImpl.convertToName(name))) {
return addBody(name.getPrefix());
@@ -198,15 +203,18 @@
return super.addElement(name);
}
+ @Override
public SOAPBody getBody() throws SOAPException {
lookForBody();
return body;
}
+ @Override
public Source getContent() {
return new DOMSource(getOwnerDocument());
}
+ @Override
public Name createName(String localName, String prefix, String uri)
throws SOAPException {
@@ -241,6 +249,7 @@
return NameImpl.create(localName, prefix, namespace);
}
+ @Override
public Name createName(String localName) throws SOAPException {
return NameImpl.createFromUnqualifiedName(localName);
}
@@ -257,6 +266,7 @@
charset = value;
}
+ @Override
public void output(OutputStream out) throws IOException {
try {
// materializeBody();
@@ -301,6 +311,7 @@
/**
* Serialize to FI if boolean parameter set.
*/
+ @Override
public void output(OutputStream out, boolean isFastInfoset)
throws IOException
{
@@ -353,6 +364,7 @@
// }
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
log.log(Level.SEVERE,
"SAAJ0146.impl.invalid.name.change.requested",
@@ -389,6 +401,7 @@
final DOMStreamReader reader = new DOMStreamReader(this);
XMLStreamReaderToXMLStreamWriter writingBridge = new XMLStreamReaderToXMLStreamWriter();
writingBridge.bridge( new XMLStreamReaderToXMLStreamWriter.Breakpoint(reader, writer) {
+ @Override
public boolean proceedAfterStartElement() {
if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
return false;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -54,6 +54,7 @@
protected abstract boolean isStandardFaultElement();
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
log.log(Level.SEVERE,
"SAAJ0146.impl.invalid.name.change.requested",
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -30,6 +30,7 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import org.w3c.dom.Element;
public abstract class HeaderElementImpl
extends ElementImpl
@@ -47,6 +48,10 @@
super(ownerDoc, qname);
}
+ public HeaderElementImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
protected abstract NameImpl getActorAttributeName();
protected abstract NameImpl getRoleAttributeName();
protected abstract NameImpl getMustunderstandAttributeName();
@@ -58,6 +63,7 @@
protected abstract String getActorOrRole();
+ @Override
public void setParentElement(SOAPElement element) throws SOAPException {
if (!(element instanceof SOAPHeader)) {
log.severe("SAAJ0130.impl.header.elem.parent.mustbe.header");
@@ -67,6 +73,7 @@
super.setParentElement(element);
}
+ @Override
public void setActor(String actorUri) {
try {
removeAttribute(getActorAttributeName());
@@ -76,6 +83,7 @@
}
//SOAP 1.2 supports Role
+ @Override
public void setRole(String roleUri) throws SOAPException {
// runtime exception thrown if called for SOAP 1.1
removeAttribute(getRoleAttributeName());
@@ -85,6 +93,7 @@
Name actorAttNameWithoutNS = NameImpl.createFromTagName("actor");
+ @Override
public String getActor() {
String actor = getAttributeValue(getActorAttributeName());
return actor;
@@ -92,12 +101,14 @@
Name roleAttNameWithoutNS = NameImpl.createFromTagName("role");
+ @Override
public String getRole() {
// runtime exception thrown for 1.1
String role = getAttributeValue(getRoleAttributeName());
return role;
}
+ @Override
public void setMustUnderstand(boolean mustUnderstand) {
try {
removeAttribute(getMustunderstandAttributeName());
@@ -108,6 +119,7 @@
}
}
+ @Override
public boolean getMustUnderstand() {
String mu = getAttributeValue(getMustunderstandAttributeName());
@@ -117,6 +129,7 @@
return false;
}
+ @Override
public void setRelay(boolean relay) throws SOAPException {
// runtime exception thrown for 1.1
removeAttribute(getRelayAttributeName());
@@ -125,6 +138,7 @@
getRelayLiteralValue(relay));
}
+ @Override
public boolean getRelay() {
String mu = getAttributeValue(getRelayAttributeName());
if (mu != null)
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -25,19 +25,25 @@
package com.sun.xml.internal.messaging.saaj.soap.impl;
-import java.util.*;
import java.util.logging.Level;
import javax.xml.namespace.QName;
-import javax.xml.soap.*;
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
import org.w3c.dom.Element;
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
protected static final boolean MUST_UNDERSTAND_ONLY = false;
@@ -58,6 +64,7 @@
protected abstract NameImpl getUpgradeName();
protected abstract NameImpl getSupportedEnvelopeName();
+ @Override
public SOAPHeaderElement addHeaderElement(Name name) throws SOAPException {
SOAPElement newHeaderElement =
ElementFactory.createNamedElement(
@@ -81,6 +88,7 @@
return (SOAPHeaderElement) newHeaderElement;
}
+ @Override
public SOAPHeaderElement addHeaderElement(QName name) throws SOAPException {
SOAPElement newHeaderElement =
ElementFactory.createNamedElement(
@@ -104,19 +112,23 @@
return (SOAPHeaderElement) newHeaderElement;
}
+ @Override
protected SOAPElement addElement(Name name) throws SOAPException {
return addHeaderElement(name);
}
+ @Override
protected SOAPElement addElement(QName name) throws SOAPException {
return addHeaderElement(name);
}
- public Iterator examineHeaderElements(String actor) {
+ @Override
+ public Iterator examineHeaderElements(String actor) {
return getHeaderElementsForActor(actor, false, false);
}
- public Iterator extractHeaderElements(String actor) {
+ @Override
+ public Iterator extractHeaderElements(String actor) {
return getHeaderElementsForActor(actor, true, false);
}
@@ -135,9 +147,9 @@
String actor,
boolean detach,
boolean mustUnderstand) {
- List elementList = new ArrayList();
+ List elementList = new ArrayList<>();
- Iterator eachChild = getChildElements();
+ Iterator eachChild = getChildElements();
org.w3c.dom.Node currentChild = iterate(eachChild);
while (currentChild != null) {
@@ -181,6 +193,7 @@
return each.hasNext() ? each.next() : null;
}
+ @Override
public void setParentElement(SOAPElement element) throws SOAPException {
if (!(element instanceof SOAPEnvelope)) {
log.severe("SAAJ0133.impl.header.parent.mustbe.envelope");
@@ -193,6 +206,7 @@
// namespace qualified. Holds for both SOAP versions.
// TODO - This check needs to be made for other addChildElement() methods
// as well.
+ @Override
public SOAPElement addChildElement(String localName) throws SOAPException {
SOAPElement element = super.addChildElement(localName);
@@ -205,19 +219,23 @@
return element;
}
- public Iterator examineAllHeaderElements() {
+ @Override
+ public Iterator examineAllHeaderElements() {
return getHeaderElements(null, false, MUST_UNDERSTAND_ONLY);
}
- public Iterator examineMustUnderstandHeaderElements(String actor) {
+ @Override
+ public Iterator examineMustUnderstandHeaderElements(String actor) {
return getHeaderElements(actor, false, true);
}
- public Iterator extractAllHeaderElements() {
+ @Override
+ public Iterator extractAllHeaderElements() {
return getHeaderElements(null, true, false);
}
+ @Override
public SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSoapUris)
throws SOAPException {
if (supportedSoapUris == null) {
@@ -241,18 +259,19 @@
NameImpl.createFromUnqualifiedName("qname"),
ns + ":Envelope");
subElement.addNamespaceDeclaration(
- ns,
- (String) supportedSoapUris.next());
+ ns, (String) supportedSoapUris.next());
i ++;
}
return upgradeHeaderElement;
}
+ @Override
public SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri)
throws SOAPException {
return addUpgradeHeaderElement(new String[] {supportedSoapUri});
}
+ @Override
public SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris)
throws SOAPException {
@@ -280,6 +299,7 @@
return upgradeHeaderElement;
}
+ @Override
protected SOAPElement convertToSoapElement(Element element) {
final org.w3c.dom.Node soapNode = getSoapDocument().findIfPresent(element);
if (soapNode instanceof SOAPHeaderElement) {
@@ -298,6 +318,7 @@
}
}
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
log.log(Level.SEVERE,
"SAAJ0146.impl.invalid.name.change.requested",
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2013, 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
@@ -46,7 +46,7 @@
SAAJ0123.impl.no.reserved.xmlns=SAAJ0123: Cannot declare reserved xmlns prefix
SAAJ0124.impl.qualified.name.cannot.be.xmlns=SAAJ0124: Qualified name cannot be xmlns
#SAAJ0125.impl.URI.cannot.be.null=SAAJ0125: URI cannot be null
-SAAJ0126.impl.cannot.locate.ns=SAAJ0126: Unable to locate namespace for prefix {0}
+#SAAJ0126.impl.cannot.locate.ns=SAAJ0126: Unable to locate namespace for prefix {0}
SAAJ0127.impl.no.null.for.parent.elem=SAAJ0127: Cannot pass NULL to setParentElement
SAAJ0130.impl.header.elem.parent.mustbe.header=SAAJ0130: Parent of a SOAPHeaderElement has to be a SOAPHeader
@@ -60,7 +60,7 @@
SAAJ0142.impl.reason.or.text.not.supported=SAAJ0142: Fault/Reason/Text not supported by this SOAP version, try SOAP 1.2 or later
SAAJ0143.impl.node.not.supported=SAAJ0143: Fault/Node not supported by this SOAP version, try SOAP 1.2 or later
SAAJ0144.impl.role.not.supported=SAAJ0144: Fault/Role not supported by this SOAP version, try SOAP 1.2 or later
-SAAJ0145.impl.no.null.to.parent.elem=SAAJ0145: Cannot pass NULL to setParentElement
+#SAAJ0145.impl.no.null.to.parent.elem=SAAJ0145: Cannot pass NULL to setParentElement
SAAJ0146.impl.invalid.name.change.requested=SAAJ0146: Cannot change name of element {0} to {1}
SAAJ0147.impl.invalid.uri.change.requested=SAAJ0147: Cannot change the URI for prefix {0} from {1} to {2} in setElementQName
SAAJ0148.impl.invalid.prefix.for.uri=Non-empty namespace URI: {0} for an empty prefix in SetElementQName
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.messaging.saaj.soap.impl;
+
+import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * {@link NamedNodeMap} wrapper, finding SOAP elements automatically when possible.
+ *
+ * @author Roman Grigoriadi
+ */
+public class NamedNodeMapImpl implements NamedNodeMap {
+
+ private final NamedNodeMap namedNodeMap;
+
+ private final SOAPDocumentImpl soapDocument;
+
+ /**
+ * Create wrapper.
+ *
+ * @param namedNodeMap node map to wrap
+ * @param soapDocument soap document to find soap elements
+ */
+ public NamedNodeMapImpl(NamedNodeMap namedNodeMap, SOAPDocumentImpl soapDocument) {
+ this.namedNodeMap = namedNodeMap;
+ this.soapDocument = soapDocument;
+ }
+
+ @Override
+ public Node getNamedItem(String name) {
+ return soapDocument.findIfPresent(namedNodeMap.getNamedItem(name));
+ }
+
+ @Override
+ public Node setNamedItem(Node arg) throws DOMException {
+ return namedNodeMap.setNamedItem(arg);
+ }
+
+ @Override
+ public Node removeNamedItem(String name) throws DOMException {
+ return namedNodeMap.removeNamedItem(name);
+ }
+
+ @Override
+ public Node item(int index) {
+ return namedNodeMap.item(index);
+ }
+
+ @Override
+ public int getLength() {
+ return namedNodeMap.getLength();
+ }
+
+ @Override
+ public Node getNamedItemNS(String namespaceURI, String localName) throws DOMException {
+ return namedNodeMap.getNamedItemNS(namespaceURI, localName);
+ }
+
+ @Override
+ public Node setNamedItemNS(Node arg) throws DOMException {
+ return namedNodeMap.setNamedItemNS(arg);
+ }
+
+ @Override
+ public Node removeNamedItemNS(String namespaceURI, String localName) throws DOMException {
+ return namedNodeMap.removeNamedItemNS(namespaceURI, localName);
+ }
+}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -25,327 +25,64 @@
package com.sun.xml.internal.messaging.saaj.soap.impl;
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
+import org.w3c.dom.CharacterData;
import org.w3c.dom.Comment;
import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
-import org.w3c.dom.UserDataHandler;
-
-public class SOAPCommentImpl
- implements javax.xml.soap.Text, org.w3c.dom.Comment {
-
- protected static final Logger log =
- Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
- "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
- protected static ResourceBundle rb =
- log.getResourceBundle();
-
- @Override
- public String getData() throws DOMException {
- return comment.getData();
- }
-
- @Override
- public void setData(String data) throws DOMException {
- comment.setData(data);
- }
-
- @Override
- public int getLength() {
- return comment.getLength();
- }
+import static com.sun.xml.internal.messaging.saaj.soap.impl.TextImpl.log;
- @Override
- public String substringData(int offset, int count) throws DOMException {
- return comment.substringData(offset, count);
- }
-
- @Override
- public void appendData(String arg) throws DOMException {
- comment.appendData(arg);
- }
-
- @Override
- public void insertData(int offset, String arg) throws DOMException {
- comment.insertData(offset, arg);
- }
+public class SOAPCommentImpl extends TextImpl implements Comment {
- @Override
- public void deleteData(int offset, int count) throws DOMException {
- comment.deleteData(offset, count);
- }
-
- @Override
- public void replaceData(int offset, int count, String arg) throws DOMException {
- comment.replaceData(offset, count, arg);
- }
-
- @Override
- public String getNodeName() {
- return comment.getNodeName();
- }
-
- @Override
- public String getNodeValue() throws DOMException {
- return comment.getNodeValue();
+ public SOAPCommentImpl(SOAPDocumentImpl ownerDoc, String text) {
+ super(ownerDoc, text);
}
- @Override
- public void setNodeValue(String nodeValue) throws DOMException {
- comment.setNodeValue(nodeValue);
- }
-
- @Override
- public short getNodeType() {
- return comment.getNodeType();
- }
-
- @Override
- public Node getParentNode() {
- return comment.getParentNode();
- }
-
- @Override
- public NodeList getChildNodes() {
- return comment.getChildNodes();
- }
-
- @Override
- public Node getFirstChild() {
- return comment.getFirstChild();
- }
-
- @Override
- public Node getLastChild() {
- return comment.getLastChild();
- }
-
- @Override
- public Node getPreviousSibling() {
- return comment.getPreviousSibling();
- }
-
- @Override
- public Node getNextSibling() {
- return comment.getNextSibling();
- }
-
- @Override
- public NamedNodeMap getAttributes() {
- return comment.getAttributes();
- }
-
- @Override
- public Document getOwnerDocument() {
- return comment.getOwnerDocument();
- }
-
- @Override
- public Node insertBefore(Node newChild, Node refChild) throws DOMException {
- return comment.insertBefore(newChild, refChild);
- }
-
- @Override
- public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
- return comment.replaceChild(newChild, oldChild);
- }
-
- @Override
- public Node removeChild(Node oldChild) throws DOMException {
- return comment.removeChild(oldChild);
+ public SOAPCommentImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+ super(ownerDoc, data);
}
@Override
- public Node appendChild(Node newChild) throws DOMException {
- return comment.appendChild(newChild);
- }
-
- @Override
- public boolean hasChildNodes() {
- return comment.hasChildNodes();
- }
-
- @Override
- public Node cloneNode(boolean deep) {
- return comment.cloneNode(deep);
- }
-
- @Override
- public void normalize() {
- comment.normalize();
- }
-
- @Override
- public boolean isSupported(String feature, String version) {
- return comment.isSupported(feature, version);
- }
-
- @Override
- public String getNamespaceURI() {
- return comment.getNamespaceURI();
- }
-
- @Override
- public String getPrefix() {
- return comment.getPrefix();
- }
-
- @Override
- public void setPrefix(String prefix) throws DOMException {
- comment.setPrefix(prefix);
- }
-
- @Override
- public String getLocalName() {
- return comment.getLocalName();
- }
-
- @Override
- public boolean hasAttributes() {
- return comment.hasAttributes();
- }
-
- @Override
- public String getBaseURI() {
- return comment.getBaseURI();
- }
-
- @Override
- public short compareDocumentPosition(Node other) throws DOMException {
- return comment.compareDocumentPosition(other);
- }
-
- @Override
- public String getTextContent() throws DOMException {
- return comment.getTextContent();
- }
-
- @Override
- public void setTextContent(String textContent) throws DOMException {
- comment.setTextContent(textContent);
- }
-
- @Override
- public boolean isSameNode(Node other) {
- return comment.isSameNode(other);
+ protected Comment createN(SOAPDocumentImpl ownerDoc, String text) {
+ Comment c = ownerDoc.getDomDocument().createComment(text);
+// ownerDoc.register(this);
+ return c;
}
@Override
- public String lookupPrefix(String namespaceURI) {
- return comment.lookupPrefix(namespaceURI);
- }
-
- @Override
- public boolean isDefaultNamespace(String namespaceURI) {
- return comment.isDefaultNamespace(namespaceURI);
- }
-
- @Override
- public String lookupNamespaceURI(String prefix) {
- return comment.lookupNamespaceURI(prefix);
- }
-
- @Override
- public boolean isEqualNode(Node arg) {
- return comment.isEqualNode(arg);
- }
-
- @Override
- public Object getFeature(String feature, String version) {
- return comment.getFeature(feature, version);
- }
-
- @Override
- public Object setUserData(String key, Object data, UserDataHandler handler) {
- return comment.setUserData(key, data, handler);
+ protected Comment createN(SOAPDocumentImpl ownerDoc, CharacterData data) {
+ Comment c = (Comment) data;
+ return c;
}
@Override
- public Object getUserData(String key) {
- return comment.getUserData(key);
- }
-
- private Comment comment;
-
- public SOAPCommentImpl(SOAPDocumentImpl ownerDoc, String text) {
- comment = ownerDoc.getDomDocument().createComment(text);
- ownerDoc.register(this);
- }
-
- public String getValue() {
- String nodeValue = getNodeValue();
- return (nodeValue.equals("") ? null : nodeValue);
- }
-
- public void setValue(String text) {
- setNodeValue(text);
- }
-
-
- public void setParentElement(SOAPElement element) throws SOAPException {
- if (element == null) {
- log.severe("SAAJ0112.impl.no.null.to.parent.elem");
- throw new SOAPException("Cannot pass NULL to setParentElement");
- }
- ((ElementImpl) element).addNode(this);
- }
-
- public SOAPElement getParentElement() {
- return (SOAPElement) getParentNode();
- }
-
- public void detachNode() {
- org.w3c.dom.Node parent = getParentNode();
- if (parent != null) {
- parent.removeChild(this);
- }
- }
-
- public void recycleNode() {
- detachNode();
- // TBD
- // - add this to the factory so subsequent
- // creations can reuse this object.
- }
-
public boolean isComment() {
return true;
}
+ @Override
public Text splitText(int offset) throws DOMException {
log.severe("SAAJ0113.impl.cannot.split.text.from.comment");
throw new UnsupportedOperationException("Cannot split text from a Comment Node.");
}
+ @Override
public Text replaceWholeText(String content) throws DOMException {
log.severe("SAAJ0114.impl.cannot.replace.wholetext.from.comment");
throw new UnsupportedOperationException("Cannot replace Whole Text from a Comment Node.");
}
+ @Override
public String getWholeText() {
//TODO: maybe we have to implement this in future.
throw new UnsupportedOperationException("Not Supported");
}
+ @Override
public boolean isElementContentWhitespace() {
//TODO: maybe we have to implement this in future.
throw new UnsupportedOperationException("Not Supported");
}
- public Comment getDomElement() {
- return comment;
- }
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -25,316 +25,55 @@
package com.sun.xml.internal.messaging.saaj.soap.impl;
-import java.util.logging.Logger;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import org.w3c.dom.CharacterData;
import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.w3c.dom.UserDataHandler;
+
+public class SOAPTextImpl extends TextImpl implements Text {
+
+ public SOAPTextImpl(SOAPDocumentImpl ownerDoc, String text) {
+ super(ownerDoc, text);
+ }
+
+ public SOAPTextImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+ super(ownerDoc, data);
+ }
-public class SOAPTextImpl
- implements javax.xml.soap.Text, org.w3c.dom.Text {
+ @Override
+ protected Text createN(SOAPDocumentImpl ownerDoc, String text) {
+ Text t = ownerDoc.getDomDocument().createTextNode(text);
+// ownerDoc.register(this);
+ return t;
+ }
+
+ @Override
+ protected Text createN(SOAPDocumentImpl ownerDoc, CharacterData data) {
+ Text t = (Text) data;
+ return t;
+ }
@Override
public Text splitText(int offset) throws DOMException {
- return textNode.splitText(offset);
+ return getDomElement().splitText(offset);
}
@Override
public boolean isElementContentWhitespace() {
- return textNode.isElementContentWhitespace();
+ return getDomElement().isElementContentWhitespace();
}
@Override
public String getWholeText() {
- return textNode.getWholeText();
+ return getDomElement().getWholeText();
}
@Override
public Text replaceWholeText(String content) throws DOMException {
- return textNode.replaceWholeText(content);
- }
-
- @Override
- public String getData() throws DOMException {
- return textNode.getData();
- }
-
- @Override
- public void setData(String data) throws DOMException {
- textNode.setData(data);
- }
-
- @Override
- public int getLength() {
- return textNode.getLength();
- }
-
- @Override
- public String substringData(int offset, int count) throws DOMException {
- return textNode.substringData(offset, count);
- }
-
- @Override
- public void appendData(String arg) throws DOMException {
- textNode.appendData(arg);
- }
-
- @Override
- public void insertData(int offset, String arg) throws DOMException {
- textNode.insertData(offset, arg);
- }
-
- @Override
- public void deleteData(int offset, int count) throws DOMException {
- textNode.deleteData(offset, count);
- }
-
- @Override
- public void replaceData(int offset, int count, String arg) throws DOMException {
- textNode.replaceData(offset, count, arg);
- }
-
- @Override
- public String getNodeName() {
- return textNode.getNodeName();
- }
-
- @Override
- public String getNodeValue() throws DOMException {
- return textNode.getNodeValue();
- }
-
- @Override
- public void setNodeValue(String nodeValue) throws DOMException {
- textNode.setNodeValue(nodeValue);
- }
-
- @Override
- public short getNodeType() {
- return textNode.getNodeType();
- }
-
- @Override
- public Node getParentNode() {
- return textNode.getParentNode();
- }
-
- @Override
- public NodeList getChildNodes() {
- return textNode.getChildNodes();
- }
-
- @Override
- public Node getFirstChild() {
- return textNode.getFirstChild();
- }
-
- @Override
- public Node getLastChild() {
- return textNode.getLastChild();
- }
-
- @Override
- public Node getPreviousSibling() {
- return textNode.getPreviousSibling();
- }
-
- @Override
- public Node getNextSibling() {
- return textNode.getNextSibling();
- }
-
- @Override
- public NamedNodeMap getAttributes() {
- return textNode.getAttributes();
- }
-
- @Override
- public Document getOwnerDocument() {
- return textNode.getOwnerDocument();
- }
-
- @Override
- public Node insertBefore(Node newChild, Node refChild) throws DOMException {
- return textNode.insertBefore(newChild, refChild);
- }
-
- @Override
- public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
- return textNode.replaceChild(newChild, oldChild);
- }
-
- @Override
- public Node removeChild(Node oldChild) throws DOMException {
- return textNode.removeChild(oldChild);
- }
-
- @Override
- public Node appendChild(Node newChild) throws DOMException {
- return textNode.appendChild(newChild);
- }
-
- @Override
- public boolean hasChildNodes() {
- return textNode.hasChildNodes();
- }
-
- @Override
- public Node cloneNode(boolean deep) {
- return textNode.cloneNode(deep);
+ return getDomElement().replaceWholeText(content);
}
@Override
- public void normalize() {
- textNode.normalize();
- }
-
- @Override
- public boolean isSupported(String feature, String version) {
- return textNode.isSupported(feature, version);
- }
-
- @Override
- public String getNamespaceURI() {
- return textNode.getNamespaceURI();
- }
-
- @Override
- public String getPrefix() {
- return textNode.getPrefix();
- }
-
- @Override
- public void setPrefix(String prefix) throws DOMException {
- textNode.setPrefix(prefix);
- }
-
- @Override
- public String getLocalName() {
- return textNode.getLocalName();
- }
-
- @Override
- public boolean hasAttributes() {
- return textNode.hasAttributes();
- }
-
- @Override
- public String getBaseURI() {
- return textNode.getBaseURI();
- }
-
- @Override
- public short compareDocumentPosition(Node other) throws DOMException {
- return textNode.compareDocumentPosition(other);
- }
-
- @Override
- public String getTextContent() throws DOMException {
- return textNode.getTextContent();
- }
-
- @Override
- public void setTextContent(String textContent) throws DOMException {
- textNode.setTextContent(textContent);
- }
-
- @Override
- public boolean isSameNode(Node other) {
- return textNode.isSameNode(other);
- }
-
- @Override
- public String lookupPrefix(String namespaceURI) {
- return textNode.lookupPrefix(namespaceURI);
- }
-
- @Override
- public boolean isDefaultNamespace(String namespaceURI) {
- return textNode.isDefaultNamespace(namespaceURI);
- }
-
- @Override
- public String lookupNamespaceURI(String prefix) {
- return textNode.lookupNamespaceURI(prefix);
- }
-
- @Override
- public boolean isEqualNode(Node arg) {
- return textNode.isEqualNode(arg);
- }
-
- @Override
- public Object getFeature(String feature, String version) {
- return textNode.getFeature(feature, version);
- }
-
- @Override
- public Object setUserData(String key, Object data, UserDataHandler handler) {
- return textNode.setUserData(key, data, handler);
- }
-
- @Override
- public Object getUserData(String key) {
- return textNode.getUserData(key);
- }
-
- protected static final Logger log =
- Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
- "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
-
- private Text textNode;
-
- public SOAPTextImpl(SOAPDocumentImpl ownerDoc, String text) {
- textNode = ownerDoc.getDomDocument().createTextNode(text);
- ownerDoc.register(this);
- }
-
- public String getValue() {
- String nodeValue = getNodeValue();
- return (nodeValue.equals("") ? null : nodeValue);
- }
-
- public void setValue(String text) {
- setNodeValue(text);
- }
-
- public void setParentElement(SOAPElement parent) throws SOAPException {
- if (parent == null) {
- log.severe("SAAJ0126.impl.cannot.locate.ns");
- throw new SOAPException("Cannot pass NULL to setParentElement");
- }
- ((ElementImpl) parent).addNode(this);
- }
-
- public SOAPElement getParentElement() {
- return (SOAPElement) getParentNode();
- }
-
-
- public void detachNode() {
- org.w3c.dom.Node parent = getParentNode();
- if (parent != null) {
- parent.removeChild(getDomElement());
- }
- }
-
- public void recycleNode() {
- detachNode();
- // TBD
- // - add this to the factory so subsequent
- // creations can reuse this object.
- }
-
public boolean isComment() {
String txt = getNodeValue();
if (txt == null) {
@@ -343,7 +82,4 @@
return txt.startsWith("");
}
- public Text getDomElement() {
- return textNode;
- }
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,342 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.messaging.saaj.soap.impl;
+
+import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import java.util.logging.Logger;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.Text;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
+
+/**
+ *
+ * @author lukas
+ * @param
+ */
+public abstract class TextImpl implements Text, CharacterData {
+
+ protected static final Logger log
+ = Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
+ "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
+ private final T domNode;
+
+ private final SOAPDocumentImpl soapDocument;
+
+ protected TextImpl(SOAPDocumentImpl ownerDoc, String text) {
+ this.soapDocument = ownerDoc;
+ domNode = createN(ownerDoc, text);
+ ownerDoc.register(this);
+ }
+
+ protected TextImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+ this.soapDocument = ownerDoc;
+ domNode = createN(ownerDoc, data);
+ ownerDoc.register(this);
+ }
+
+ protected abstract T createN(SOAPDocumentImpl ownerDoc, CharacterData data);
+
+ protected abstract T createN(SOAPDocumentImpl ownerDoc, String text);
+
+ public T getDomElement() {
+ return domNode;
+ }
+
+ @Override
+ public String getValue() {
+ String nodeValue = getNodeValue();
+ return (nodeValue.equals("") ? null : nodeValue);
+ }
+
+ @Override
+ public void setValue(String text) {
+ setNodeValue(text);
+ }
+
+ @Override
+ public void setParentElement(SOAPElement parent) throws SOAPException {
+ if (parent == null) {
+ log.severe("SAAJ0112.impl.no.null.to.parent.elem");
+ throw new SOAPException("Cannot pass NULL to setParentElement");
+ }
+ ((ElementImpl) parent).addNode(this);
+ }
+
+ @Override
+ public SOAPElement getParentElement() {
+ return (SOAPElement) getParentNode();
+ }
+
+ @Override
+ public void detachNode() {
+ org.w3c.dom.Node parent = getParentNode();
+ if (parent != null) {
+ parent.removeChild(getDomElement());
+ }
+ }
+
+ @Override
+ public void recycleNode() {
+ detachNode();
+ // TBD
+ // - add this to the factory so subsequent
+ // creations can reuse this object.
+ }
+
+ @Override
+ public String getNodeName() {
+ return domNode.getNodeName();
+ }
+
+ @Override
+ public String getNodeValue() throws DOMException {
+ return domNode.getNodeValue();
+ }
+
+ @Override
+ public void setNodeValue(String nodeValue) throws DOMException {
+ domNode.setNodeValue(nodeValue);
+ }
+
+ @Override
+ public short getNodeType() {
+ return domNode.getNodeType();
+ }
+
+ @Override
+ public Node getParentNode() {
+ return domNode.getParentNode();
+ }
+
+ @Override
+ public NodeList getChildNodes() {
+ return domNode.getChildNodes();
+ }
+
+ @Override
+ public Node getFirstChild() {
+ return domNode.getFirstChild();
+ }
+
+ @Override
+ public Node getLastChild() {
+ return domNode.getLastChild();
+ }
+
+ @Override
+ public Node getPreviousSibling() {
+ return domNode.getPreviousSibling();
+ }
+
+ @Override
+ public Node getNextSibling() {
+ return domNode.getNextSibling();
+ }
+
+ @Override
+ public NamedNodeMap getAttributes() {
+ return domNode.getAttributes();
+ }
+
+ @Override
+ public Document getOwnerDocument() {
+ return domNode.getOwnerDocument();
+ }
+
+ @Override
+ public Node insertBefore(Node newChild, Node refChild) throws DOMException {
+ return domNode.insertBefore(newChild, refChild);
+ }
+
+ @Override
+ public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
+ return domNode.replaceChild(newChild, oldChild);
+ }
+
+ @Override
+ public Node removeChild(Node oldChild) throws DOMException {
+ return domNode.removeChild(oldChild);
+ }
+
+ @Override
+ public Node appendChild(Node newChild) throws DOMException {
+ return domNode.appendChild(newChild);
+ }
+
+ @Override
+ public boolean hasChildNodes() {
+ return domNode.hasChildNodes();
+ }
+
+ @Override
+ public Node cloneNode(boolean deep) {
+ return domNode.cloneNode(deep);
+ }
+
+ @Override
+ public void normalize() {
+ domNode.normalize();
+ }
+
+ @Override
+ public boolean isSupported(String feature, String version) {
+ return domNode.isSupported(feature, version);
+ }
+
+ @Override
+ public String getNamespaceURI() {
+ return domNode.getNamespaceURI();
+ }
+
+ @Override
+ public String getPrefix() {
+ return domNode.getPrefix();
+ }
+
+ @Override
+ public void setPrefix(String prefix) throws DOMException {
+ domNode.setPrefix(prefix);
+ }
+
+ @Override
+ public String getLocalName() {
+ return domNode.getLocalName();
+ }
+
+ @Override
+ public boolean hasAttributes() {
+ return domNode.hasAttributes();
+ }
+
+ @Override
+ public String getBaseURI() {
+ return domNode.getBaseURI();
+ }
+
+ @Override
+ public short compareDocumentPosition(Node other) throws DOMException {
+ return domNode.compareDocumentPosition(other);
+ }
+
+ @Override
+ public String getTextContent() throws DOMException {
+ return domNode.getTextContent();
+ }
+
+ @Override
+ public void setTextContent(String textContent) throws DOMException {
+ domNode.setTextContent(textContent);;
+ }
+
+ @Override
+ public boolean isSameNode(Node other) {
+ return domNode.isSameNode(other);
+ }
+
+ @Override
+ public String lookupPrefix(String namespaceURI) {
+ return domNode.lookupPrefix(namespaceURI);
+ }
+
+ @Override
+ public boolean isDefaultNamespace(String namespaceURI) {
+ return domNode.isDefaultNamespace(namespaceURI);
+ }
+
+ @Override
+ public String lookupNamespaceURI(String prefix) {
+ return domNode.lookupNamespaceURI(prefix);
+ }
+
+ @Override
+ public boolean isEqualNode(Node arg) {
+ return domNode.isEqualNode(arg);
+ }
+
+ @Override
+ public Object getFeature(String feature, String version) {
+ return domNode.getFeature(feature, version);
+ }
+
+ @Override
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ return domNode.setUserData(key, data, handler);
+ }
+
+ @Override
+ public Object getUserData(String key) {
+ return domNode.getUserData(key);
+ }
+
+ @Override
+ public String getData() throws DOMException {
+ return domNode.getData();
+ }
+
+ @Override
+ public void setData(String data) throws DOMException {
+ domNode.setData(data);
+ }
+
+ @Override
+ public int getLength() {
+ return domNode.getLength();
+ }
+
+ @Override
+ public String substringData(int offset, int count) throws DOMException {
+ return domNode.substringData(offset, count);
+ }
+
+ @Override
+ public void appendData(String arg) throws DOMException {
+ domNode.appendData(arg);
+ }
+
+ @Override
+ public void insertData(int offset, String arg) throws DOMException {
+ domNode.insertData(offset, arg);
+ }
+
+ @Override
+ public void deleteData(int offset, int count) throws DOMException {
+ domNode.deleteData(offset, count);
+ }
+
+ @Override
+ public void replaceData(int offset, int count, String arg) throws DOMException {
+ domNode.replaceData(offset, count, arg);
+ }
+
+}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -54,32 +54,38 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
protected NameImpl getFaultName(String name) {
// Ignore name
return NameImpl.createFault1_1Name(null);
}
+ @Override
protected SOAPBodyElement createBodyElement(Name name) {
return new BodyElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
name);
}
+ @Override
protected SOAPBodyElement createBodyElement(QName name) {
return new BodyElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
name);
}
+ @Override
protected QName getDefaultFaultCode() {
return new QName(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, "Server");
}
+ @Override
protected boolean isFault(SOAPElement child) {
// SOAP 1.1 faults always use the default name
return child.getElementName().equals(getFaultName(null));
}
+ @Override
protected SOAPFault createFaultElement() {
return new Fault1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(), getPrefix());
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -36,6 +36,7 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.BodyElementImpl;
+import org.w3c.dom.Element;
public class BodyElement1_1Impl extends BodyElementImpl {
@@ -45,6 +46,12 @@
public BodyElement1_1Impl(SOAPDocumentImpl ownerDoc, QName qname) {
super(ownerDoc, qname);
}
+
+ public BodyElement1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
BodyElementImpl copy =
new BodyElement1_1Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -51,11 +51,13 @@
super(ownerDoc, domElement);
}
+ @Override
protected DetailEntry createDetailEntry(Name name) {
return new DetailEntry1_1Impl(
(SOAPDocumentImpl) getOwnerDocument(),
name);
}
+ @Override
protected DetailEntry createDetailEntry(QName name) {
return new DetailEntry1_1Impl(
(SOAPDocumentImpl) getOwnerDocument(),
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -36,6 +36,7 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.DetailEntryImpl;
+import org.w3c.dom.Element;
public class DetailEntry1_1Impl extends DetailEntryImpl {
@@ -45,6 +46,12 @@
public DetailEntry1_1Impl(SOAPDocumentImpl ownerDoc, QName qname) {
super(ownerDoc, qname);
}
+
+ public DetailEntry1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
DetailEntryImpl copy =
new DetailEntry1_1Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -58,10 +58,12 @@
super(ownerDoc, domElement);
}
+ @Override
protected NameImpl getBodyName(String prefix) {
return NameImpl.createBody1_1Name(prefix);
}
+ @Override
protected NameImpl getHeaderName(String prefix) {
return NameImpl.createHeader1_1Name(prefix);
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -60,37 +60,48 @@
super(ownerDocument, NameImpl.createFault1_1Name(prefix));
}
- public Fault1_1Impl(Element domElement, SOAPDocumentImpl ownerDoc) {
+ public Fault1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
super(ownerDoc, domElement);
}
+ public Fault1_1Impl(SOAPDocumentImpl ownerDoc) {
+ super(ownerDoc, NameImpl.createFault1_1Name(null));
+ }
+
+ @Override
protected NameImpl getDetailName() {
return NameImpl.createDetail1_1Name();
}
+ @Override
protected NameImpl getFaultCodeName() {
return NameImpl.createFromUnqualifiedName("faultcode");
}
+ @Override
protected NameImpl getFaultStringName() {
return NameImpl.createFromUnqualifiedName("faultstring");
}
+ @Override
protected NameImpl getFaultActorName() {
return NameImpl.createFromUnqualifiedName("faultactor");
}
+ @Override
protected DetailImpl createDetail() {
return new Detail1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument());
}
+ @Override
protected FaultElementImpl createSOAPFaultElement(String localName) {
return new FaultElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
localName);
}
+ @Override
protected void checkIfStandardFaultCode(String faultCode, String uri)
throws SOAPException {
// SOAP 1.1 doesn't seem to mandate using faultcode from a particular
@@ -98,16 +109,19 @@
// Also need to be backward compatible.
}
+ @Override
protected void finallySetFaultCode(String faultcode) throws SOAPException {
this.faultCodeElement.addTextNode(faultcode);
}
+ @Override
public String getFaultCode() {
if (this.faultCodeElement == null)
findFaultCodeElement();
return this.faultCodeElement.getValue();
}
+ @Override
public Name getFaultCodeAsName() {
String faultcodeString = getFaultCode();
@@ -132,6 +146,7 @@
return NameImpl.createFromQualifiedName(faultcodeString, nsName);
}
+ @Override
public QName getFaultCodeAsQName() {
String faultcodeString = getFaultCode();
if (faultcodeString == null) {
@@ -142,6 +157,7 @@
return convertCodeToQName(faultcodeString, this.faultCodeElement);
}
+ @Override
public void setFaultString(String faultString) throws SOAPException {
if (this.faultStringElement == null)
@@ -158,6 +174,7 @@
this.faultStringElement.addTextNode(faultString);
}
+ @Override
public String getFaultString() {
if (this.faultStringElement == null)
findFaultStringElement();
@@ -165,6 +182,7 @@
}
+ @Override
public Locale getFaultStringLocale() {
if (this.faultStringElement == null)
findFaultStringElement();
@@ -178,6 +196,7 @@
return null;
}
+ @Override
public void setFaultString(String faultString, Locale locale)
throws SOAPException {
setFaultString(faultString);
@@ -186,6 +205,7 @@
localeToXmlLang(locale));
}
+ @Override
protected boolean isStandardFaultElement(String localName) {
if (localName.equalsIgnoreCase("detail") ||
localName.equalsIgnoreCase("faultcode") ||
@@ -196,6 +216,7 @@
return false;
}
+ @Override
public void appendFaultSubcode(QName subcode) {
log.log(
Level.SEVERE,
@@ -204,6 +225,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public void removeAllFaultSubcodes() {
log.log(
Level.SEVERE,
@@ -212,7 +234,8 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
- public Iterator getFaultSubcodes() {
+ @Override
+ public Iterator getFaultSubcodes() {
log.log(
Level.SEVERE,
"SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1",
@@ -220,6 +243,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public String getFaultReasonText(Locale locale) {
log.log(
Level.SEVERE,
@@ -228,7 +252,8 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
- public Iterator getFaultReasonTexts() {
+ @Override
+ public Iterator getFaultReasonTexts() {
log.log(
Level.SEVERE,
"SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1",
@@ -236,7 +261,8 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
- public Iterator getFaultReasonLocales() {
+ @Override
+ public Iterator getFaultReasonLocales() {
log.log(
Level.SEVERE,
"SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1",
@@ -244,6 +270,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public void addFaultReasonText(String text, java.util.Locale locale)
throws SOAPException {
log.log(
@@ -253,6 +280,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public String getFaultRole() {
log.log(
Level.SEVERE,
@@ -261,6 +289,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public void setFaultRole(String uri) {
log.log(
Level.SEVERE,
@@ -269,6 +298,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public String getFaultNode() {
log.log(
Level.SEVERE,
@@ -277,6 +307,7 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
public void setFaultNode(String uri) {
log.log(
Level.SEVERE,
@@ -285,10 +316,12 @@
throw new UnsupportedOperationException("Not supported in SOAP 1.1");
}
+ @Override
protected QName getDefaultFaultCode() {
return new QName(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, "Server");
}
+ @Override
public SOAPElement addChildElement(SOAPElement element)
throws SOAPException {
String localName = element.getLocalName();
@@ -301,18 +334,21 @@
return super.addChildElement(element);
}
+ @Override
protected FaultElementImpl createSOAPFaultElement(QName qname) {
return new FaultElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
qname);
}
+ @Override
protected FaultElementImpl createSOAPFaultElement(Name qname) {
return new FaultElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
(NameImpl)qname);
}
+ @Override
public void setFaultCode(String faultCode, String prefix, String uri)
throws SOAPException {
if (prefix == null || "".equals(prefix)) {
@@ -370,6 +406,7 @@
return false;
}
+ @Override
public void setFaultActor(String faultActor) throws SOAPException {
if (this.faultActorElement == null)
findFaultActorElement();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -59,6 +59,7 @@
NameImpl.createFaultElement1_1Name(localName, prefix));
}
+ @Override
protected boolean isStandardFaultElement() {
String localName = elementQName.getLocalPart();
if (localName.equalsIgnoreCase("faultcode") ||
@@ -69,6 +70,7 @@
return false;
}
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
if (!isStandardFaultElement()) {
FaultElement1_1Impl copy =
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -56,6 +56,7 @@
super(ownerDoc, domElement);
}
+ @Override
protected NameImpl getNotUnderstoodName() {
log.log(
Level.SEVERE,
@@ -64,6 +65,7 @@
throw new UnsupportedOperationException("Not supported by SOAP 1.1");
}
+ @Override
protected NameImpl getUpgradeName() {
return NameImpl.create(
"Upgrade",
@@ -71,6 +73,7 @@
SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE);
}
+ @Override
protected NameImpl getSupportedEnvelopeName() {
return NameImpl.create(
"SupportedEnvelope",
@@ -78,6 +81,7 @@
SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE);
}
+ @Override
public SOAPHeaderElement addNotUnderstoodHeaderElement(QName name)
throws SOAPException {
log.log(
@@ -87,11 +91,13 @@
throw new UnsupportedOperationException("Not supported by SOAP 1.1");
}
+ @Override
protected SOAPHeaderElement createHeaderElement(Name name) {
return new HeaderElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
name);
}
+ @Override
protected SOAPHeaderElement createHeaderElement(QName name) {
return new HeaderElement1_1Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -41,6 +41,7 @@
import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderElementImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import org.w3c.dom.Element;
public class HeaderElement1_1Impl extends HeaderElementImpl {
@@ -55,17 +56,24 @@
super(ownerDoc, qname);
}
+ public HeaderElement1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
HeaderElementImpl copy =
new HeaderElement1_1Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
return replaceElementWithSOAPElement(this,copy);
}
+ @Override
protected NameImpl getActorAttributeName() {
return NameImpl.create("actor", null, NameImpl.SOAP11_NAMESPACE);
}
// role not supported by SOAP 1.1
+ @Override
protected NameImpl getRoleAttributeName() {
log.log(
Level.SEVERE,
@@ -74,15 +82,18 @@
throw new UnsupportedOperationException("Role not supported by SOAP 1.1");
}
+ @Override
protected NameImpl getMustunderstandAttributeName() {
return NameImpl.create("mustUnderstand", null, NameImpl.SOAP11_NAMESPACE);
}
// mustUnderstand attribute has literal value "1" or "0"
+ @Override
protected String getMustunderstandLiteralValue(boolean mustUnderstand) {
return (mustUnderstand == true ? "1" : "0");
}
+ @Override
protected boolean getMustunderstandAttributeValue(String mu) {
if ("1".equals(mu) || "true".equalsIgnoreCase(mu))
return true;
@@ -90,6 +101,7 @@
}
// relay not supported by SOAP 1.1
+ @Override
protected NameImpl getRelayAttributeName() {
log.log(
Level.SEVERE,
@@ -98,6 +110,7 @@
throw new UnsupportedOperationException("Relay not supported by SOAP 1.1");
}
+ @Override
protected String getRelayLiteralValue(boolean relayAttr) {
log.log(
Level.SEVERE,
@@ -106,6 +119,7 @@
throw new UnsupportedOperationException("Relay not supported by SOAP 1.1");
}
+ @Override
protected boolean getRelayAttributeValue(String mu) {
log.log(
Level.SEVERE,
@@ -114,6 +128,7 @@
throw new UnsupportedOperationException("Relay not supported by SOAP 1.1");
}
+ @Override
protected String getActorOrRole() {
return getActor();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -76,6 +76,7 @@
super(headers,ct,stat,reader);
}
+ @Override
public SOAPPart getSOAPPart() {
if (soapPartImpl == null) {
soapPartImpl = new SOAPPart1_1Impl(this);
@@ -83,10 +84,12 @@
return soapPartImpl;
}
+ @Override
protected boolean isCorrectSoapVersion(int contentTypeId) {
return (contentTypeId & SOAP1_1_FLAG) != 0;
}
+ @Override
public String getAction() {
log.log(
Level.SEVERE,
@@ -95,6 +98,7 @@
throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
}
+ @Override
public void setAction(String type) {
log.log(
Level.SEVERE,
@@ -103,6 +107,7 @@
throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
}
+ @Override
public String getCharset() {
log.log(
Level.SEVERE,
@@ -111,6 +116,7 @@
throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
}
+ @Override
public void setCharset(String charset) {
log.log(
Level.SEVERE,
@@ -119,10 +125,12 @@
throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
}
+ @Override
protected String getExpectedContentType() {
return isFastInfoset ? "application/fastinfoset" : "text/xml";
}
+ @Override
protected String getExpectedAcceptHeader() {
String accept = "text/xml, text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
return acceptFastInfoset ? ("application/fastinfoset, " + accept) : accept;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -39,14 +39,17 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPFactoryImpl;
public class SOAPFactory1_1Impl extends SOAPFactoryImpl {
+ @Override
protected SOAPDocumentImpl createDocument() {
return (new SOAPPart1_1Impl()).getDocument();
}
+ @Override
public Detail createDetail() throws SOAPException {
return new Detail1_1Impl(createDocument());
}
+ @Override
public SOAPFault createFault(String reasonText, QName faultCode)
throws SOAPException {
if (faultCode == null) {
@@ -55,14 +58,15 @@
if (reasonText == null) {
throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
}
- Fault1_1Impl fault = new Fault1_1Impl(createDocument(), null);
+ Fault1_1Impl fault = new Fault1_1Impl(createDocument());
fault.setFaultCode(faultCode);
fault.setFaultString(reasonText);
return fault;
}
+ @Override
public SOAPFault createFault() throws SOAPException {
- Fault1_1Impl fault = new Fault1_1Impl(createDocument(), null);
+ Fault1_1Impl fault = new Fault1_1Impl(createDocument());
fault.setFaultCode(fault.getDefaultFaultCode());
fault.setFaultString("Fault string, and possibly fault code, not set");
return fault;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -40,16 +40,19 @@
public class SOAPMessageFactory1_1Impl extends MessageFactoryImpl {
+ @Override
public SOAPMessage createMessage() throws SOAPException {
return new Message1_1Impl();
}
+ @Override
public SOAPMessage createMessage(boolean isFastInfoset,
boolean acceptFastInfoset) throws SOAPException
{
return new Message1_1Impl(isFastInfoset, acceptFastInfoset);
}
+ @Override
public SOAPMessage createMessage(MimeHeaders headers, InputStream in) throws IOException, SOAPExceptionImpl {
if (headers == null) {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -54,10 +54,12 @@
super(message);
}
+ @Override
protected String getContentType() {
return isFastInfoset() ? "application/fastinfoset" : "text/xml";
}
+ @Override
protected Envelope createEnvelopeFromSource() throws SOAPException {
// Record the presence of xml declaration before the envelope gets
// created.
@@ -80,11 +82,13 @@
return envelope;
}
+ @Override
protected Envelope createEmptyEnvelope(String prefix)
throws SOAPException {
return new Envelope1_1Impl(getDocument(), prefix, true, true);
}
+ @Override
protected SOAPPartImpl duplicateType() {
return new SOAPPart1_1Impl();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -57,25 +57,30 @@
super(ownerDoc, domElement);
}
+ @Override
protected NameImpl getFaultName(String name) {
return NameImpl.createFault1_2Name(name, null);
}
+ @Override
protected SOAPBodyElement createBodyElement(Name name) {
return new BodyElement1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
name);
}
+ @Override
protected SOAPBodyElement createBodyElement(QName name) {
return new BodyElement1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
name);
}
+ @Override
protected QName getDefaultFaultCode() {
return SOAPConstants.SOAP_RECEIVER_FAULT;
}
+ @Override
public SOAPFault addFault() throws SOAPException {
if (hasAnyChildElement()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -89,6 +94,7 @@
* Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
* attribute to SOAP Body (SOAP 1.2 spec, part 1, section 5.1.1)
*/
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
log.severe("SAAJ0401.ver1_2.no.encodingstyle.in.body");
throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Body");
@@ -98,6 +104,7 @@
* Override addAttribute of ElementImpl to restrict adding encodingStyle
* attribute to SOAP Body (SOAP 1.2 spec, part 1, section 5.1.1)
*/
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
if (name.getLocalName().equals("encodingStyle")
@@ -108,6 +115,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addAttribute(QName name, String value)
throws SOAPException {
if (name.getLocalPart().equals("encodingStyle")
@@ -118,6 +126,7 @@
return super.addAttribute(name, value);
}
+ @Override
protected boolean isFault(SOAPElement child) {
return (child.getElementName().getURI().equals(
SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE) &&
@@ -125,6 +134,7 @@
"Fault"));
}
+ @Override
protected SOAPFault createFaultElement() {
return new Fault1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(), getPrefix());
@@ -135,6 +145,7 @@
* SOAP message MUST contain a single Fault element as the only
* child element of the SOAP Body.
*/
+ @Override
public SOAPBodyElement addBodyElement(Name name) throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -144,6 +155,7 @@
return super.addBodyElement(name);
}
+ @Override
public SOAPBodyElement addBodyElement(QName name) throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -153,6 +165,7 @@
return super.addBodyElement(name);
}
+ @Override
protected SOAPElement addElement(Name name) throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -162,6 +175,7 @@
return super.addElement(name);
}
+ @Override
protected SOAPElement addElement(QName name) throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -171,6 +185,7 @@
return super.addElement(name);
}
+ @Override
public SOAPElement addChildElement(Name name) throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -180,6 +195,7 @@
return super.addChildElement(name);
}
+ @Override
public SOAPElement addChildElement(QName name) throws SOAPException {
if (hasFault()) {
log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -36,6 +36,7 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.BodyElementImpl;
+import org.w3c.dom.Element;
public class BodyElement1_2Impl extends BodyElementImpl {
@@ -47,6 +48,11 @@
super(ownerDoc, qname);
}
+ public BodyElement1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
BodyElementImpl copy =
new BodyElement1_2Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -59,12 +59,14 @@
super(ownerDoc, domElement);
}
+ @Override
protected DetailEntry createDetailEntry(Name name) {
return new DetailEntry1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
name);
}
+ @Override
protected DetailEntry createDetailEntry(QName name) {
return new DetailEntry1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
@@ -75,11 +77,13 @@
* Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
* attribute to SOAP Detail (SOAP 1.2 spec, part 1, section 5.1.1)
*/
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
log.severe("SAAJ0403.ver1_2.no.encodingStyle.in.detail");
throw new SOAPExceptionImpl("EncodingStyle attribute cannot appear in Detail");
}
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
if (name.getLocalName().equals("encodingStyle")
@@ -89,6 +93,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addAttribute(QName name, String value)
throws SOAPException {
if (name.getLocalPart().equals("encodingStyle")
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -36,6 +36,7 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.DetailEntryImpl;
+import org.w3c.dom.Element;
public class DetailEntry1_2Impl extends DetailEntryImpl {
@@ -47,6 +48,11 @@
super(ownerDoc, qname);
}
+ public DetailEntry1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
DetailEntryImpl copy =
new DetailEntry1_2Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -68,10 +68,12 @@
createBody);
}
+ @Override
protected NameImpl getBodyName(String prefix) {
return NameImpl.createBody1_2Name(prefix);
}
+ @Override
protected NameImpl getHeaderName(String prefix) {
return NameImpl.createHeader1_2Name(prefix);
}
@@ -80,6 +82,7 @@
* Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
* attribute to SOAP Envelope (SOAP 1.2 spec, part 1, section 5.1.1)
*/
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
log.severe("SAAJ0404.ver1_2.no.encodingStyle.in.envelope");
throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Envelope");
@@ -89,6 +92,7 @@
* Override addAttribute of ElementImpl to restrict adding encodingStyle
* attribute to SOAP Envelope (SOAP 1.2 spec, part 1, section 5.1.1)
*/
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
if (name.getLocalName().equals("encodingStyle")
@@ -98,6 +102,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addAttribute(QName name, String value)
throws SOAPException {
if (name.getLocalPart().equals("encodingStyle")
@@ -112,6 +117,7 @@
* Override addChildElement method to ensure that no element
* is added after body in SOAP 1.2.
*/
+ @Override
public SOAPElement addChildElement(Name name) throws SOAPException {
// check if body already exists
if (getBody() != null) {
@@ -122,6 +128,7 @@
return super.addChildElement(name);
}
+ @Override
public SOAPElement addChildElement(QName name) throws SOAPException {
// check if body already exists
if (getBody() != null) {
@@ -142,6 +149,7 @@
*
*/
+ @Override
public SOAPElement addTextNode(String text) throws SOAPException {
log.log(
Level.SEVERE,
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -29,12 +29,10 @@
*/
package com.sun.xml.internal.messaging.saaj.soap.ver1_2;
-import java.util.*;
import java.util.logging.Logger;
import java.util.logging.Level;
import javax.xml.namespace.QName;
-import javax.xml.soap.*;
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
@@ -42,6 +40,14 @@
import com.sun.xml.internal.messaging.saaj.soap.impl.*;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
import org.w3c.dom.Element;
@@ -69,22 +75,30 @@
super(ownerDocument, NameImpl.createFault1_2Name(null, prefix));
}
- public Fault1_2Impl(Element domElement, SOAPDocumentImpl ownerDoc) {
+ public Fault1_2Impl(SOAPDocumentImpl ownerDocument) {
+ super(ownerDocument, NameImpl.createFault1_2Name(null, null));
+ }
+
+ public Fault1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
super(ownerDoc, domElement);
}
+ @Override
protected NameImpl getDetailName() {
return NameImpl.createSOAP12Name("Detail", getPrefix());
}
+ @Override
protected NameImpl getFaultCodeName() {
return NameImpl.createSOAP12Name("Code", getPrefix());
}
+ @Override
protected NameImpl getFaultStringName() {
return getFaultReasonName();
}
+ @Override
protected NameImpl getFaultActorName() {
return getFaultRoleName();
}
@@ -109,17 +123,20 @@
return NameImpl.createXmlName("lang");
}
+ @Override
protected DetailImpl createDetail() {
return new Detail1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument());
}
+ @Override
protected FaultElementImpl createSOAPFaultElement(String localName) {
return new FaultElement1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
localName);
}
+ @Override
protected void checkIfStandardFaultCode(String faultCode, String uri)
throws SOAPException {
QName qname = new QName(uri, faultCode);
@@ -136,6 +153,7 @@
throw new SOAPExceptionImpl(qname + " is not a standard Code value");
}
+ @Override
protected void finallySetFaultCode(String faultcode) throws SOAPException {
SOAPElement value = this.faultCodeElement.addChildElement(valueName);
value.addTextNode(faultcode);
@@ -145,13 +163,14 @@
findFaultStringElement();
}
- public Iterator getFaultReasonTexts() throws SOAPException {
+ @Override
+ public Iterator getFaultReasonTexts() throws SOAPException {
// Fault Reason has similar semantics as faultstring
if (this.faultStringElement == null)
findReasonElement();
Iterator eachTextElement =
this.faultStringElement.getChildElements(textName);
- List texts = new ArrayList();
+ List texts = new ArrayList<>();
while (eachTextElement.hasNext()) {
SOAPElement textElement = (SOAPElement) eachTextElement.next();
Locale thisLocale = getLocale(textElement);
@@ -168,6 +187,7 @@
return texts.iterator();
}
+ @Override
public void addFaultReasonText(String text, java.util.Locale locale)
throws SOAPException {
@@ -214,6 +234,7 @@
}
}
+ @Override
public String getFaultReasonText(Locale locale) throws SOAPException {
if (locale == null)
@@ -234,13 +255,14 @@
return null;
}
- public Iterator getFaultReasonLocales() throws SOAPException {
+ @Override
+ public Iterator getFaultReasonLocales() throws SOAPException {
// Fault Reason has similar semantics as faultstring
if (this.faultStringElement == null)
findReasonElement();
Iterator eachTextElement =
this.faultStringElement.getChildElements(textName);
- List localeSet = new ArrayList();
+ List localeSet = new ArrayList<>();
while (eachTextElement.hasNext()) {
SOAPElement textElement = (SOAPElement) eachTextElement.next();
Locale thisLocale = getLocale(textElement);
@@ -257,6 +279,7 @@
return localeSet.iterator();
}
+ @Override
public Locale getFaultStringLocale() {
Locale locale = null;
try {
@@ -288,6 +311,7 @@
return null;
}
+ @Override
public String getFaultNode() {
SOAPElement faultNode = findAndConvertChildElement(getFaultNodeName());
if (faultNode == null) {
@@ -296,6 +320,7 @@
return faultNode.getValue();
}
+ @Override
public void setFaultNode(String uri) throws SOAPException {
SOAPElement faultNode = findAndConvertChildElement(getFaultNodeName());
if (faultNode != null) {
@@ -314,10 +339,12 @@
addNode(faultNode);
}
+ @Override
public String getFaultRole() {
return getFaultActor();
}
+ @Override
public void setFaultRole(String uri) throws SOAPException {
if (this.faultActorElement == null)
findFaultActorElement();
@@ -333,6 +360,7 @@
addNode(this.faultActorElement);
}
+ @Override
public String getFaultCode() {
if (this.faultCodeElement == null)
findFaultCodeElement();
@@ -341,6 +369,7 @@
return ((SOAPElement) codeValues.next()).getValue();
}
+ @Override
public QName getFaultCodeAsQName() {
String faultcode = getFaultCode();
if (faultcode == null) {
@@ -355,6 +384,7 @@
(SOAPElement) valueElements.next());
}
+ @Override
public Name getFaultCodeAsName() {
String faultcode = getFaultCode();
if (faultcode == null) {
@@ -370,6 +400,7 @@
(SOAPElement) valueElements.next()));
}
+ @Override
public String getFaultString() {
String reason = null;
try {
@@ -380,10 +411,12 @@
return reason;
}
+ @Override
public void setFaultString(String faultString) throws SOAPException {
addFaultReasonText(faultString, Locale.getDefault());
}
+ @Override
public void setFaultString(
String faultString,
Locale locale)
@@ -391,6 +424,7 @@
addFaultReasonText(faultString, locale);
}
+ @Override
public void appendFaultSubcode(QName subcode) throws SOAPException {
if (subcode == null) {
return;
@@ -426,6 +460,7 @@
subcodeValueElement.addTextNode(prefix + ":" + subcode.getLocalPart());
}
+ @Override
public void removeAllFaultSubcodes() {
if (this.faultCodeElement == null)
findFaultCodeElement();
@@ -437,10 +472,11 @@
}
}
- public Iterator getFaultSubcodes() {
+ @Override
+ public Iterator getFaultSubcodes() {
if (this.faultCodeElement == null)
findFaultCodeElement();
- final List subcodeList = new ArrayList();
+ final List subcodeList = new ArrayList<>();
SOAPElement currentCodeElement = this.faultCodeElement;
Iterator subcodeElements =
currentCodeElement.getChildElements(subcodeName);
@@ -457,14 +493,17 @@
return new Iterator() {
Iterator subCodeIter = subcodeList.iterator();
+ @Override
public boolean hasNext() {
return subCodeIter.hasNext();
}
+ @Override
public QName next() {
return subCodeIter.next();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException(
"Method remove() not supported on SubCodes Iterator");
@@ -480,11 +519,13 @@
* Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
* attribute to SOAP Fault (SOAP 1.2 spec, part 1, section 5.1.1)
*/
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
log.severe("SAAJ0407.ver1_2.no.encodingStyle.in.fault");
throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Fault");
}
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
if (name.getLocalName().equals("encodingStyle")
@@ -494,6 +535,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addAttribute(QName name, String value)
throws SOAPException {
if (name.getLocalPart().equals("encodingStyle")
@@ -503,6 +545,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addTextNode(String text) throws SOAPException {
log.log(
Level.SEVERE,
@@ -511,6 +554,7 @@
throw new SOAPExceptionImpl("Adding text to SOAP 1.2 Fault is not legal");
}
+ @Override
public SOAPElement addChildElement(SOAPElement element)
throws SOAPException {
String localName = element.getLocalName();
@@ -533,6 +577,7 @@
return super.addChildElement(element);
}
+ @Override
protected boolean isStandardFaultElement(String localName) {
if (localName.equalsIgnoreCase("code") ||
localName.equalsIgnoreCase("reason") ||
@@ -544,22 +589,26 @@
return false;
}
+ @Override
protected QName getDefaultFaultCode() {
return SOAPConstants.SOAP_SENDER_FAULT;
}
+ @Override
protected FaultElementImpl createSOAPFaultElement(QName qname) {
return new FaultElement1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
qname);
}
+ @Override
protected FaultElementImpl createSOAPFaultElement(Name qname) {
return new FaultElement1_2Impl(
((SOAPDocument) getOwnerDocument()).getDocument(),
(NameImpl)qname);
}
+ @Override
public void setFaultActor(String faultActor) throws SOAPException {
this.setFaultRole(faultActor);
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -38,6 +38,7 @@
import com.sun.xml.internal.messaging.saaj.soap.impl.FaultElementImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
+import org.w3c.dom.Element;
public class FaultElement1_2Impl extends FaultElementImpl {
@@ -53,6 +54,11 @@
super(ownerDoc, NameImpl.createSOAP12Name(localName));
}
+ public FaultElement1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
protected boolean isStandardFaultElement() {
String localName = elementQName.getLocalPart();
if (localName.equalsIgnoreCase("code") ||
@@ -64,6 +70,7 @@
return false;
}
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
if (!isStandardFaultElement()) {
FaultElement1_2Impl copy =
@@ -74,11 +81,13 @@
}
}
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
log.severe("SAAJ0408.ver1_2.no.encodingStyle.in.fault.child");
throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on a Fault child element");
}
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
if (name.getLocalName().equals("encodingStyle")
@@ -88,6 +97,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addAttribute(QName name, String value)
throws SOAPException {
if (name.getLocalPart().equals("encodingStyle")
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -59,18 +59,22 @@
super(ownerDoc, domElement);
}
+ @Override
protected NameImpl getNotUnderstoodName() {
return NameImpl.createNotUnderstood1_2Name(null);
}
+ @Override
protected NameImpl getUpgradeName() {
return NameImpl.createUpgrade1_2Name(null);
}
+ @Override
protected NameImpl getSupportedEnvelopeName() {
return NameImpl.createSupportedEnvelope1_2Name(null);
}
+ @Override
public SOAPHeaderElement addNotUnderstoodHeaderElement(final QName sourceName)
throws SOAPException {
@@ -102,6 +106,7 @@
return notunderstoodHeaderElement;
}
+ @Override
public SOAPElement addTextNode(String text) throws SOAPException {
log.log(
Level.SEVERE,
@@ -110,6 +115,7 @@
throw new SOAPExceptionImpl("Adding text to SOAP 1.2 Header is not legal");
}
+ @Override
protected SOAPHeaderElement createHeaderElement(Name name)
throws SOAPException {
String uri = name.getURI();
@@ -122,6 +128,7 @@
name);
}
+ @Override
protected SOAPHeaderElement createHeaderElement(QName name)
throws SOAPException {
String uri = name.getNamespaceURI();
@@ -134,11 +141,13 @@
name);
}
+ @Override
public void setEncodingStyle(String encodingStyle) throws SOAPException {
log.severe("SAAJ0409.ver1_2.no.encodingstyle.in.header");
throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Header");
}
+ @Override
public SOAPElement addAttribute(Name name, String value)
throws SOAPException {
if (name.getLocalName().equals("encodingStyle")
@@ -149,6 +158,7 @@
return super.addAttribute(name, value);
}
+ @Override
public SOAPElement addAttribute(QName name, String value)
throws SOAPException {
if (name.getLocalPart().equals("encodingStyle")
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, 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
@@ -37,6 +37,7 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderElementImpl;
import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import org.w3c.dom.Element;
public class HeaderElement1_2Impl extends HeaderElementImpl {
@@ -47,51 +48,65 @@
super(ownerDoc, qname);
}
+ public HeaderElement1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+ super(ownerDoc, domElement);
+ }
+
+ @Override
public SOAPElement setElementQName(QName newName) throws SOAPException {
HeaderElementImpl copy =
new HeaderElement1_2Impl((SOAPDocumentImpl)getOwnerDocument(), newName);
return replaceElementWithSOAPElement(this,copy);
}
+ @Override
protected NameImpl getRoleAttributeName() {
return NameImpl.create("role", null, NameImpl.SOAP12_NAMESPACE);
}
// Actor equivalent to Role in SOAP 1.2
+ @Override
protected NameImpl getActorAttributeName() {
return getRoleAttributeName();
}
+ @Override
protected NameImpl getMustunderstandAttributeName() {
return NameImpl.create("mustUnderstand", null, NameImpl.SOAP12_NAMESPACE);
}
// mustUnderstand attribute has literal value "true" or "false"
+ @Override
protected String getMustunderstandLiteralValue(boolean mustUnderstand) {
return (mustUnderstand == true ? "true" : "false");
}
+ @Override
protected boolean getMustunderstandAttributeValue(String mu) {
if (mu.equals("true") || mu.equals("1"))
return true;
return false;
}
+ @Override
protected NameImpl getRelayAttributeName() {
return NameImpl.create("relay", null, NameImpl.SOAP12_NAMESPACE);
}
//relay attribute has literal value "true" or "false"
+ @Override
protected String getRelayLiteralValue(boolean relay) {
return (relay == true ? "true" : "false");
}
+ @Override
protected boolean getRelayAttributeValue(String relay) {
if (relay.equals("true") || relay.equals("1"))
return true;
return false;
}
+ @Override
protected String getActorOrRole() {
return getRole();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -69,6 +69,7 @@
super(headers,ct,stat,reader);
}
+ @Override
public SOAPPart getSOAPPart() {
if (soapPartImpl == null)
soapPartImpl = new SOAPPart1_2Impl(this);
@@ -76,14 +77,17 @@
return soapPartImpl;
}
+ @Override
protected boolean isCorrectSoapVersion(int contentTypeId) {
return (contentTypeId & SOAP1_2_FLAG) != 0;
}
+ @Override
protected String getExpectedContentType() {
return isFastInfoset ? "application/soap+fastinfoset" : "application/soap+xml";
}
+ @Override
protected String getExpectedAcceptHeader() {
String accept = "application/soap+xml, text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
return acceptFastInfoset ? ("application/soap+fastinfoset, " + accept) : accept;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -39,14 +39,17 @@
import com.sun.xml.internal.messaging.saaj.soap.SOAPFactoryImpl;
public class SOAPFactory1_2Impl extends SOAPFactoryImpl {
+ @Override
protected SOAPDocumentImpl createDocument() {
return (new SOAPPart1_2Impl()).getDocument();
}
+ @Override
public Detail createDetail() throws SOAPException {
return new Detail1_2Impl(createDocument());
}
+ @Override
public SOAPFault createFault(String reasonText, QName faultCode)
throws SOAPException {
if (faultCode == null) {
@@ -55,14 +58,15 @@
if (reasonText == null) {
throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
}
- Fault1_2Impl fault = new Fault1_2Impl(createDocument(), null);
+ Fault1_2Impl fault = new Fault1_2Impl(createDocument());
fault.setFaultCode(faultCode);
fault.setFaultString(reasonText);
return fault;
}
+ @Override
public SOAPFault createFault() throws SOAPException {
- Fault1_2Impl fault = new Fault1_2Impl(createDocument(), null);
+ Fault1_2Impl fault = new Fault1_2Impl(createDocument());
fault.setFaultCode(fault.getDefaultFaultCode());
fault.setFaultString("Fault string, and possibly fault code, not set");
return fault;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -40,16 +40,19 @@
public class SOAPMessageFactory1_2Impl extends MessageFactoryImpl {
+ @Override
public SOAPMessage createMessage() throws SOAPException {
return new Message1_2Impl();
}
+ @Override
public SOAPMessage createMessage(boolean isFastInfoset,
boolean acceptFastInfoset) throws SOAPException
{
return new Message1_2Impl(isFastInfoset, acceptFastInfoset);
}
+ @Override
public SOAPMessage createMessage(MimeHeaders headers, InputStream in) throws IOException, SOAPExceptionImpl {
if (headers == null) {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -53,14 +53,17 @@
super(message);
}
+ @Override
protected String getContentType() {
return "application/soap+xml";
}
+ @Override
protected Envelope createEmptyEnvelope(String prefix) throws SOAPException {
return new Envelope1_2Impl(getDocument(), prefix, true, true);
}
+ @Override
protected Envelope createEnvelopeFromSource() throws SOAPException {
XMLDeclarationParser parser = lookForXmlDecl();
Source tmp = source;
@@ -82,6 +85,7 @@
}
+ @Override
protected SOAPPartImpl duplicateType() {
return new SOAPPart1_2Impl();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -53,6 +53,7 @@
return count;
}
+ @Override
public void close() throws IOException {
reset();
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -75,10 +75,12 @@
this.reader = new CharArrayReader(cout.toCharArray(), 0, cout.size());
}
+ @Override
public InputStream getInputStream() {
return in;
}
+ @Override
public Reader getReader() {
return reader;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -89,11 +89,13 @@
}
}
+ @Override
public boolean hasNext() {
findNext();
return next != null;
}
+ @Override
public Object next() {
return getNext();
}
@@ -112,6 +114,7 @@
return last;
}
+ @Override
public void remove() {
if (last == null) {
throw new IllegalStateException();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -96,6 +96,7 @@
* Override setProperty() to capture any LexicalHandler that is set for
* forwarding of events.
*/
+ @Override
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
if (LEXICAL_HANDLER_PROP.equals(name)) {
@@ -109,38 +110,45 @@
// Beginning of SAX LexicalHandler callbacks...
//
+ @Override
public void startDTD(String name, String publicId, String systemId)
throws SAXException {
throw new SAXException("Document Type Declaration is not allowed");
}
+ @Override
public void endDTD() throws SAXException {
}
+ @Override
public void startEntity(String name) throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.startEntity(name);
}
}
+ @Override
public void endEntity(String name) throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.endEntity(name);
}
}
+ @Override
public void startCDATA() throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.startCDATA();
}
}
+ @Override
public void endCDATA() throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.endCDATA();
}
}
+ @Override
public void comment(char[] ch, int start, int length) throws SAXException {
if (lexicalHandler != null) {
lexicalHandler.comment(ch, start, length);
@@ -151,6 +159,7 @@
// End of SAX LexicalHandler callbacks
//
+ @Override
public void startElement(String namespaceURI, String localName,
String qName, Attributes atts) throws SAXException{
if(atts != null ){
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, 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
@@ -46,44 +46,53 @@
this.source = source;
}
+ @Override
public int read() throws IOException {
int result = source.read();
copySink.write(result);
return result;
}
+ @Override
public int available() throws IOException {
return source.available();
}
+ @Override
public void close() throws IOException {
source.close();
}
+ @Override
public synchronized void mark(int readlimit) {
source.mark(readlimit);
}
+ @Override
public boolean markSupported() {
return source.markSupported();
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
int result = source.read(b, off, len);
copySink.write(b, off, len);
return result;
}
+ @Override
public int read(byte[] b) throws IOException {
int result = source.read(b);
copySink.write(b);
return result;
}
+ @Override
public synchronized void reset() throws IOException {
source.reset();
}
+ @Override
public long skip(long n) throws IOException {
return source.skip(n);
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -59,11 +59,13 @@
}
}
+ @Override
public Object getProperty(String name) throws IllegalArgumentException {
if (usePayloadReaderDelegate) return payloadReader.getProperty(name);
return super.getProperty(name);
}
+ @Override
public int next() throws XMLStreamException {
// boolean previouslyUsingPayloadReader = usePayloadReaderDelegate;
//call checkReaderStatus to advance to payloadReader if needed
@@ -78,22 +80,26 @@
return getEventType();
}
+ @Override
public void require(int type, String namespaceURI, String localName)
throws XMLStreamException {
if (usePayloadReaderDelegate) payloadReader.require(type, namespaceURI, localName);
else super.require(type, namespaceURI, localName);
}
+ @Override
public String getElementText() throws XMLStreamException {
if (usePayloadReaderDelegate) return payloadReader.getElementText();
return super.getElementText();
}
+ @Override
public int nextTag() throws XMLStreamException {
if (usePayloadReaderDelegate) return payloadReader.nextTag();
return super.nextTag();
}
+ @Override
public boolean hasNext() throws XMLStreamException {
checkReaderStatus(false);
boolean hasNext;
@@ -139,116 +145,139 @@
}
}
+ @Override
public void close() throws XMLStreamException {
if (usePayloadReaderDelegate) payloadReader.close();
else super.close();
}
+ @Override
public String getNamespaceURI(String prefix) {
if (usePayloadReaderDelegate) return payloadReader.getNamespaceURI(prefix);
return super.getNamespaceURI(prefix);
}
+ @Override
public boolean isStartElement() {
if (usePayloadReaderDelegate) return payloadReader.isStartElement();
return super.isStartElement();
}
+ @Override
public boolean isEndElement() {
if (usePayloadReaderDelegate) return payloadReader.isEndElement();
return super.isEndElement();
}
+ @Override
public boolean isCharacters() {
if (usePayloadReaderDelegate) return payloadReader.isCharacters();
return super.isEndElement();
}
+ @Override
public boolean isWhiteSpace() {
if (usePayloadReaderDelegate) return payloadReader.isWhiteSpace();
return super.isWhiteSpace();
}
+ @Override
public String getAttributeValue(String namespaceURI, String localName) {
if (usePayloadReaderDelegate) return payloadReader.getAttributeValue(namespaceURI, localName);
return super.getAttributeValue(namespaceURI, localName);
}
+ @Override
public int getAttributeCount() {
if (usePayloadReaderDelegate) return payloadReader.getAttributeCount();
return super.getAttributeCount();
}
+ @Override
public QName getAttributeName(int index) {
if (usePayloadReaderDelegate) return payloadReader.getAttributeName(index);
return super.getAttributeName(index);
}
+ @Override
public String getAttributeNamespace(int index) {
if (usePayloadReaderDelegate) return payloadReader.getAttributeNamespace(index);
return super.getAttributeNamespace(index);
}
+ @Override
public String getAttributeLocalName(int index) {
if (usePayloadReaderDelegate) return payloadReader.getAttributeLocalName(index);
return super.getAttributeLocalName(index);
}
+ @Override
public String getAttributePrefix(int index) {
if (usePayloadReaderDelegate) return payloadReader.getAttributePrefix(index);
return super.getAttributePrefix(index);
}
+ @Override
public String getAttributeType(int index) {
if (usePayloadReaderDelegate) return payloadReader.getAttributeType(index);
return super.getAttributeType(index);
}
+ @Override
public String getAttributeValue(int index) {
if (usePayloadReaderDelegate) return payloadReader.getAttributeValue(index);
return super.getAttributeValue(index);
}
+ @Override
public boolean isAttributeSpecified(int index) {
if (usePayloadReaderDelegate) return payloadReader.isAttributeSpecified(index);
return super.isAttributeSpecified(index);
}
+ @Override
public int getNamespaceCount() {
if (usePayloadReaderDelegate) return payloadReader.getNamespaceCount();
return super.getNamespaceCount();
}
+ @Override
public String getNamespacePrefix(int index) {
if (usePayloadReaderDelegate) return payloadReader.getNamespacePrefix(index);
return super.getNamespacePrefix(index);
}
+ @Override
public String getNamespaceURI(int index) {
if (usePayloadReaderDelegate) return payloadReader.getNamespaceURI(index);
return super.getNamespaceURI(index);
}
+ @Override
public NamespaceContext getNamespaceContext() {
if (usePayloadReaderDelegate) return payloadReader.getNamespaceContext();
return super.getNamespaceContext();
}
+ @Override
public int getEventType() {
if (usePayloadReaderDelegate) return payloadReader.getEventType();
return super.getEventType();
}
+ @Override
public String getText() {
if (usePayloadReaderDelegate) return payloadReader.getText();
return super.getText();
}
+ @Override
public char[] getTextCharacters() {
if (usePayloadReaderDelegate) return payloadReader.getTextCharacters();
return super.getTextCharacters();
}
+ @Override
public int getTextCharacters(int sourceStart, char[] target,
int targetStart, int length) throws XMLStreamException {
if (usePayloadReaderDelegate) return payloadReader.getTextCharacters(sourceStart, target, targetStart,
@@ -256,81 +285,97 @@
return super.getTextCharacters(sourceStart, target, targetStart, length);
}
+ @Override
public int getTextStart() {
if (usePayloadReaderDelegate) return payloadReader.getTextStart();
return super.getTextStart();
}
+ @Override
public int getTextLength() {
if (usePayloadReaderDelegate) return payloadReader.getTextLength();
return super.getTextLength();
}
+ @Override
public String getEncoding() {
if (usePayloadReaderDelegate) return payloadReader.getEncoding();
return super.getEncoding();
}
+ @Override
public boolean hasText() {
if (usePayloadReaderDelegate) return payloadReader.hasText();
return super.hasText();
}
+ @Override
public Location getLocation() {
if (usePayloadReaderDelegate) return payloadReader.getLocation();
return super.getLocation();
}
+ @Override
public QName getName() {
if (usePayloadReaderDelegate) return payloadReader.getName();
return super.getName();
}
+ @Override
public String getLocalName() {
if (usePayloadReaderDelegate) return payloadReader.getLocalName();
return super.getLocalName();
}
+ @Override
public boolean hasName() {
if (usePayloadReaderDelegate) return payloadReader.hasName();
return super.hasName();
}
+ @Override
public String getNamespaceURI() {
if (usePayloadReaderDelegate) return payloadReader.getNamespaceURI();
return super.getNamespaceURI();
}
+ @Override
public String getPrefix() {
if (usePayloadReaderDelegate) return payloadReader.getPrefix();
return super.getPrefix();
}
+ @Override
public String getVersion() {
if (usePayloadReaderDelegate) return payloadReader.getVersion();
return super.getVersion();
}
+ @Override
public boolean isStandalone() {
if (usePayloadReaderDelegate) return payloadReader.isStandalone();
return super.isStandalone();
}
+ @Override
public boolean standaloneSet() {
if (usePayloadReaderDelegate) return payloadReader.standaloneSet();
return super.standaloneSet();
}
+ @Override
public String getCharacterEncodingScheme() {
if (usePayloadReaderDelegate) return payloadReader.getCharacterEncodingScheme();
return super.getCharacterEncodingScheme();
}
+ @Override
public String getPITarget() {
if (usePayloadReaderDelegate) return payloadReader.getPITarget();
return super.getPITarget();
}
+ @Override
public String getPIData() {
if (usePayloadReaderDelegate) return payloadReader.getPIData();
return super.getPIData();
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java Thu Aug 24 16:24:44 2017 +0200
@@ -335,24 +335,30 @@
@Override
public NamespaceContext getNamespaceContext() {
return new NamespaceContext() {
+ @Override
public String getNamespaceURI(final String prefix) {
return currentElement.getNamespaceURI(prefix);
}
+ @Override
public String getPrefix(final String namespaceURI) {
return currentElement.lookupPrefix(namespaceURI);
}
+ @Override
public Iterator getPrefixes(final String namespaceURI) {
return new Iterator() {
String prefix = getPrefix(namespaceURI);
+ @Override
public boolean hasNext() {
return (prefix != null);
}
+ @Override
public String next() {
if (!hasNext()) throw new java.util.NoSuchElementException();
String next = prefix;
prefix = null;
return next;
}
+ @Override
public void remove() {}
};
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -67,6 +67,7 @@
super(msg, uri);
}
+ @Override
public void writeStartElement(String prefix, String ln, String ns) throws XMLStreamException {
if (xopNS.equals(ns) && Include.equals(ln)) {
state = State.xopInclude;
@@ -108,31 +109,41 @@
@Override
public NamespaceContextEx getNamespaceContext() {
return new NamespaceContextEx() {
+ @Override
public String getNamespaceURI(String prefix) {
return currentElement.getNamespaceURI(prefix);
}
+ @Override
public String getPrefix(String namespaceURI) {
return currentElement.lookupPrefix(namespaceURI);
}
+ @Override
public Iterator getPrefixes(final String namespaceURI) {
return new Iterator() {
String prefix = getPrefix(namespaceURI);
+ @Override
public boolean hasNext() {
return (prefix != null);
}
+ @Override
public String next() {
if (prefix == null) throw new java.util.NoSuchElementException();
String next = prefix;
prefix = null;
return next;
}
+ @Override
public void remove() {}
};
}
+ @Override
public Iterator iterator() {
return new Iterator() {
+ @Override
public boolean hasNext() { return false; }
+ @Override
public Binding next() { return null; }
+ @Override
public void remove() {}
};
}
@@ -208,6 +219,7 @@
return hrefOrCid;
}
+ @Override
public AttachmentMarshaller getAttachmentMarshaller() {
return new AttachmentMarshaller() {
@Override
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java Thu Aug 24 16:24:44 2017 +0200
@@ -25,6 +25,18 @@
package com.sun.xml.internal.ws.api.message.saaj;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.message.MessageHeaders;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
+import com.sun.xml.internal.ws.message.saaj.SAAJHeader;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.soap.SOAPMessage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -34,21 +46,6 @@
import java.util.Map;
import java.util.Set;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-
-import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderImpl;
-import com.sun.xml.internal.ws.api.SOAPVersion;
-import com.sun.xml.internal.ws.api.WSBinding;
-import com.sun.xml.internal.ws.api.message.Header;
-import com.sun.xml.internal.ws.api.message.MessageHeaders;
-import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
-import com.sun.xml.internal.ws.message.saaj.SAAJHeader;
-
public class SAAJMessageHeaders implements MessageHeaders {
SOAPMessage sm;
Map nonSAAJHeaders;
@@ -236,12 +233,11 @@
if (soapHeader == null) {
return null;
}
- SOAPDocumentImpl soapDocument = ((HeaderImpl)soapHeader).getSoapDocument();
SOAPHeaderElement headerElem = find(nsUri, localName);
if (headerElem == null) {
return null;
}
- headerElem = (SOAPHeaderElement) soapDocument.find(soapHeader.removeChild(headerElem));
+ headerElem = (SOAPHeaderElement) soapHeader.removeChild(headerElem);
//it might have been a nonSAAJHeader - remove from that map
removeNonSAAJHeader(headerElem);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java Thu Aug 24 16:24:44 2017 +0200
@@ -35,6 +35,7 @@
import javax.xml.stream.XMLStreamReader;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
@@ -89,8 +90,14 @@
*/
public abstract URL getSystemId();
- public static SDDocumentSource create(final Class implClass, final String url) {
- return create(url, implClass);
+ public static SDDocumentSource create(final Class implClass, final String wsdlLocation) {
+ ClassLoader cl = implClass.getClassLoader();
+ URL url = cl.getResource(wsdlLocation);
+ if (url != null) {
+ return create(url);
+ } else {
+ return create(wsdlLocation, implClass);
+ }
}
/**
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, 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
@@ -28,6 +28,7 @@
import com.sun.istack.internal.NotNull;
import com.sun.istack.internal.Nullable;
import com.sun.xml.internal.ws.streaming.XMLReaderException;
+import com.sun.xml.internal.ws.util.MrJarUtil;
import com.sun.xml.internal.ws.util.xml.XmlUtil;
import org.xml.sax.InputSource;
@@ -79,7 +80,7 @@
// this system property can be used to disable the pooling altogether,
// in case someone hits an issue with pooling in the production system.
- if(!getProperty(XMLStreamReaderFactory.class.getName()+".noPool")) {
+ if(!MrJarUtil.getNoPoolProperty(XMLStreamReaderFactory.class.getName())) {
f = Zephyr.newInstance(xif);
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, 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
@@ -30,6 +30,7 @@
import com.sun.xml.internal.ws.encoding.HasEncoding;
import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
import com.sun.xml.internal.ws.streaming.XMLReaderException;
+import com.sun.xml.internal.ws.util.MrJarUtil;
import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter;
import javax.xml.stream.XMLOutputFactory;
@@ -85,7 +86,7 @@
// this system property can be used to disable the pooling altogether,
// in case someone hits an issue with pooling in the production system.
- if (!Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".noPool")) {
+ if (!MrJarUtil.getNoPoolProperty(XMLStreamWriterFactory.class.getName())) {
try {
Class clazz = xof.createXMLStreamWriter(new StringWriter()).getClass();
if (clazz.getName().startsWith("com.sun.xml.internal.stream.")) {
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java Thu Aug 24 16:24:44 2017 +0200
@@ -1180,7 +1180,7 @@
if(p == null)
resRpcParams.put(resRpcParams.size()+10000, param);
else
- resRpcParams.put(param.getIndex(), param);
+ resRpcParams.put(p.getIndex(), param);
}
}else{
javaMethod.addParameter(param);
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 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,30 +25,28 @@
package com.sun.xml.internal.ws.policy.privateutil;
+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 LocalizationMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.policy.privateutil.Localization";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, LocalizationMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new LocalizationMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableWSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON", arg0, arg1);
}
/**
@@ -57,11 +55,11 @@
*
*/
public static String WSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(arg0, arg1));
}
public static Localizable localizableWSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(Object arg0) {
- return messageFactory.getMessage("WSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED", arg0);
}
/**
@@ -69,11 +67,11 @@
*
*/
public static String WSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(Object arg0) {
- return localizer.localize(localizableWSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(arg0));
+ return LOCALIZER.localize(localizableWSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(arg0));
}
public static Localizable localizableWSP_0081_UNABLE_TO_INSERT_CHILD(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0081_UNABLE_TO_INSERT_CHILD", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0081_UNABLE_TO_INSERT_CHILD", arg0, arg1);
}
/**
@@ -81,11 +79,11 @@
*
*/
public static String WSP_0081_UNABLE_TO_INSERT_CHILD(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0081_UNABLE_TO_INSERT_CHILD(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0081_UNABLE_TO_INSERT_CHILD(arg0, arg1));
}
public static Localizable localizableWSP_0096_ERROR_WHILE_COMBINE(Object arg0) {
- return messageFactory.getMessage("WSP_0096_ERROR_WHILE_COMBINE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0096_ERROR_WHILE_COMBINE", arg0);
}
/**
@@ -93,11 +91,11 @@
*
*/
public static String WSP_0096_ERROR_WHILE_COMBINE(Object arg0) {
- return localizer.localize(localizableWSP_0096_ERROR_WHILE_COMBINE(arg0));
+ return LOCALIZER.localize(localizableWSP_0096_ERROR_WHILE_COMBINE(arg0));
}
public static Localizable localizableWSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(Object arg0) {
- return messageFactory.getMessage("WSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL", arg0);
}
/**
@@ -105,11 +103,11 @@
*
*/
public static String WSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(Object arg0) {
- return localizer.localize(localizableWSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(arg0));
+ return LOCALIZER.localize(localizableWSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(arg0));
}
public static Localizable localizableWSP_0090_UNEXPECTED_ELEMENT(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0090_UNEXPECTED_ELEMENT", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0090_UNEXPECTED_ELEMENT", arg0, arg1);
}
/**
@@ -117,11 +115,11 @@
*
*/
public static String WSP_0090_UNEXPECTED_ELEMENT(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0090_UNEXPECTED_ELEMENT(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0090_UNEXPECTED_ELEMENT(arg0, arg1));
}
public static Localizable localizableWSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL() {
- return messageFactory.getMessage("WSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL");
}
/**
@@ -129,11 +127,11 @@
*
*/
public static String WSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL() {
- return localizer.localize(localizableWSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL());
+ return LOCALIZER.localize(localizableWSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL());
}
public static Localizable localizableWSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED() {
- return messageFactory.getMessage("WSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED");
+ return MESSAGE_FACTORY.getMessage("WSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED");
}
/**
@@ -141,11 +139,11 @@
*
*/
public static String WSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED() {
- return localizer.localize(localizableWSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED());
+ return LOCALIZER.localize(localizableWSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED());
}
public static Localizable localizableWSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED() {
- return messageFactory.getMessage("WSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED");
+ return MESSAGE_FACTORY.getMessage("WSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED");
}
/**
@@ -153,11 +151,11 @@
*
*/
public static String WSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED() {
- return localizer.localize(localizableWSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED());
+ return LOCALIZER.localize(localizableWSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED());
}
public static Localizable localizableWSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL() {
- return messageFactory.getMessage("WSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL");
+ return MESSAGE_FACTORY.getMessage("WSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL");
}
/**
@@ -165,11 +163,11 @@
*
*/
public static String WSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL() {
- return localizer.localize(localizableWSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL());
+ return LOCALIZER.localize(localizableWSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL());
}
public static Localizable localizableWSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED() {
- return messageFactory.getMessage("WSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED");
+ return MESSAGE_FACTORY.getMessage("WSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED");
}
/**
@@ -177,11 +175,11 @@
*
*/
public static String WSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED() {
- return localizer.localize(localizableWSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED());
+ return LOCALIZER.localize(localizableWSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED());
}
public static Localizable localizableWSP_0061_METHOD_INVOCATION_FAILED(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0061_METHOD_INVOCATION_FAILED", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0061_METHOD_INVOCATION_FAILED", arg0, arg1, arg2);
}
/**
@@ -189,11 +187,11 @@
*
*/
public static String WSP_0061_METHOD_INVOCATION_FAILED(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0061_METHOD_INVOCATION_FAILED(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0061_METHOD_INVOCATION_FAILED(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0048_POLICY_ELEMENT_EXPECTED_FIRST() {
- return messageFactory.getMessage("WSP_0048_POLICY_ELEMENT_EXPECTED_FIRST");
+ return MESSAGE_FACTORY.getMessage("WSP_0048_POLICY_ELEMENT_EXPECTED_FIRST");
}
/**
@@ -201,11 +199,11 @@
*
*/
public static String WSP_0048_POLICY_ELEMENT_EXPECTED_FIRST() {
- return localizer.localize(localizableWSP_0048_POLICY_ELEMENT_EXPECTED_FIRST());
+ return LOCALIZER.localize(localizableWSP_0048_POLICY_ELEMENT_EXPECTED_FIRST());
}
public static Localizable localizableWSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION() {
- return messageFactory.getMessage("WSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION");
+ return MESSAGE_FACTORY.getMessage("WSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION");
}
/**
@@ -213,11 +211,11 @@
*
*/
public static String WSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION() {
- return localizer.localize(localizableWSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION());
+ return LOCALIZER.localize(localizableWSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION());
}
public static Localizable localizableWSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2);
}
/**
@@ -225,11 +223,11 @@
*
*/
public static String WSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL() {
- return messageFactory.getMessage("WSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL");
}
/**
@@ -237,11 +235,11 @@
*
*/
public static String WSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL() {
- return localizer.localize(localizableWSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL());
+ return LOCALIZER.localize(localizableWSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL());
}
public static Localizable localizableWSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(Object arg0) {
- return messageFactory.getMessage("WSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE", arg0);
}
/**
@@ -249,11 +247,11 @@
*
*/
public static String WSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(Object arg0) {
- return localizer.localize(localizableWSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(arg0));
+ return LOCALIZER.localize(localizableWSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(arg0));
}
public static Localizable localizableWSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(Object arg0) {
- return messageFactory.getMessage("WSP_0008_UNEXPECTED_CHILD_MODEL_TYPE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0008_UNEXPECTED_CHILD_MODEL_TYPE", arg0);
}
/**
@@ -261,11 +259,11 @@
*
*/
public static String WSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(Object arg0) {
- return localizer.localize(localizableWSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(arg0));
+ return LOCALIZER.localize(localizableWSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(arg0));
}
public static Localizable localizableWSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(Object arg0) {
- return messageFactory.getMessage("WSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE", arg0);
}
/**
@@ -273,11 +271,11 @@
*
*/
public static String WSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(Object arg0) {
- return localizer.localize(localizableWSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(arg0));
+ return LOCALIZER.localize(localizableWSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(arg0));
}
public static Localizable localizableWSP_0091_END_ELEMENT_NO_MATCH(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0091_END_ELEMENT_NO_MATCH", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0091_END_ELEMENT_NO_MATCH", arg0, arg1, arg2);
}
/**
@@ -285,11 +283,11 @@
*
*/
public static String WSP_0091_END_ELEMENT_NO_MATCH(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0091_END_ELEMENT_NO_MATCH(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0091_END_ELEMENT_NO_MATCH(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(Object arg0) {
- return messageFactory.getMessage("WSP_0001_UNSUPPORTED_MODEL_NODE_TYPE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0001_UNSUPPORTED_MODEL_NODE_TYPE", arg0);
}
/**
@@ -297,11 +295,11 @@
*
*/
public static String WSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(Object arg0) {
- return localizer.localize(localizableWSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(arg0));
+ return LOCALIZER.localize(localizableWSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(arg0));
}
public static Localizable localizableWSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE() {
- return messageFactory.getMessage("WSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE");
+ return MESSAGE_FACTORY.getMessage("WSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE");
}
/**
@@ -309,11 +307,11 @@
*
*/
public static String WSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE() {
- return localizer.localize(localizableWSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE());
+ return LOCALIZER.localize(localizableWSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE());
}
public static Localizable localizableWSP_0087_UNKNOWN_EVENT(Object arg0) {
- return messageFactory.getMessage("WSP_0087_UNKNOWN_EVENT", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0087_UNKNOWN_EVENT", arg0);
}
/**
@@ -321,11 +319,11 @@
*
*/
public static String WSP_0087_UNKNOWN_EVENT(Object arg0) {
- return localizer.localize(localizableWSP_0087_UNKNOWN_EVENT(arg0));
+ return LOCALIZER.localize(localizableWSP_0087_UNKNOWN_EVENT(arg0));
}
public static Localizable localizableWSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(Object arg0) {
- return messageFactory.getMessage("WSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL", arg0);
}
/**
@@ -333,11 +331,11 @@
*
*/
public static String WSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(Object arg0) {
- return localizer.localize(localizableWSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(arg0));
+ return LOCALIZER.localize(localizableWSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(arg0));
}
public static Localizable localizableWSP_0032_SERVICE_CAN_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0032_SERVICE_CAN_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0032_SERVICE_CAN_NOT_BE_NULL");
}
/**
@@ -345,11 +343,11 @@
*
*/
public static String WSP_0032_SERVICE_CAN_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0032_SERVICE_CAN_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0032_SERVICE_CAN_NOT_BE_NULL());
}
public static Localizable localizableWSP_0093_INVALID_URI(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0093_INVALID_URI", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0093_INVALID_URI", arg0, arg1);
}
/**
@@ -357,11 +355,11 @@
*
*/
public static String WSP_0093_INVALID_URI(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0093_INVALID_URI(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0093_INVALID_URI(arg0, arg1));
}
public static Localizable localizableWSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL");
}
/**
@@ -369,11 +367,11 @@
*
*/
public static String WSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL());
}
public static Localizable localizableWSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(Object arg0) {
- return messageFactory.getMessage("WSP_0079_ERROR_WHILE_RFC2396_UNESCAPING", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0079_ERROR_WHILE_RFC2396_UNESCAPING", arg0);
}
/**
@@ -381,11 +379,11 @@
*
*/
public static String WSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(Object arg0) {
- return localizer.localize(localizableWSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(arg0));
+ return LOCALIZER.localize(localizableWSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(arg0));
}
public static Localizable localizableWSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY() {
- return messageFactory.getMessage("WSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY");
+ return MESSAGE_FACTORY.getMessage("WSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY");
}
/**
@@ -393,11 +391,11 @@
*
*/
public static String WSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY() {
- return localizer.localize(localizableWSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY());
+ return LOCALIZER.localize(localizableWSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY());
}
public static Localizable localizableWSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED() {
- return messageFactory.getMessage("WSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED");
+ return MESSAGE_FACTORY.getMessage("WSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED");
}
/**
@@ -405,11 +403,11 @@
*
*/
public static String WSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED() {
- return localizer.localize(localizableWSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED());
+ return LOCALIZER.localize(localizableWSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED());
}
public static Localizable localizableWSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD() {
- return messageFactory.getMessage("WSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD");
+ return MESSAGE_FACTORY.getMessage("WSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD");
}
/**
@@ -417,11 +415,11 @@
*
*/
public static String WSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD() {
- return localizer.localize(localizableWSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD());
+ return LOCALIZER.localize(localizableWSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD());
}
public static Localizable localizableWSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET() {
- return messageFactory.getMessage("WSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET");
+ return MESSAGE_FACTORY.getMessage("WSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET");
}
/**
@@ -429,11 +427,11 @@
*
*/
public static String WSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET() {
- return localizer.localize(localizableWSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET());
+ return LOCALIZER.localize(localizableWSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET());
}
public static Localizable localizableWSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI() {
- return messageFactory.getMessage("WSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI");
+ return MESSAGE_FACTORY.getMessage("WSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI");
}
/**
@@ -441,11 +439,11 @@
*
*/
public static String WSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI() {
- return localizer.localize(localizableWSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI());
+ return LOCALIZER.localize(localizableWSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI());
}
public static Localizable localizableWSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH", arg0, arg1);
}
/**
@@ -453,11 +451,11 @@
*
*/
public static String WSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(arg0, arg1));
}
public static Localizable localizableWSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(Object arg0) {
- return messageFactory.getMessage("WSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND", arg0);
}
/**
@@ -465,11 +463,11 @@
*
*/
public static String WSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(Object arg0) {
- return localizer.localize(localizableWSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(arg0));
+ return LOCALIZER.localize(localizableWSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(arg0));
}
public static Localizable localizableWSP_0086_FAILED_CREATE_READER(Object arg0) {
- return messageFactory.getMessage("WSP_0086_FAILED_CREATE_READER", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0086_FAILED_CREATE_READER", arg0);
}
/**
@@ -477,11 +475,11 @@
*
*/
public static String WSP_0086_FAILED_CREATE_READER(Object arg0) {
- return localizer.localize(localizableWSP_0086_FAILED_CREATE_READER(arg0));
+ return LOCALIZER.localize(localizableWSP_0086_FAILED_CREATE_READER(arg0));
}
public static Localizable localizableWSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(Object arg0) {
- return messageFactory.getMessage("WSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI", arg0);
}
/**
@@ -489,11 +487,11 @@
*
*/
public static String WSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(Object arg0) {
- return localizer.localize(localizableWSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(arg0));
+ return LOCALIZER.localize(localizableWSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(arg0));
}
public static Localizable localizableWSP_0082_NO_SUBJECT_TYPE() {
- return messageFactory.getMessage("WSP_0082_NO_SUBJECT_TYPE");
+ return MESSAGE_FACTORY.getMessage("WSP_0082_NO_SUBJECT_TYPE");
}
/**
@@ -501,11 +499,11 @@
*
*/
public static String WSP_0082_NO_SUBJECT_TYPE() {
- return localizer.localize(localizableWSP_0082_NO_SUBJECT_TYPE());
+ return LOCALIZER.localize(localizableWSP_0082_NO_SUBJECT_TYPE());
}
public static Localizable localizableWSP_0089_EXPECTED_ELEMENT(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0089_EXPECTED_ELEMENT", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0089_EXPECTED_ELEMENT", arg0, arg1, arg2);
}
/**
@@ -513,11 +511,11 @@
*
*/
public static String WSP_0089_EXPECTED_ELEMENT(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0089_EXPECTED_ELEMENT(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0089_EXPECTED_ELEMENT(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL");
}
/**
@@ -525,11 +523,11 @@
*
*/
public static String WSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL());
}
public static Localizable localizableWSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("WSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2, arg3);
+ return MESSAGE_FACTORY.getMessage("WSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2, arg3);
}
/**
@@ -537,11 +535,11 @@
*
*/
public static String WSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableWSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2, arg3));
+ return LOCALIZER.localize(localizableWSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2, arg3));
}
public static Localizable localizableWSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND() {
- return messageFactory.getMessage("WSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND");
+ return MESSAGE_FACTORY.getMessage("WSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND");
}
/**
@@ -549,11 +547,11 @@
*
*/
public static String WSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND() {
- return localizer.localize(localizableWSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND());
+ return LOCALIZER.localize(localizableWSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND());
}
public static Localizable localizableWSP_0034_REMOVE_OPERATION_NOT_SUPPORTED() {
- return messageFactory.getMessage("WSP_0034_REMOVE_OPERATION_NOT_SUPPORTED");
+ return MESSAGE_FACTORY.getMessage("WSP_0034_REMOVE_OPERATION_NOT_SUPPORTED");
}
/**
@@ -561,11 +559,11 @@
*
*/
public static String WSP_0034_REMOVE_OPERATION_NOT_SUPPORTED() {
- return localizer.localize(localizableWSP_0034_REMOVE_OPERATION_NOT_SUPPORTED());
+ return LOCALIZER.localize(localizableWSP_0034_REMOVE_OPERATION_NOT_SUPPORTED());
}
public static Localizable localizableWSP_0084_MESSAGE_TYPE_NO_MESSAGE() {
- return messageFactory.getMessage("WSP_0084_MESSAGE_TYPE_NO_MESSAGE");
+ return MESSAGE_FACTORY.getMessage("WSP_0084_MESSAGE_TYPE_NO_MESSAGE");
}
/**
@@ -573,11 +571,11 @@
*
*/
public static String WSP_0084_MESSAGE_TYPE_NO_MESSAGE() {
- return localizer.localize(localizableWSP_0084_MESSAGE_TYPE_NO_MESSAGE());
+ return LOCALIZER.localize(localizableWSP_0084_MESSAGE_TYPE_NO_MESSAGE());
}
public static Localizable localizableWSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(Object arg0) {
- return messageFactory.getMessage("WSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE", arg0);
}
/**
@@ -585,11 +583,11 @@
*
*/
public static String WSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(Object arg0) {
- return localizer.localize(localizableWSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(arg0));
+ return LOCALIZER.localize(localizableWSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(arg0));
}
public static Localizable localizableWSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE", arg0, arg1, arg2);
}
/**
@@ -597,11 +595,11 @@
*
*/
public static String WSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(Object arg0) {
- return messageFactory.getMessage("WSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED", arg0);
}
/**
@@ -609,11 +607,11 @@
*
*/
public static String WSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(Object arg0) {
- return localizer.localize(localizableWSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(arg0));
+ return LOCALIZER.localize(localizableWSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(arg0));
}
public static Localizable localizableWSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL() {
- return messageFactory.getMessage("WSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL");
}
/**
@@ -621,11 +619,11 @@
*
*/
public static String WSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL() {
- return localizer.localize(localizableWSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL());
+ return LOCALIZER.localize(localizableWSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL());
}
public static Localizable localizableWSP_0067_ILLEGAL_CFG_FILE_SYNTAX() {
- return messageFactory.getMessage("WSP_0067_ILLEGAL_CFG_FILE_SYNTAX");
+ return MESSAGE_FACTORY.getMessage("WSP_0067_ILLEGAL_CFG_FILE_SYNTAX");
}
/**
@@ -633,11 +631,11 @@
*
*/
public static String WSP_0067_ILLEGAL_CFG_FILE_SYNTAX() {
- return localizer.localize(localizableWSP_0067_ILLEGAL_CFG_FILE_SYNTAX());
+ return LOCALIZER.localize(localizableWSP_0067_ILLEGAL_CFG_FILE_SYNTAX());
}
public static Localizable localizableWSP_0085_MESSAGE_FAULT_NO_NAME() {
- return messageFactory.getMessage("WSP_0085_MESSAGE_FAULT_NO_NAME");
+ return MESSAGE_FACTORY.getMessage("WSP_0085_MESSAGE_FAULT_NO_NAME");
}
/**
@@ -645,11 +643,11 @@
*
*/
public static String WSP_0085_MESSAGE_FAULT_NO_NAME() {
- return localizer.localize(localizableWSP_0085_MESSAGE_FAULT_NO_NAME());
+ return LOCALIZER.localize(localizableWSP_0085_MESSAGE_FAULT_NO_NAME());
}
public static Localizable localizableWSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(Object arg0) {
- return messageFactory.getMessage("WSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE", arg0);
}
/**
@@ -657,11 +655,11 @@
*
*/
public static String WSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(Object arg0) {
- return localizer.localize(localizableWSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(arg0));
+ return LOCALIZER.localize(localizableWSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(arg0));
}
public static Localizable localizableWSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(Object arg0) {
- return messageFactory.getMessage("WSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF", arg0);
}
/**
@@ -669,11 +667,11 @@
*
*/
public static String WSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(Object arg0) {
- return localizer.localize(localizableWSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(arg0));
+ return LOCALIZER.localize(localizableWSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(arg0));
}
public static Localizable localizableWSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE() {
- return messageFactory.getMessage("WSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE");
+ return MESSAGE_FACTORY.getMessage("WSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE");
}
/**
@@ -681,11 +679,11 @@
*
*/
public static String WSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE() {
- return localizer.localize(localizableWSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE());
+ return LOCALIZER.localize(localizableWSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE());
}
public static Localizable localizableWSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP() {
- return messageFactory.getMessage("WSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP");
+ return MESSAGE_FACTORY.getMessage("WSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP");
}
/**
@@ -693,11 +691,11 @@
*
*/
public static String WSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP() {
- return localizer.localize(localizableWSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP());
+ return LOCALIZER.localize(localizableWSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP());
}
public static Localizable localizableWSP_0083_MESSAGE_TYPE_NULL() {
- return messageFactory.getMessage("WSP_0083_MESSAGE_TYPE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0083_MESSAGE_TYPE_NULL");
}
/**
@@ -705,11 +703,11 @@
*
*/
public static String WSP_0083_MESSAGE_TYPE_NULL() {
- return localizer.localize(localizableWSP_0083_MESSAGE_TYPE_NULL());
+ return LOCALIZER.localize(localizableWSP_0083_MESSAGE_TYPE_NULL());
}
public static Localizable localizableWSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED() {
- return messageFactory.getMessage("WSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED");
+ return MESSAGE_FACTORY.getMessage("WSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED");
}
/**
@@ -717,11 +715,11 @@
*
*/
public static String WSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED() {
- return localizer.localize(localizableWSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED());
+ return LOCALIZER.localize(localizableWSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED());
}
public static Localizable localizableWSP_0025_SPI_FAIL_SERVICE_MSG(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0025_SPI_FAIL_SERVICE_MSG", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0025_SPI_FAIL_SERVICE_MSG", arg0, arg1);
}
/**
@@ -729,11 +727,11 @@
*
*/
public static String WSP_0025_SPI_FAIL_SERVICE_MSG(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0025_SPI_FAIL_SERVICE_MSG(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0025_SPI_FAIL_SERVICE_MSG(arg0, arg1));
}
public static Localizable localizableWSP_0094_INVALID_URN() {
- return messageFactory.getMessage("WSP_0094_INVALID_URN");
+ return MESSAGE_FACTORY.getMessage("WSP_0094_INVALID_URN");
}
/**
@@ -741,11 +739,11 @@
*
*/
public static String WSP_0094_INVALID_URN() {
- return localizer.localize(localizableWSP_0094_INVALID_URN());
+ return LOCALIZER.localize(localizableWSP_0094_INVALID_URN());
}
public static Localizable localizableWSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED() {
- return messageFactory.getMessage("WSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED");
+ return MESSAGE_FACTORY.getMessage("WSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED");
}
/**
@@ -753,11 +751,11 @@
*
*/
public static String WSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED() {
- return localizer.localize(localizableWSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED());
+ return LOCALIZER.localize(localizableWSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED());
}
public static Localizable localizableWSP_0078_ASSERTION_CREATOR_DISCOVERED(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0078_ASSERTION_CREATOR_DISCOVERED", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0078_ASSERTION_CREATOR_DISCOVERED", arg0, arg1);
}
/**
@@ -765,11 +763,11 @@
*
*/
public static String WSP_0078_ASSERTION_CREATOR_DISCOVERED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0078_ASSERTION_CREATOR_DISCOVERED(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0078_ASSERTION_CREATOR_DISCOVERED(arg0, arg1));
}
public static Localizable localizableWSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT() {
- return messageFactory.getMessage("WSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT");
+ return MESSAGE_FACTORY.getMessage("WSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT");
}
/**
@@ -777,11 +775,11 @@
*
*/
public static String WSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT() {
- return localizer.localize(localizableWSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT());
+ return LOCALIZER.localize(localizableWSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT());
}
public static Localizable localizableWSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL");
}
/**
@@ -789,11 +787,11 @@
*
*/
public static String WSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL());
}
public static Localizable localizableWSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(Object arg0) {
- return messageFactory.getMessage("WSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR", arg0);
}
/**
@@ -801,11 +799,11 @@
*
*/
public static String WSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(Object arg0) {
- return localizer.localize(localizableWSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(arg0));
+ return LOCALIZER.localize(localizableWSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(arg0));
}
public static Localizable localizableWSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION() {
- return messageFactory.getMessage("WSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION");
+ return MESSAGE_FACTORY.getMessage("WSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION");
}
/**
@@ -813,11 +811,11 @@
*
*/
public static String WSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION() {
- return localizer.localize(localizableWSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION());
+ return LOCALIZER.localize(localizableWSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION());
}
public static Localizable localizableWSP_0027_SERVICE_PROVIDER_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("WSP_0027_SERVICE_PROVIDER_NOT_FOUND", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0027_SERVICE_PROVIDER_NOT_FOUND", arg0);
}
/**
@@ -825,11 +823,11 @@
*
*/
public static String WSP_0027_SERVICE_PROVIDER_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableWSP_0027_SERVICE_PROVIDER_NOT_FOUND(arg0));
+ return LOCALIZER.localize(localizableWSP_0027_SERVICE_PROVIDER_NOT_FOUND(arg0));
}
public static Localizable localizableWSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED() {
- return messageFactory.getMessage("WSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED");
+ return MESSAGE_FACTORY.getMessage("WSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED");
}
/**
@@ -837,11 +835,11 @@
*
*/
public static String WSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED() {
- return localizer.localize(localizableWSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED());
+ return LOCALIZER.localize(localizableWSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED());
}
public static Localizable localizableWSP_0022_STORAGE_TYPE_NOT_SUPPORTED(Object arg0) {
- return messageFactory.getMessage("WSP_0022_STORAGE_TYPE_NOT_SUPPORTED", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0022_STORAGE_TYPE_NOT_SUPPORTED", arg0);
}
/**
@@ -849,11 +847,11 @@
*
*/
public static String WSP_0022_STORAGE_TYPE_NOT_SUPPORTED(Object arg0) {
- return localizer.localize(localizableWSP_0022_STORAGE_TYPE_NOT_SUPPORTED(arg0));
+ return LOCALIZER.localize(localizableWSP_0022_STORAGE_TYPE_NOT_SUPPORTED(arg0));
}
public static Localizable localizableWSP_0095_INVALID_BOOLEAN_VALUE(Object arg0) {
- return messageFactory.getMessage("WSP_0095_INVALID_BOOLEAN_VALUE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0095_INVALID_BOOLEAN_VALUE", arg0);
}
/**
@@ -861,11 +859,11 @@
*
*/
public static String WSP_0095_INVALID_BOOLEAN_VALUE(Object arg0) {
- return localizer.localize(localizableWSP_0095_INVALID_BOOLEAN_VALUE(arg0));
+ return LOCALIZER.localize(localizableWSP_0095_INVALID_BOOLEAN_VALUE(arg0));
}
public static Localizable localizableWSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION", arg0, arg1);
}
/**
@@ -873,11 +871,11 @@
*
*/
public static String WSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(arg0, arg1));
}
public static Localizable localizableWSP_0047_POLICY_IS_NULL_RETURNING() {
- return messageFactory.getMessage("WSP_0047_POLICY_IS_NULL_RETURNING");
+ return MESSAGE_FACTORY.getMessage("WSP_0047_POLICY_IS_NULL_RETURNING");
}
/**
@@ -885,11 +883,11 @@
*
*/
public static String WSP_0047_POLICY_IS_NULL_RETURNING() {
- return localizer.localize(localizableWSP_0047_POLICY_IS_NULL_RETURNING());
+ return LOCALIZER.localize(localizableWSP_0047_POLICY_IS_NULL_RETURNING());
}
public static Localizable localizableWSP_0088_FAILED_PARSE(Object arg0) {
- return messageFactory.getMessage("WSP_0088_FAILED_PARSE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0088_FAILED_PARSE", arg0);
}
/**
@@ -897,11 +895,11 @@
*
*/
public static String WSP_0088_FAILED_PARSE(Object arg0) {
- return localizer.localize(localizableWSP_0088_FAILED_PARSE(arg0));
+ return LOCALIZER.localize(localizableWSP_0088_FAILED_PARSE(arg0));
}
public static Localizable localizableWSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(Object arg0) {
- return messageFactory.getMessage("WSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM", arg0);
}
/**
@@ -909,11 +907,11 @@
*
*/
public static String WSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(Object arg0) {
- return localizer.localize(localizableWSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(arg0));
+ return LOCALIZER.localize(localizableWSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(arg0));
}
public static Localizable localizableWSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE", arg0, arg1);
}
/**
@@ -921,11 +919,11 @@
*
*/
public static String WSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(arg0, arg1));
}
public static Localizable localizableWSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG", arg0, arg1, arg2);
}
/**
@@ -933,11 +931,11 @@
*
*/
public static String WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED", arg0, arg1);
}
/**
@@ -945,11 +943,11 @@
*
*/
public static String WSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(arg0, arg1));
}
public static Localizable localizableWSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL");
}
/**
@@ -957,11 +955,11 @@
*
*/
public static String WSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL());
}
public static Localizable localizableWSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE", arg0, arg1, arg2);
}
/**
@@ -969,11 +967,11 @@
*
*/
public static String WSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL");
}
/**
@@ -981,11 +979,11 @@
*
*/
public static String WSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL());
}
public static Localizable localizableWSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
}
/**
@@ -993,11 +991,11 @@
*
*/
public static String WSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
}
public static Localizable localizableWSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(Object arg0) {
- return messageFactory.getMessage("WSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN", arg0);
}
/**
@@ -1005,11 +1003,11 @@
*
*/
public static String WSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(Object arg0) {
- return localizer.localize(localizableWSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(arg0));
+ return LOCALIZER.localize(localizableWSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(arg0));
}
public static Localizable localizableWSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT() {
- return messageFactory.getMessage("WSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT");
+ return MESSAGE_FACTORY.getMessage("WSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT");
}
/**
@@ -1017,11 +1015,11 @@
*
*/
public static String WSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT() {
- return localizer.localize(localizableWSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT());
+ return LOCALIZER.localize(localizableWSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT());
}
public static Localizable localizableWSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(Object arg0) {
- return messageFactory.getMessage("WSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED", arg0);
}
/**
@@ -1029,11 +1027,11 @@
*
*/
public static String WSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(Object arg0) {
- return localizer.localize(localizableWSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(arg0));
+ return LOCALIZER.localize(localizableWSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(arg0));
}
public static Localizable localizableWSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED", arg0, arg1);
}
/**
@@ -1041,11 +1039,11 @@
*
*/
public static String WSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(arg0, arg1));
}
public static Localizable localizableWSP_0002_UNRECOGNIZED_SCOPE_TYPE(Object arg0) {
- return messageFactory.getMessage("WSP_0002_UNRECOGNIZED_SCOPE_TYPE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0002_UNRECOGNIZED_SCOPE_TYPE", arg0);
}
/**
@@ -1053,11 +1051,11 @@
*
*/
public static String WSP_0002_UNRECOGNIZED_SCOPE_TYPE(Object arg0) {
- return localizer.localize(localizableWSP_0002_UNRECOGNIZED_SCOPE_TYPE(arg0));
+ return LOCALIZER.localize(localizableWSP_0002_UNRECOGNIZED_SCOPE_TYPE(arg0));
}
public static Localizable localizableWSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL");
}
/**
@@ -1065,11 +1063,11 @@
*
*/
public static String WSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL());
+ return LOCALIZER.localize(localizableWSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL());
}
public static Localizable localizableWSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("WSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION", arg0);
}
/**
@@ -1077,11 +1075,11 @@
*
*/
public static String WSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(Object arg0) {
- return localizer.localize(localizableWSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(arg0));
+ return LOCALIZER.localize(localizableWSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(arg0));
}
public static Localizable localizableWSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
}
/**
@@ -1089,11 +1087,11 @@
*
*/
public static String WSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
}
public static Localizable localizableWSP_0075_PROBLEMATIC_ASSERTION_STATE(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_0075_PROBLEMATIC_ASSERTION_STATE", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_0075_PROBLEMATIC_ASSERTION_STATE", arg0, arg1);
}
/**
@@ -1101,11 +1099,11 @@
*
*/
public static String WSP_0075_PROBLEMATIC_ASSERTION_STATE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_0075_PROBLEMATIC_ASSERTION_STATE(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_0075_PROBLEMATIC_ASSERTION_STATE(arg0, arg1));
}
public static Localizable localizableWSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES() {
- return messageFactory.getMessage("WSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES");
+ return MESSAGE_FACTORY.getMessage("WSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES");
}
/**
@@ -1113,11 +1111,11 @@
*
*/
public static String WSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES() {
- return localizer.localize(localizableWSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES());
+ return LOCALIZER.localize(localizableWSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES());
}
public static Localizable localizableWSP_0092_CHARACTER_DATA_UNEXPECTED(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("WSP_0092_CHARACTER_DATA_UNEXPECTED", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("WSP_0092_CHARACTER_DATA_UNEXPECTED", arg0, arg1, arg2);
}
/**
@@ -1125,11 +1123,11 @@
*
*/
public static String WSP_0092_CHARACTER_DATA_UNEXPECTED(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSP_0092_CHARACTER_DATA_UNEXPECTED(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSP_0092_CHARACTER_DATA_UNEXPECTED(arg0, arg1, arg2));
}
public static Localizable localizableWSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(Object arg0) {
- return messageFactory.getMessage("WSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY", arg0);
}
/**
@@ -1137,11 +1135,11 @@
*
*/
public static String WSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(Object arg0) {
- return localizer.localize(localizableWSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(arg0));
+ return LOCALIZER.localize(localizableWSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(arg0));
}
public static Localizable localizableWSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(Object arg0) {
- return messageFactory.getMessage("WSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING", arg0);
}
/**
@@ -1149,11 +1147,11 @@
*
*/
public static String WSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(Object arg0) {
- return localizer.localize(localizableWSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(arg0));
+ return LOCALIZER.localize(localizableWSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(arg0));
}
public static Localizable localizableWSP_0035_RECONFIGURE_ALTERNATIVES(Object arg0) {
- return messageFactory.getMessage("WSP_0035_RECONFIGURE_ALTERNATIVES", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0035_RECONFIGURE_ALTERNATIVES", arg0);
}
/**
@@ -1161,11 +1159,11 @@
*
*/
public static String WSP_0035_RECONFIGURE_ALTERNATIVES(Object arg0) {
- return localizer.localize(localizableWSP_0035_RECONFIGURE_ALTERNATIVES(arg0));
+ return LOCALIZER.localize(localizableWSP_0035_RECONFIGURE_ALTERNATIVES(arg0));
}
public static Localizable localizableWSP_0066_ILLEGAL_PROVIDER_CLASSNAME(Object arg0) {
- return messageFactory.getMessage("WSP_0066_ILLEGAL_PROVIDER_CLASSNAME", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0066_ILLEGAL_PROVIDER_CLASSNAME", arg0);
}
/**
@@ -1173,11 +1171,11 @@
*
*/
public static String WSP_0066_ILLEGAL_PROVIDER_CLASSNAME(Object arg0) {
- return localizer.localize(localizableWSP_0066_ILLEGAL_PROVIDER_CLASSNAME(arg0));
+ return LOCALIZER.localize(localizableWSP_0066_ILLEGAL_PROVIDER_CLASSNAME(arg0));
}
public static Localizable localizableWSP_0076_NO_SERVICE_PROVIDERS_FOUND(Object arg0) {
- return messageFactory.getMessage("WSP_0076_NO_SERVICE_PROVIDERS_FOUND", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_0076_NO_SERVICE_PROVIDERS_FOUND", arg0);
}
/**
@@ -1185,11 +1183,11 @@
*
*/
public static String WSP_0076_NO_SERVICE_PROVIDERS_FOUND(Object arg0) {
- return localizer.localize(localizableWSP_0076_NO_SERVICE_PROVIDERS_FOUND(arg0));
+ return LOCALIZER.localize(localizableWSP_0076_NO_SERVICE_PROVIDERS_FOUND(arg0));
}
public static Localizable localizableWSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED() {
- return messageFactory.getMessage("WSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED");
+ return MESSAGE_FACTORY.getMessage("WSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED");
}
/**
@@ -1197,7 +1195,18 @@
*
*/
public static String WSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED() {
- return localizer.localize(localizableWSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED());
+ return LOCALIZER.localize(localizableWSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED());
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -27,8 +27,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
import java.util.WeakHashMap;
/**
@@ -36,9 +34,7 @@
*/
abstract class ContextClassloaderLocal {
- private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
-
- private WeakHashMap CACHE = new WeakHashMap();
+ private WeakHashMap CACHE = new WeakHashMap<>();
public V get() throws Error {
ClassLoader tccl = getContextClassLoader();
@@ -60,25 +56,21 @@
try {
return initialValue();
} catch (Exception e) {
- throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
+ throw new Error(ContextClassloaderLocalMessages.FAILED_TO_CREATE_NEW_INSTANCE(getClass().getName()), e);
}
}
- private static String format(String property, Object... args) {
- String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
- return MessageFormat.format(text, args);
- }
-
private static ClassLoader getContextClassLoader() {
return AccessController.doPrivileged(new PrivilegedAction() {
- public ClassLoader run() {
- ClassLoader cl = null;
- try {
- cl = Thread.currentThread().getContextClassLoader();
- } catch (SecurityException ex) {
- }
- return cl;
- }
- });
+ @Override
+ public ClassLoader run() {
+ ClassLoader cl = null;
+ try {
+ cl = Thread.currentThread().getContextClassLoader();
+ } catch (SecurityException ex) {
+ }
+ return cl;
+ }
+ });
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.ws.policy.sourcemodel.attach;
+
+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;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
+public final class ContextClassloaderLocalMessages {
+
+ private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.policy.sourcemodel.attach.ContextClassloaderLocal";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ContextClassloaderLocalMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableFAILED_TO_CREATE_NEW_INSTANCE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("FAILED_TO_CREATE_NEW_INSTANCE", arg0);
+ }
+
+ /**
+ * Failed to create new instance of {0}
+ *
+ */
+ public static String FAILED_TO_CREATE_NEW_INSTANCE(Object arg0) {
+ return LOCALIZER.localize(localizableFAILED_TO_CREATE_NEW_INSTANCE(arg0));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
+ }
+
+}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,54 +25,100 @@
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 AddressingMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.addressing";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, AddressingMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new AddressingMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ public static Localizable localizableADDRESSING_NOT_ENABLED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("addressing.notEnabled", arg0);
}
- public static Localizable localizableNON_ANONYMOUS_RESPONSE_ONEWAY() {
- return messageFactory.getMessage("nonAnonymous.response.oneway");
+ /**
+ * Addressing is not enabled, {0} should not be included in the pipeline"
+ *
+ */
+ public static String ADDRESSING_NOT_ENABLED(Object arg0) {
+ return LOCALIZER.localize(localizableADDRESSING_NOT_ENABLED(arg0));
+ }
+
+ public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() {
+ return MESSAGE_FACTORY.getMessage("wsaw.anonymousProhibited");
+ }
+
+ /**
+ * Operation has "prohibited" value for wsaw:anonymous in the WSDL, Addressing must be disabled and SOAP message need to be hand-crafted
+ *
+ */
+ public static String WSAW_ANONYMOUS_PROHIBITED() {
+ return LOCALIZER.localize(localizableWSAW_ANONYMOUS_PROHIBITED());
+ }
+
+ public static Localizable localizableNULL_SOAP_VERSION() {
+ return MESSAGE_FACTORY.getMessage("null.soap.version");
}
/**
- * Ignoring non-anonymous response for one-way message
+ * Unexpected null SOAP version
*
*/
- public static String NON_ANONYMOUS_RESPONSE_ONEWAY() {
- return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_ONEWAY());
+ public static String NULL_SOAP_VERSION() {
+ return LOCALIZER.localize(localizableNULL_SOAP_VERSION());
}
- public static Localizable localizableNULL_WSA_HEADERS() {
- return messageFactory.getMessage("null.wsa.headers");
+ public static Localizable localizableNULL_HEADERS() {
+ return MESSAGE_FACTORY.getMessage("null.headers");
}
/**
- * No WS-Addressing headers found processing the server inbound request
+ * No headers found when processing the server inbound request and WS-Addressing is required
+ *
+ */
+ public static String NULL_HEADERS() {
+ return LOCALIZER.localize(localizableNULL_HEADERS());
+ }
+
+ public static Localizable localizableFAULT_TO_CANNOT_PARSE() {
+ return MESSAGE_FACTORY.getMessage("faultTo.cannot.parse");
+ }
+
+ /**
+ * FaultTo header cannot be parsed
*
*/
- public static String NULL_WSA_HEADERS() {
- return localizer.localize(localizableNULL_WSA_HEADERS());
+ public static String FAULT_TO_CANNOT_PARSE() {
+ return LOCALIZER.localize(localizableFAULT_TO_CANNOT_PARSE());
+ }
+
+ public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("nonAnonymous.response.nullHeaders", arg0);
+ }
+
+ /**
+ * No response headers found in non-anonymous response from "{0}"
+ *
+ */
+ public static String NON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
+ return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(arg0));
}
public static Localizable localizableUNKNOWN_WSA_HEADER() {
- return messageFactory.getMessage("unknown.wsa.header");
+ return MESSAGE_FACTORY.getMessage("unknown.wsa.header");
}
/**
@@ -80,23 +126,83 @@
*
*/
public static String UNKNOWN_WSA_HEADER() {
- return localizer.localize(localizableUNKNOWN_WSA_HEADER());
+ return LOCALIZER.localize(localizableUNKNOWN_WSA_HEADER());
+ }
+
+ public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.addressing.header.exception", arg0, arg1);
+ }
+
+ /**
+ * Invalid WS-Addressing header: "{0}",Reason: "{1}"
+ *
+ */
+ public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1));
}
- public static Localizable localizableNULL_ACTION() {
- return messageFactory.getMessage("null.action");
+ public static Localizable localizableNULL_WSDL_PORT() {
+ return MESSAGE_FACTORY.getMessage("null.wsdlPort");
+ }
+
+ /**
+ * Populating request Addressing headers and found null WSDLPort
+ *
+ */
+ public static String NULL_WSDL_PORT() {
+ return LOCALIZER.localize(localizableNULL_WSDL_PORT());
+ }
+
+ public static Localizable localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("nonAnonymous.unknown.protocol", arg0);
}
/**
- * Populating request Addressing headers and found null Action
+ * Unknown protocol: "{0}"
+ *
+ */
+ public static String NON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
+ return LOCALIZER.localize(localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(arg0));
+ }
+
+ public static Localizable localizableNON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("nonAnonymous.response.sending", arg0);
+ }
+
+ /**
+ * Sending non-anonymous reply to "{0}"
*
*/
- public static String NULL_ACTION() {
- return localizer.localize(localizableNULL_ACTION());
+ public static String NON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
+ return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_SENDING(arg0));
+ }
+
+ public static Localizable localizableNON_ANONYMOUS_RESPONSE() {
+ return MESSAGE_FACTORY.getMessage("nonAnonymous.response");
+ }
+
+ /**
+ * Sending 202 and processing non-anonymous response
+ *
+ */
+ public static String NON_ANONYMOUS_RESPONSE() {
+ return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE());
+ }
+
+ public static Localizable localizableREPLY_TO_CANNOT_PARSE() {
+ return MESSAGE_FACTORY.getMessage("replyTo.cannot.parse");
+ }
+
+ /**
+ * ReplyTo header cannot be parsed
+ *
+ */
+ public static String REPLY_TO_CANNOT_PARSE() {
+ return LOCALIZER.localize(localizableREPLY_TO_CANNOT_PARSE());
}
public static Localizable localizableINVALID_WSAW_ANONYMOUS(Object arg0) {
- return messageFactory.getMessage("invalid.wsaw.anonymous", arg0);
+ return MESSAGE_FACTORY.getMessage("invalid.wsaw.anonymous", arg0);
}
/**
@@ -104,23 +210,23 @@
*
*/
public static String INVALID_WSAW_ANONYMOUS(Object arg0) {
- return localizer.localize(localizableINVALID_WSAW_ANONYMOUS(arg0));
+ return LOCALIZER.localize(localizableINVALID_WSAW_ANONYMOUS(arg0));
}
- public static Localizable localizableNULL_SOAP_VERSION() {
- return messageFactory.getMessage("null.soap.version");
+ public static Localizable localizableVALIDATION_CLIENT_NULL_ACTION() {
+ return MESSAGE_FACTORY.getMessage("validation.client.nullAction");
}
/**
- * Unexpected null SOAP version
+ * Validating inbound Addressing headers on client and found null Action
*
*/
- public static String NULL_SOAP_VERSION() {
- return localizer.localize(localizableNULL_SOAP_VERSION());
+ public static String VALIDATION_CLIENT_NULL_ACTION() {
+ return LOCALIZER.localize(localizableVALIDATION_CLIENT_NULL_ACTION());
}
public static Localizable localizableWSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("wsdlBoundOperation.notFound", arg0);
+ return MESSAGE_FACTORY.getMessage("wsdlBoundOperation.notFound", arg0);
}
/**
@@ -128,35 +234,59 @@
*
*/
public static String WSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableWSDL_BOUND_OPERATION_NOT_FOUND(arg0));
+ return LOCALIZER.localize(localizableWSDL_BOUND_OPERATION_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("missing.header.exception", arg0);
}
- public static Localizable localizableNON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("non.unique.operation.signature", arg0, arg1, arg2, arg3);
+ /**
+ * Missing WS-Addressing header: "{0}"
+ *
+ */
+ public static String MISSING_HEADER_EXCEPTION(Object arg0) {
+ return LOCALIZER.localize(localizableMISSING_HEADER_EXCEPTION(arg0));
+ }
+
+ public static Localizable localizableNULL_BINDING() {
+ return MESSAGE_FACTORY.getMessage("null.binding");
}
/**
- * Operations in a port should have unique operation signature to successfuly identify a associated wsdl operation for a message. WSDL operation {0} and {1} have the same operation signature, wsa:Action "{2}" and request body block "{3}", Method dispatching may fail at runtime. Use unique wsa:Action for each operation
+ * Populating request Addressing headers and found null Binding
*
*/
- public static String NON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableNON_UNIQUE_OPERATION_SIGNATURE(arg0, arg1, arg2, arg3));
+ public static String NULL_BINDING() {
+ return LOCALIZER.localize(localizableNULL_BINDING());
}
- public static Localizable localizableNON_ANONYMOUS_RESPONSE() {
- return messageFactory.getMessage("nonAnonymous.response");
+ public static Localizable localizableNULL_WSA_HEADERS() {
+ return MESSAGE_FACTORY.getMessage("null.wsa.headers");
}
/**
- * Sending 202 and processing non-anonymous response
+ * No WS-Addressing headers found processing the server inbound request
*
*/
- public static String NON_ANONYMOUS_RESPONSE() {
- return localizer.localize(localizableNON_ANONYMOUS_RESPONSE());
+ public static String NULL_WSA_HEADERS() {
+ return LOCALIZER.localize(localizableNULL_WSA_HEADERS());
+ }
+
+ public static Localizable localizableNON_ANONYMOUS_RESPONSE_ONEWAY() {
+ return MESSAGE_FACTORY.getMessage("nonAnonymous.response.oneway");
+ }
+
+ /**
+ * Ignoring non-anonymous response for one-way message
+ *
+ */
+ public static String NON_ANONYMOUS_RESPONSE_ONEWAY() {
+ return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_ONEWAY());
}
public static Localizable localizableVALIDATION_SERVER_NULL_ACTION() {
- return messageFactory.getMessage("validation.server.nullAction");
+ return MESSAGE_FACTORY.getMessage("validation.server.nullAction");
}
/**
@@ -164,35 +294,35 @@
*
*/
public static String VALIDATION_SERVER_NULL_ACTION() {
- return localizer.localize(localizableVALIDATION_SERVER_NULL_ACTION());
+ return LOCALIZER.localize(localizableVALIDATION_SERVER_NULL_ACTION());
}
- public static Localizable localizableFAULT_TO_CANNOT_PARSE() {
- return messageFactory.getMessage("faultTo.cannot.parse");
+ public static Localizable localizableWRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wrong.addressing.version", arg0, arg1);
}
/**
- * FaultTo header cannot be parsed
+ * Expected "{0}" version of WS-Addressing but found "{1}"
*
*/
- public static String FAULT_TO_CANNOT_PARSE() {
- return localizer.localize(localizableFAULT_TO_CANNOT_PARSE());
+ public static String WRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWRONG_ADDRESSING_VERSION(arg0, arg1));
}
- public static Localizable localizableVALIDATION_CLIENT_NULL_ACTION() {
- return messageFactory.getMessage("validation.client.nullAction");
+ public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("action.not.supported.exception", arg0);
}
/**
- * Validating inbound Addressing headers on client and found null Action
+ * Action: "{0}" not supported
*
*/
- public static String VALIDATION_CLIENT_NULL_ACTION() {
- return localizer.localize(localizableVALIDATION_CLIENT_NULL_ACTION());
+ public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
+ return LOCALIZER.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0));
}
public static Localizable localizableNULL_MESSAGE() {
- return messageFactory.getMessage("null.message");
+ return MESSAGE_FACTORY.getMessage("null.message");
}
/**
@@ -200,95 +330,11 @@
*
*/
public static String NULL_MESSAGE() {
- return localizer.localize(localizableNULL_MESSAGE());
- }
-
- public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("action.not.supported.exception", arg0);
- }
-
- /**
- * Action: "{0}" not supported
- *
- */
- public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
- return localizer.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0));
- }
-
- public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
- return messageFactory.getMessage("nonAnonymous.response.nullHeaders", arg0);
- }
-
- /**
- * No response headers found in non-anonymous response from "{0}"
- *
- */
- public static String NON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
- return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(arg0));
- }
-
- public static Localizable localizableNON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
- return messageFactory.getMessage("nonAnonymous.response.sending", arg0);
- }
-
- /**
- * Sending non-anonymous reply to "{0}"
- *
- */
- public static String NON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
- return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_SENDING(arg0));
- }
-
- public static Localizable localizableREPLY_TO_CANNOT_PARSE() {
- return messageFactory.getMessage("replyTo.cannot.parse");
- }
-
- /**
- * ReplyTo header cannot be parsed
- *
- */
- public static String REPLY_TO_CANNOT_PARSE() {
- return localizer.localize(localizableREPLY_TO_CANNOT_PARSE());
- }
-
- public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.addressing.header.exception", arg0, arg1);
- }
-
- /**
- * Invalid WS-Addressing header: "{0}",Reason: "{1}"
- *
- */
- public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1));
- }
-
- public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() {
- return messageFactory.getMessage("wsaw.anonymousProhibited");
- }
-
- /**
- * Operation has "prohibited" value for wsaw:anonymous in the WSDL, Addressing must be disabled and SOAP message need to be hand-crafted
- *
- */
- public static String WSAW_ANONYMOUS_PROHIBITED() {
- return localizer.localize(localizableWSAW_ANONYMOUS_PROHIBITED());
- }
-
- public static Localizable localizableNULL_WSDL_PORT() {
- return messageFactory.getMessage("null.wsdlPort");
- }
-
- /**
- * Populating request Addressing headers and found null WSDLPort
- *
- */
- public static String NULL_WSDL_PORT() {
- return localizer.localize(localizableNULL_WSDL_PORT());
+ return LOCALIZER.localize(localizableNULL_MESSAGE());
}
public static Localizable localizableADDRESSING_SHOULD_BE_ENABLED() {
- return messageFactory.getMessage("addressing.should.be.enabled.");
+ return MESSAGE_FACTORY.getMessage("addressing.should.be.enabled.");
}
/**
@@ -296,35 +342,11 @@
*
*/
public static String ADDRESSING_SHOULD_BE_ENABLED() {
- return localizer.localize(localizableADDRESSING_SHOULD_BE_ENABLED());
- }
-
- public static Localizable localizableNULL_ADDRESSING_VERSION() {
- return messageFactory.getMessage("null.addressing.version");
- }
-
- /**
- * Unexpected null Addressing version
- *
- */
- public static String NULL_ADDRESSING_VERSION() {
- return localizer.localize(localizableNULL_ADDRESSING_VERSION());
- }
-
- public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("missing.header.exception", arg0);
- }
-
- /**
- * Missing WS-Addressing header: "{0}"
- *
- */
- public static String MISSING_HEADER_EXCEPTION(Object arg0) {
- return localizer.localize(localizableMISSING_HEADER_EXCEPTION(arg0));
+ return LOCALIZER.localize(localizableADDRESSING_SHOULD_BE_ENABLED());
}
public static Localizable localizableNULL_PACKET() {
- return messageFactory.getMessage("null.packet");
+ return MESSAGE_FACTORY.getMessage("null.packet");
}
/**
@@ -332,67 +354,54 @@
*
*/
public static String NULL_PACKET() {
- return localizer.localize(localizableNULL_PACKET());
+ return LOCALIZER.localize(localizableNULL_PACKET());
}
- public static Localizable localizableWRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
- return messageFactory.getMessage("wrong.addressing.version", arg0, arg1);
+ public static Localizable localizableNULL_ADDRESSING_VERSION() {
+ return MESSAGE_FACTORY.getMessage("null.addressing.version");
}
/**
- * Expected "{0}" version of WS-Addressing but found "{1}"
+ * Unexpected null Addressing version
*
*/
- public static String WRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
- return localizer.localize(localizableWRONG_ADDRESSING_VERSION(arg0, arg1));
- }
-
- public static Localizable localizableADDRESSING_NOT_ENABLED(Object arg0) {
- return messageFactory.getMessage("addressing.notEnabled", arg0);
+ public static String NULL_ADDRESSING_VERSION() {
+ return LOCALIZER.localize(localizableNULL_ADDRESSING_VERSION());
}
- /**
- * Addressing is not enabled, {0} should not be included in the pipeline"
- *
- */
- public static String ADDRESSING_NOT_ENABLED(Object arg0) {
- return localizer.localize(localizableADDRESSING_NOT_ENABLED(arg0));
- }
-
- public static Localizable localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
- return messageFactory.getMessage("nonAnonymous.unknown.protocol", arg0);
+ public static Localizable localizableNULL_ACTION() {
+ return MESSAGE_FACTORY.getMessage("null.action");
}
/**
- * Unknown protocol: "{0}"
+ * Populating request Addressing headers and found null Action
*
*/
- public static String NON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
- return localizer.localize(localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(arg0));
+ public static String NULL_ACTION() {
+ return LOCALIZER.localize(localizableNULL_ACTION());
}
- public static Localizable localizableNULL_HEADERS() {
- return messageFactory.getMessage("null.headers");
+ public static Localizable localizableNON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
+ return MESSAGE_FACTORY.getMessage("non.unique.operation.signature", arg0, arg1, arg2, arg3);
}
/**
- * No headers found when processing the server inbound request and WS-Addressing is required
+ * Operations in a port should have unique operation signature to successfuly identify a associated wsdl operation for a message. WSDL operation {0} and {1} have the same operation signature, wsa:Action "{2}" and request body block "{3}", Method dispatching may fail at runtime. Use unique wsa:Action for each operation
*
*/
- public static String NULL_HEADERS() {
- return localizer.localize(localizableNULL_HEADERS());
+ public static String NON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
+ return LOCALIZER.localize(localizableNON_UNIQUE_OPERATION_SIGNATURE(arg0, arg1, arg2, arg3));
}
- public static Localizable localizableNULL_BINDING() {
- return messageFactory.getMessage("null.binding");
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- /**
- * Populating request Addressing headers and found null Binding
- *
- */
- public static String NULL_BINDING() {
- return localizer.localize(localizableNULL_BINDING());
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,28 @@
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 BindingApiMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.bindingApi";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, BindingApiMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new BindingApiMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableBINDING_API_NO_FAULT_MESSAGE_NAME() {
- return messageFactory.getMessage("binding.api.no.fault.message.name");
+ return MESSAGE_FACTORY.getMessage("binding.api.no.fault.message.name");
}
/**
@@ -56,7 +54,18 @@
*
*/
public static String BINDING_API_NO_FAULT_MESSAGE_NAME() {
- return localizer.localize(localizableBINDING_API_NO_FAULT_MESSAGE_NAME());
+ return LOCALIZER.localize(localizableBINDING_API_NO_FAULT_MESSAGE_NAME());
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,55 +25,64 @@
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 ClientMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.client";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ClientMessages::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.client";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ClientMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- public static Localizable localizableFAILED_TO_PARSE(Object arg0, Object arg1) {
- return messageFactory.getMessage("failed.to.parse", arg0, arg1);
+ public static Localizable localizableINVALID_WSDL_URL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.wsdl.url", arg0);
}
/**
- * Failed to access the WSDL at: {0}. It failed with:
- * {1}.
+ * Invalid WSDL URL: {0}
*
*/
- public static String FAILED_TO_PARSE(Object arg0, Object arg1) {
- return localizer.localize(localizableFAILED_TO_PARSE(arg0, arg1));
+ public static String INVALID_WSDL_URL(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_WSDL_URL(arg0));
}
- public static Localizable localizableINVALID_BINDING_ID(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.binding.id", arg0, arg1);
+ public static Localizable localizableINVALID_EPR_PORT_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.epr.port.name", arg0, arg1);
}
/**
- * Invalid binding id: {0}. Must be: {1}
+ * EndpointName specified in EPR {0} is not a WSDL port QName, valid Ports are {1}
*
*/
- public static String INVALID_BINDING_ID(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_BINDING_ID(arg0, arg1));
+ public static String INVALID_EPR_PORT_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_EPR_PORT_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableINVALID_SOAP_ROLE_NONE() {
+ return MESSAGE_FACTORY.getMessage("invalid.soap.role.none");
+ }
+
+ /**
+ * Cannot set SOAP 1.2 role "none"
+ *
+ */
+ public static String INVALID_SOAP_ROLE_NONE() {
+ return LOCALIZER.localize(localizableINVALID_SOAP_ROLE_NONE());
}
public static Localizable localizableEPR_WITHOUT_ADDRESSING_ON() {
- return messageFactory.getMessage("epr.without.addressing.on");
+ return MESSAGE_FACTORY.getMessage("epr.without.addressing.on");
}
/**
@@ -81,71 +90,11 @@
*
*/
public static String EPR_WITHOUT_ADDRESSING_ON() {
- return localizer.localize(localizableEPR_WITHOUT_ADDRESSING_ON());
- }
-
- public static Localizable localizableINVALID_SERVICE_NO_WSDL(Object arg0) {
- return messageFactory.getMessage("invalid.service.no.wsdl", arg0);
- }
-
- /**
- * No wsdl metadata for service: {0}, can't create proxy! Try creating Service by providing a WSDL URL
- *
- */
- public static String INVALID_SERVICE_NO_WSDL(Object arg0) {
- return localizer.localize(localizableINVALID_SERVICE_NO_WSDL(arg0));
- }
-
- public static Localizable localizableINVALID_SOAP_ROLE_NONE() {
- return messageFactory.getMessage("invalid.soap.role.none");
- }
-
- /**
- * Cannot set SOAP 1.2 role "none"
- *
- */
- public static String INVALID_SOAP_ROLE_NONE() {
- return localizer.localize(localizableINVALID_SOAP_ROLE_NONE());
- }
-
- public static Localizable localizableUNDEFINED_BINDING(Object arg0) {
- return messageFactory.getMessage("undefined.binding", arg0);
- }
-
- /**
- * Undefined binding: {0}
- *
- */
- public static String UNDEFINED_BINDING(Object arg0) {
- return localizer.localize(localizableUNDEFINED_BINDING(arg0));
- }
-
- public static Localizable localizableHTTP_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("http.not.found", arg0);
- }
-
- /**
- * HTTP Status-Code 404: Not Found - {0}
- *
- */
- public static String HTTP_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableHTTP_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableINVALID_EPR_PORT_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.epr.port.name", arg0, arg1);
- }
-
- /**
- * EndpointName specified in EPR {0} is not a WSDL port QName, valid Ports are {1}
- *
- */
- public static String INVALID_EPR_PORT_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_EPR_PORT_NAME(arg0, arg1));
+ return LOCALIZER.localize(localizableEPR_WITHOUT_ADDRESSING_ON());
}
public static Localizable localizableFAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("failed.to.parseWithMEX", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("failed.to.parseWithMEX", arg0, arg1, arg2);
}
/**
@@ -156,11 +105,11 @@
*
*/
public static String FAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableFAILED_TO_PARSE_WITH_MEX(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableFAILED_TO_PARSE_WITH_MEX(arg0, arg1, arg2));
}
public static Localizable localizableHTTP_STATUS_CODE(Object arg0, Object arg1) {
- return messageFactory.getMessage("http.status.code", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("http.status.code", arg0, arg1);
}
/**
@@ -168,83 +117,23 @@
*
*/
public static String HTTP_STATUS_CODE(Object arg0, Object arg1) {
- return localizer.localize(localizableHTTP_STATUS_CODE(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_ADDRESS(Object arg0) {
- return messageFactory.getMessage("invalid.address", arg0);
- }
-
- /**
- * Invalid address: {0}
- *
- */
- public static String INVALID_ADDRESS(Object arg0) {
- return localizer.localize(localizableINVALID_ADDRESS(arg0));
+ return LOCALIZER.localize(localizableHTTP_STATUS_CODE(arg0, arg1));
}
- public static Localizable localizableUNDEFINED_PORT_TYPE(Object arg0) {
- return messageFactory.getMessage("undefined.portType", arg0);
- }
-
- /**
- * Undefined port type: {0}
- *
- */
- public static String UNDEFINED_PORT_TYPE(Object arg0) {
- return localizer.localize(localizableUNDEFINED_PORT_TYPE(arg0));
- }
-
- public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) {
- return messageFactory.getMessage("wsdl.contains.no.service", arg0);
+ public static Localizable localizableINVALID_SERVICE_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.service.name", arg0, arg1);
}
/**
- * WSDL {0} contains no service definition.
- *
- */
- public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) {
- return localizer.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0));
- }
-
- public static Localizable localizableINVALID_SOAP_ACTION() {
- return messageFactory.getMessage("invalid.soap.action");
- }
-
- /**
- * A valid SOAPAction should be set in the RequestContext when Addressing is enabled, Use BindingProvider.SOAPACTION_URI_PROPERTY to set it.
+ * {0} is not a valid service. Valid services are: {1}
*
*/
- public static String INVALID_SOAP_ACTION() {
- return localizer.localize(localizableINVALID_SOAP_ACTION());
- }
-
- public static Localizable localizableNON_LOGICAL_HANDLER_SET(Object arg0) {
- return messageFactory.getMessage("non.logical.handler.set", arg0);
- }
-
- /**
- * Cannot set {0} on binding. Handler must be a LogicalHandler.
- *
- */
- public static String NON_LOGICAL_HANDLER_SET(Object arg0) {
- return localizer.localize(localizableNON_LOGICAL_HANDLER_SET(arg0));
- }
-
- public static Localizable localizableLOCAL_CLIENT_FAILED(Object arg0) {
- return messageFactory.getMessage("local.client.failed", arg0);
- }
-
- /**
- * local transport error: {0}
- *
- */
- public static String LOCAL_CLIENT_FAILED(Object arg0) {
- return localizer.localize(localizableLOCAL_CLIENT_FAILED(arg0));
+ public static String INVALID_SERVICE_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_SERVICE_NAME(arg0, arg1));
}
public static Localizable localizableRUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("runtime.wsdlparser.invalidWSDL", arg0, arg1, arg2, arg3);
+ return MESSAGE_FACTORY.getMessage("runtime.wsdlparser.invalidWSDL", arg0, arg1, arg2, arg3);
}
/**
@@ -252,11 +141,96 @@
*
*/
public static String RUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableRUNTIME_WSDLPARSER_INVALID_WSDL(arg0, arg1, arg2, arg3));
+ return LOCALIZER.localize(localizableRUNTIME_WSDLPARSER_INVALID_WSDL(arg0, arg1, arg2, arg3));
+ }
+
+ public static Localizable localizableNON_LOGICAL_HANDLER_SET(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("non.logical.handler.set", arg0);
+ }
+
+ /**
+ * Cannot set {0} on binding. Handler must be a LogicalHandler.
+ *
+ */
+ public static String NON_LOGICAL_HANDLER_SET(Object arg0) {
+ return LOCALIZER.localize(localizableNON_LOGICAL_HANDLER_SET(arg0));
+ }
+
+ public static Localizable localizableINVALID_PORT_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.port.name", arg0, arg1);
+ }
+
+ /**
+ * {0} is not a valid port. Valid ports are: {1}
+ *
+ */
+ public static String INVALID_PORT_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_PORT_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableINVALID_SOAP_ACTION() {
+ return MESSAGE_FACTORY.getMessage("invalid.soap.action");
+ }
+
+ /**
+ * A valid SOAPAction should be set in the RequestContext when Addressing is enabled, Use BindingProvider.SOAPACTION_URI_PROPERTY to set it.
+ *
+ */
+ public static String INVALID_SOAP_ACTION() {
+ return LOCALIZER.localize(localizableINVALID_SOAP_ACTION());
+ }
+
+ public static Localizable localizableINVALID_ADDRESS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.address", arg0);
+ }
+
+ /**
+ * Invalid address: {0}
+ *
+ */
+ public static String INVALID_ADDRESS(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_ADDRESS(arg0));
+ }
+
+ public static Localizable localizableFAILED_TO_PARSE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("failed.to.parse", arg0, arg1);
+ }
+
+ /**
+ * Failed to access the WSDL at: {0}. It failed with:
+ * {1}.
+ *
+ */
+ public static String FAILED_TO_PARSE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableFAILED_TO_PARSE(arg0, arg1));
+ }
+
+ public static Localizable localizableHTTP_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("http.not.found", arg0);
+ }
+
+ /**
+ * HTTP Status-Code 404: Not Found - {0}
+ *
+ */
+ public static String HTTP_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableHTTP_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableUNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("unsupported.operation", arg0, arg1, arg2);
+ }
+
+ /**
+ * {0} not supported with {1}. Must be: {2}
+ *
+ */
+ public static String UNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableUNSUPPORTED_OPERATION(arg0, arg1, arg2));
}
public static Localizable localizableWSDL_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("wsdl.not.found", arg0);
+ return MESSAGE_FACTORY.getMessage("wsdl.not.found", arg0);
}
/**
@@ -264,23 +238,11 @@
*
*/
public static String WSDL_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableWSDL_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableHTTP_CLIENT_FAILED(Object arg0) {
- return messageFactory.getMessage("http.client.failed", arg0);
- }
-
- /**
- * HTTP transport error: {0}
- *
- */
- public static String HTTP_CLIENT_FAILED(Object arg0) {
- return localizer.localize(localizableHTTP_CLIENT_FAILED(arg0));
+ return LOCALIZER.localize(localizableWSDL_NOT_FOUND(arg0));
}
public static Localizable localizableINVALID_SERVICE_NAME_NULL(Object arg0) {
- return messageFactory.getMessage("invalid.service.name.null", arg0);
+ return MESSAGE_FACTORY.getMessage("invalid.service.name.null", arg0);
}
/**
@@ -288,59 +250,23 @@
*
*/
public static String INVALID_SERVICE_NAME_NULL(Object arg0) {
- return localizer.localize(localizableINVALID_SERVICE_NAME_NULL(arg0));
- }
-
- public static Localizable localizableINVALID_WSDL_URL(Object arg0) {
- return messageFactory.getMessage("invalid.wsdl.url", arg0);
+ return LOCALIZER.localize(localizableINVALID_SERVICE_NAME_NULL(arg0));
}
- /**
- * Invalid WSDL URL: {0}
- *
- */
- public static String INVALID_WSDL_URL(Object arg0) {
- return localizer.localize(localizableINVALID_WSDL_URL(arg0));
- }
-
- public static Localizable localizableINVALID_PORT_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.port.name", arg0, arg1);
+ public static Localizable localizableHTTP_CLIENT_FAILED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("http.client.failed", arg0);
}
/**
- * {0} is not a valid port. Valid ports are: {1}
- *
- */
- public static String INVALID_PORT_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_PORT_NAME(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_SERVICE_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.service.name", arg0, arg1);
- }
-
- /**
- * {0} is not a valid service. Valid services are: {1}
+ * HTTP transport error: {0}
*
*/
- public static String INVALID_SERVICE_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_SERVICE_NAME(arg0, arg1));
- }
-
- public static Localizable localizableUNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("unsupported.operation", arg0, arg1, arg2);
- }
-
- /**
- * {0} not supported with {1}. Must be: {2}
- *
- */
- public static String UNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableUNSUPPORTED_OPERATION(arg0, arg1, arg2));
+ public static String HTTP_CLIENT_FAILED(Object arg0) {
+ return LOCALIZER.localize(localizableHTTP_CLIENT_FAILED(arg0));
}
public static Localizable localizableFAILED_TO_PARSE_EPR(Object arg0) {
- return messageFactory.getMessage("failed.to.parse.epr", arg0);
+ return MESSAGE_FACTORY.getMessage("failed.to.parse.epr", arg0);
}
/**
@@ -348,7 +274,90 @@
*
*/
public static String FAILED_TO_PARSE_EPR(Object arg0) {
- return localizer.localize(localizableFAILED_TO_PARSE_EPR(arg0));
+ return LOCALIZER.localize(localizableFAILED_TO_PARSE_EPR(arg0));
+ }
+
+ public static Localizable localizableLOCAL_CLIENT_FAILED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("local.client.failed", arg0);
+ }
+
+ /**
+ * local transport error: {0}
+ *
+ */
+ public static String LOCAL_CLIENT_FAILED(Object arg0) {
+ return LOCALIZER.localize(localizableLOCAL_CLIENT_FAILED(arg0));
+ }
+
+ public static Localizable localizableUNDEFINED_BINDING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("undefined.binding", arg0);
+ }
+
+ /**
+ * Undefined binding: {0}
+ *
+ */
+ public static String UNDEFINED_BINDING(Object arg0) {
+ return LOCALIZER.localize(localizableUNDEFINED_BINDING(arg0));
+ }
+
+ public static Localizable localizableINVALID_SERVICE_NO_WSDL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.service.no.wsdl", arg0);
+ }
+
+ /**
+ * No wsdl metadata for service: {0}, can't create proxy! Try creating Service by providing a WSDL URL
+ *
+ */
+ public static String INVALID_SERVICE_NO_WSDL(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_SERVICE_NO_WSDL(arg0));
+ }
+
+ public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdl.contains.no.service", arg0);
+ }
+
+ /**
+ * WSDL {0} contains no service definition.
+ *
+ */
+ public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0));
+ }
+
+ public static Localizable localizableINVALID_BINDING_ID(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.binding.id", arg0, arg1);
+ }
+
+ /**
+ * Invalid binding id: {0}. Must be: {1}
+ *
+ */
+ public static String INVALID_BINDING_ID(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_BINDING_ID(arg0, arg1));
+ }
+
+ public static Localizable localizableUNDEFINED_PORT_TYPE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("undefined.portType", arg0);
+ }
+
+ /**
+ * Undefined port type: {0}
+ *
+ */
+ public static String UNDEFINED_PORT_TYPE(Object arg0) {
+ return LOCALIZER.localize(localizableUNDEFINED_PORT_TYPE(arg0));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,42 +25,76 @@
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 DispatchMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.dispatch";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, DispatchMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new DispatchMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ public static Localizable localizableINVALID_NULLARG_SOAP_MSGMODE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.nullarg.soap.msgmode", arg0, arg1);
}
- public static Localizable localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.nullarg.xmlhttp.request.method", arg0, arg1);
+ /**
+ * SOAP/HTTP Binding in {0} is not allowed with a null invocation argument. Must be: {1}
+ *
+ */
+ public static String INVALID_NULLARG_SOAP_MSGMODE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_NULLARG_SOAP_MSGMODE(arg0, arg1));
+ }
+
+ public static Localizable localizableINVALID_QUERY_STRING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.query.string", arg0);
}
/**
- * A XML/HTTP request using MessageContext.HTTP_REQUEST_METHOD equals {0} with a Null invocation Argument is not allowed. Must be: {1}
+ * Unable to resolve endpoint address using the supplied query string: {0}.
+ *
+ */
+ public static String INVALID_QUERY_STRING(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_QUERY_STRING(arg0));
+ }
+
+ public static Localizable localizableINVALID_URI_DECODE() {
+ return MESSAGE_FACTORY.getMessage("invalid.uri.decode");
+ }
+
+ /**
+ * Unable to decode the resolved endpoint using UTF-8 encoding.
*
*/
- public static String INVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(arg0, arg1));
+ public static String INVALID_URI_DECODE() {
+ return LOCALIZER.localize(localizableINVALID_URI_DECODE());
+ }
+
+ public static Localizable localizableINVALID_URI_RESOLUTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.uri.resolution", arg0);
+ }
+
+ /**
+ * Unable to resolve endpoint address using the supplied path: {0}.
+ *
+ */
+ public static String INVALID_URI_RESOLUTION(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_URI_RESOLUTION(arg0));
}
public static Localizable localizableINVALID_NULLARG_URI() {
- return messageFactory.getMessage("invalid.nullarg.uri");
+ return MESSAGE_FACTORY.getMessage("invalid.nullarg.uri");
}
/**
@@ -68,59 +102,47 @@
*
*/
public static String INVALID_NULLARG_URI() {
- return localizer.localize(localizableINVALID_NULLARG_URI());
+ return LOCALIZER.localize(localizableINVALID_NULLARG_URI());
}
- public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.soapmessage.dispatch.msgmode", arg0, arg1);
+ public static Localizable localizableINVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.uri.path.query", arg0, arg1);
}
/**
- * Can not create Dispatch of {0}. Must be {1}.
+ * Unable to construct a URI with this path info {0} and this query string {1}.
*
*/
- public static String INVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(arg0, arg1));
+ public static String INVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_URI_PATH_QUERY(arg0, arg1));
}
- public static Localizable localizableINVALID_RESPONSE_DESERIALIZATION() {
- return messageFactory.getMessage("invalid.response.deserialization");
+ public static Localizable localizableINVALID_URI(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.uri", arg0);
}
/**
- * Failed to deserialize the response.
+ * Endpoint String: {0} is and invalid URI.
*
*/
- public static String INVALID_RESPONSE_DESERIALIZATION() {
- return localizer.localize(localizableINVALID_RESPONSE_DESERIALIZATION());
+ public static String INVALID_URI(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_URI(arg0));
}
- public static Localizable localizableINVALID_QUERY_LEADING_CHAR(Object arg0) {
- return messageFactory.getMessage("invalid.query.leading.char", arg0);
+ public static Localizable localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.datasource.dispatch.msgmode", arg0, arg1);
}
/**
- * Leading '?' of MessageContext.QUERY_STRING: {0} is not valid. Remove '?' and run again.
+ * Can not create Dispatch of Service.Mode.PAYLOAD{0}. Must be: {1}
*
*/
- public static String INVALID_QUERY_LEADING_CHAR(Object arg0) {
- return localizer.localize(localizableINVALID_QUERY_LEADING_CHAR(arg0));
- }
-
- public static Localizable localizableINVALID_QUERY_STRING(Object arg0) {
- return messageFactory.getMessage("invalid.query.string", arg0);
- }
-
- /**
- * Unable to resolve endpoint address using the supplied query string: {0}.
- *
- */
- public static String INVALID_QUERY_STRING(Object arg0) {
- return localizer.localize(localizableINVALID_QUERY_STRING(arg0));
+ public static String INVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(arg0, arg1));
}
public static Localizable localizableDUPLICATE_PORT(Object arg0) {
- return messageFactory.getMessage("duplicate.port", arg0);
+ return MESSAGE_FACTORY.getMessage("duplicate.port", arg0);
}
/**
@@ -128,11 +150,71 @@
*
*/
public static String DUPLICATE_PORT(Object arg0) {
- return localizer.localize(localizableDUPLICATE_PORT(arg0));
+ return LOCALIZER.localize(localizableDUPLICATE_PORT(arg0));
+ }
+
+ public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.soapmessage.dispatch.binding", arg0, arg1);
+ }
+
+ /**
+ * Can not create Dispatch with {0} Binding. Must be: {1} Binding.
+ *
+ */
+ public static String INVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(arg0, arg1));
+ }
+
+ public static Localizable localizableINVALID_QUERY_LEADING_CHAR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("invalid.query.leading.char", arg0);
+ }
+
+ /**
+ * Leading '?' of MessageContext.QUERY_STRING: {0} is not valid. Remove '?' and run again.
+ *
+ */
+ public static String INVALID_QUERY_LEADING_CHAR(Object arg0) {
+ return LOCALIZER.localize(localizableINVALID_QUERY_LEADING_CHAR(arg0));
+ }
+
+ public static Localizable localizableINVALID_RESPONSE_DESERIALIZATION() {
+ return MESSAGE_FACTORY.getMessage("invalid.response.deserialization");
+ }
+
+ /**
+ * Failed to deserialize the response.
+ *
+ */
+ public static String INVALID_RESPONSE_DESERIALIZATION() {
+ return LOCALIZER.localize(localizableINVALID_RESPONSE_DESERIALIZATION());
+ }
+
+ public static Localizable localizableINVALID_RESPONSE() {
+ return MESSAGE_FACTORY.getMessage("invalid.response");
+ }
+
+ /**
+ * No response returned.
+ *
+ */
+ public static String INVALID_RESPONSE() {
+ return LOCALIZER.localize(localizableINVALID_RESPONSE());
+ }
+
+ public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.soapmessage.dispatch.msgmode", arg0, arg1);
+ }
+
+ /**
+ * Can not create Dispatch of {0}. Must be {1}.
+ *
+ */
+ public static String INVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(arg0, arg1));
}
public static Localizable localizableINVALID_DATASOURCE_DISPATCH_BINDING(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.datasource.dispatch.binding", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("invalid.datasource.dispatch.binding", arg0, arg1);
}
/**
@@ -140,103 +222,30 @@
*
*/
public static String INVALID_DATASOURCE_DISPATCH_BINDING(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_DATASOURCE_DISPATCH_BINDING(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.datasource.dispatch.msgmode", arg0, arg1);
- }
-
- /**
- * Can not create Dispatch of Service.Mode.PAYLOAD{0}. Must be: {1}
- *
- */
- public static String INVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_NULLARG_SOAP_MSGMODE(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.nullarg.soap.msgmode", arg0, arg1);
+ return LOCALIZER.localize(localizableINVALID_DATASOURCE_DISPATCH_BINDING(arg0, arg1));
}
- /**
- * SOAP/HTTP Binding in {0} is not allowed with a null invocation argument. Must be: {1}
- *
- */
- public static String INVALID_NULLARG_SOAP_MSGMODE(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_NULLARG_SOAP_MSGMODE(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_URI(Object arg0) {
- return messageFactory.getMessage("invalid.uri", arg0);
- }
-
- /**
- * Endpoint String: {0} is and invalid URI.
- *
- */
- public static String INVALID_URI(Object arg0) {
- return localizer.localize(localizableINVALID_URI(arg0));
- }
-
- public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.soapmessage.dispatch.binding", arg0, arg1);
+ public static Localizable localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("invalid.nullarg.xmlhttp.request.method", arg0, arg1);
}
/**
- * Can not create Dispatch with {0} Binding. Must be: {1} Binding.
- *
- */
- public static String INVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
- return messageFactory.getMessage("invalid.uri.path.query", arg0, arg1);
- }
-
- /**
- * Unable to construct a URI with this path info {0} and this query string {1}.
- *
- */
- public static String INVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
- return localizer.localize(localizableINVALID_URI_PATH_QUERY(arg0, arg1));
- }
-
- public static Localizable localizableINVALID_RESPONSE() {
- return messageFactory.getMessage("invalid.response");
- }
-
- /**
- * No response returned.
+ * A XML/HTTP request using MessageContext.HTTP_REQUEST_METHOD equals {0} with a Null invocation Argument is not allowed. Must be: {1}
*
*/
- public static String INVALID_RESPONSE() {
- return localizer.localize(localizableINVALID_RESPONSE());
- }
-
- public static Localizable localizableINVALID_URI_RESOLUTION(Object arg0) {
- return messageFactory.getMessage("invalid.uri.resolution", arg0);
+ public static String INVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(arg0, arg1));
}
- /**
- * Unable to resolve endpoint address using the supplied path: {0}.
- *
- */
- public static String INVALID_URI_RESOLUTION(Object arg0) {
- return localizer.localize(localizableINVALID_URI_RESOLUTION(arg0));
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableINVALID_URI_DECODE() {
- return messageFactory.getMessage("invalid.uri.decode");
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * Unable to decode the resolved endpoint using UTF-8 encoding.
- *
- */
- public static String INVALID_URI_DECODE() {
- return localizer.localize(localizableINVALID_URI_DECODE());
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,54 +25,28 @@
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 EncodingMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.encoding";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, EncodingMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
-
- public static Localizable localizableFAILED_TO_READ_RESPONSE(Object arg0) {
- return messageFactory.getMessage("failed.to.read.response", arg0);
- }
- /**
- * Failed to read a response: {0}
- *
- */
- public static String FAILED_TO_READ_RESPONSE(Object arg0) {
- return localizer.localize(localizableFAILED_TO_READ_RESPONSE(arg0));
- }
-
- public static Localizable localizableEXCEPTION_INCORRECT_TYPE(Object arg0) {
- return messageFactory.getMessage("exception.incorrectType", arg0);
- }
-
- /**
- * incorrect type. Expected java.lang.Exception, found {0}
- *
- */
- public static String EXCEPTION_INCORRECT_TYPE(Object arg0) {
- return localizer.localize(localizableEXCEPTION_INCORRECT_TYPE(arg0));
- }
+ private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.encoding";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new EncodingMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableEXCEPTION_NOTFOUND(Object arg0) {
- return messageFactory.getMessage("exception.notfound", arg0);
+ return MESSAGE_FACTORY.getMessage("exception.notfound", arg0);
}
/**
@@ -80,35 +54,23 @@
*
*/
public static String EXCEPTION_NOTFOUND(Object arg0) {
- return localizer.localize(localizableEXCEPTION_NOTFOUND(arg0));
+ return LOCALIZER.localize(localizableEXCEPTION_NOTFOUND(arg0));
}
- public static Localizable localizableXSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("xsd.unexpectedElementName", arg0, arg1);
+ public static Localizable localizableXSD_UNKNOWN_PREFIX(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xsd.unknownPrefix", arg0);
}
/**
- * unexpected element name: expected={0}, actual: {1}
+ * unknown prefix "{0}"
*
*/
- public static String XSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableXSD_UNEXPECTED_ELEMENT_NAME(arg0, arg1));
- }
-
- public static Localizable localizableNESTED_DESERIALIZATION_ERROR(Object arg0) {
- return messageFactory.getMessage("nestedDeserializationError", arg0);
- }
-
- /**
- * deserialization error: {0}
- *
- */
- public static String NESTED_DESERIALIZATION_ERROR(Object arg0) {
- return localizer.localize(localizableNESTED_DESERIALIZATION_ERROR(arg0));
+ public static String XSD_UNKNOWN_PREFIX(Object arg0) {
+ return LOCALIZER.localize(localizableXSD_UNKNOWN_PREFIX(arg0));
}
public static Localizable localizableNESTED_ENCODING_ERROR(Object arg0) {
- return messageFactory.getMessage("nestedEncodingError", arg0);
+ return MESSAGE_FACTORY.getMessage("nestedEncodingError", arg0);
}
/**
@@ -116,23 +78,47 @@
*
*/
public static String NESTED_ENCODING_ERROR(Object arg0) {
- return localizer.localize(localizableNESTED_ENCODING_ERROR(arg0));
+ return LOCALIZER.localize(localizableNESTED_ENCODING_ERROR(arg0));
+ }
+
+ public static Localizable localizableNESTED_DESERIALIZATION_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("nestedDeserializationError", arg0);
}
- public static Localizable localizableXSD_UNKNOWN_PREFIX(Object arg0) {
- return messageFactory.getMessage("xsd.unknownPrefix", arg0);
+ /**
+ * deserialization error: {0}
+ *
+ */
+ public static String NESTED_DESERIALIZATION_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableNESTED_DESERIALIZATION_ERROR(arg0));
+ }
+
+ public static Localizable localizableXSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("xsd.unexpectedElementName", arg0, arg1);
}
/**
- * unknown prefix "{0}"
+ * unexpected element name: expected={0}, actual: {1}
*
*/
- public static String XSD_UNKNOWN_PREFIX(Object arg0) {
- return localizer.localize(localizableXSD_UNKNOWN_PREFIX(arg0));
+ public static String XSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableXSD_UNEXPECTED_ELEMENT_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableFAILED_TO_READ_RESPONSE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("failed.to.read.response", arg0);
+ }
+
+ /**
+ * Failed to read a response: {0}
+ *
+ */
+ public static String FAILED_TO_READ_RESPONSE(Object arg0) {
+ return LOCALIZER.localize(localizableFAILED_TO_READ_RESPONSE(arg0));
}
public static Localizable localizableNESTED_SERIALIZATION_ERROR(Object arg0) {
- return messageFactory.getMessage("nestedSerializationError", arg0);
+ return MESSAGE_FACTORY.getMessage("nestedSerializationError", arg0);
}
/**
@@ -140,11 +126,11 @@
*
*/
public static String NESTED_SERIALIZATION_ERROR(Object arg0) {
- return localizer.localize(localizableNESTED_SERIALIZATION_ERROR(arg0));
+ return LOCALIZER.localize(localizableNESTED_SERIALIZATION_ERROR(arg0));
}
public static Localizable localizableNO_SUCH_CONTENT_ID(Object arg0) {
- return messageFactory.getMessage("noSuchContentId", arg0);
+ return MESSAGE_FACTORY.getMessage("noSuchContentId", arg0);
}
/**
@@ -152,7 +138,30 @@
*
*/
public static String NO_SUCH_CONTENT_ID(Object arg0) {
- return localizer.localize(localizableNO_SUCH_CONTENT_ID(arg0));
+ return LOCALIZER.localize(localizableNO_SUCH_CONTENT_ID(arg0));
+ }
+
+ public static Localizable localizableEXCEPTION_INCORRECT_TYPE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("exception.incorrectType", arg0);
+ }
+
+ /**
+ * incorrect type. Expected java.lang.Exception, found {0}
+ *
+ */
+ public static String EXCEPTION_INCORRECT_TYPE(Object arg0) {
+ return LOCALIZER.localize(localizableEXCEPTION_INCORRECT_TYPE(arg0));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,42 +25,40 @@
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 HandlerMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.handler";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, HandlerMessages::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.handler";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new HandlerMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- public static Localizable localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
- return messageFactory.getMessage("handler.messageContext.invalid.class", arg0, arg1);
+ public static Localizable localizableHANDLER_NESTED_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("handler.nestedError", arg0);
}
/**
- * "{0}" is not an allowed value for the property "{1}"
+ * handler error: {0}
*
*/
- public static String HANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
- return localizer.localize(localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(arg0, arg1));
+ public static String HANDLER_NESTED_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableHANDLER_NESTED_ERROR(arg0));
}
public static Localizable localizableCANNOT_EXTEND_HANDLER_DIRECTLY(Object arg0) {
- return messageFactory.getMessage("cannot.extend.handler.directly", arg0);
+ return MESSAGE_FACTORY.getMessage("cannot.extend.handler.directly", arg0);
}
/**
@@ -68,11 +66,11 @@
*
*/
public static String CANNOT_EXTEND_HANDLER_DIRECTLY(Object arg0) {
- return localizer.localize(localizableCANNOT_EXTEND_HANDLER_DIRECTLY(arg0));
+ return LOCALIZER.localize(localizableCANNOT_EXTEND_HANDLER_DIRECTLY(arg0));
}
public static Localizable localizableHANDLER_NOT_VALID_TYPE(Object arg0) {
- return messageFactory.getMessage("handler.not.valid.type", arg0);
+ return MESSAGE_FACTORY.getMessage("handler.not.valid.type", arg0);
}
/**
@@ -80,11 +78,47 @@
*
*/
public static String HANDLER_NOT_VALID_TYPE(Object arg0) {
- return localizer.localize(localizableHANDLER_NOT_VALID_TYPE(arg0));
+ return LOCALIZER.localize(localizableHANDLER_NOT_VALID_TYPE(arg0));
+ }
+
+ public static Localizable localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("handler.messageContext.invalid.class", arg0, arg1);
+ }
+
+ /**
+ * "{0}" is not an allowed value for the property "{1}"
+ *
+ */
+ public static String HANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(arg0, arg1));
+ }
+
+ public static Localizable localizableHANDLER_PREDESTROY_IGNORE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("handler.predestroy.ignore", arg0);
+ }
+
+ /**
+ * Exception ignored from invoking handler @PreDestroy method: {0}
+ *
+ */
+ public static String HANDLER_PREDESTROY_IGNORE(Object arg0) {
+ return LOCALIZER.localize(localizableHANDLER_PREDESTROY_IGNORE(arg0));
+ }
+
+ public static Localizable localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("handler.chain.contains.handler.only", arg0);
+ }
+
+ /**
+ * A HandlerChain can only contain Handler instances: {0}
+ *
+ */
+ public static String HANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
+ return LOCALIZER.localize(localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(arg0));
}
public static Localizable localizableCANNOT_INSTANTIATE_HANDLER(Object arg0, Object arg1) {
- return messageFactory.getMessage("cannot.instantiate.handler", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("cannot.instantiate.handler", arg0, arg1);
}
/**
@@ -92,43 +126,18 @@
*
*/
public static String CANNOT_INSTANTIATE_HANDLER(Object arg0, Object arg1) {
- return localizer.localize(localizableCANNOT_INSTANTIATE_HANDLER(arg0, arg1));
- }
-
- public static Localizable localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
- return messageFactory.getMessage("handler.chain.contains.handler.only", arg0);
- }
-
- /**
- * A HandlerChain can only contain Handler instances: {0}
- *
- */
- public static String HANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
- return localizer.localize(localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(arg0));
- }
-
- public static Localizable localizableHANDLER_NESTED_ERROR(Object arg0) {
- return messageFactory.getMessage("handler.nestedError", arg0);
+ return LOCALIZER.localize(localizableCANNOT_INSTANTIATE_HANDLER(arg0, arg1));
}
- /**
- * handler error: {0}
- *
- */
- public static String HANDLER_NESTED_ERROR(Object arg0) {
- return localizer.localize(localizableHANDLER_NESTED_ERROR(arg0));
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableHANDLER_PREDESTROY_IGNORE(Object arg0) {
- return messageFactory.getMessage("handler.predestroy.ignore", arg0);
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * Exception ignored from invoking handler @PreDestroy method: {0}
- *
- */
- public static String HANDLER_PREDESTROY_IGNORE(Object arg0) {
- return localizer.localize(localizableHANDLER_PREDESTROY_IGNORE(arg0));
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,28 @@
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 HttpserverMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.httpserver";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, HttpserverMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new HttpserverMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableUNEXPECTED_HTTP_METHOD(Object arg0) {
- return messageFactory.getMessage("unexpected.http.method", arg0);
+ return MESSAGE_FACTORY.getMessage("unexpected.http.method", arg0);
}
/**
@@ -56,7 +54,18 @@
*
*/
public static String UNEXPECTED_HTTP_METHOD(Object arg0) {
- return localizer.localize(localizableUNEXPECTED_HTTP_METHOD(arg0));
+ return LOCALIZER.localize(localizableUNEXPECTED_HTTP_METHOD(arg0));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,28 @@
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 ManagementMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.management";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ManagementMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ManagementMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableWSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(Object arg0) {
- return messageFactory.getMessage("WSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE", arg0);
+ return MESSAGE_FACTORY.getMessage("WSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE", arg0);
}
/**
@@ -56,23 +54,71 @@
*
*/
public static String WSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(Object arg0) {
- return localizer.localize(localizableWSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(arg0));
+ return LOCALIZER.localize(localizableWSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(arg0));
+ }
+
+ public static Localizable localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID", arg0);
+ }
+
+ /**
+ * WSM1003: Policy assertion {0} must have id attribute when management is enabled.
+ *
+ */
+ public static String WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(Object arg0) {
+ return LOCALIZER.localize(localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(arg0));
}
- public static Localizable localizableWSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSM_1004_EXPECTED_XML_TAG", arg0, arg1);
+ public static Localizable localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD() {
+ return MESSAGE_FACTORY.getMessage("WSM_1005_EXPECTED_COMMUNICATION_CHILD");
+ }
+
+ /**
+ * WSM1005: Expected to find a CommunicationServerImplementation tag as child node of CommunicationServerImplementations.
+ *
+ */
+ public static String WSM_1005_EXPECTED_COMMUNICATION_CHILD() {
+ return LOCALIZER.localize(localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD());
+ }
+
+ public static Localizable localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED() {
+ return MESSAGE_FACTORY.getMessage("WSM_1006_CLIENT_MANAGEMENT_ENABLED");
}
/**
- * WSM1004: Expected tag <{0}> but instead read <{1}>.
+ * WSM1006: The management property of the ManagedClient policy assertion is set to on. Clients cannot be managed and this setting will be ignored.
+ *
+ */
+ public static String WSM_1006_CLIENT_MANAGEMENT_ENABLED() {
+ return LOCALIZER.localize(localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED());
+ }
+
+ public static Localizable localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSM_1002_EXPECTED_MANAGEMENT_ASSERTION", arg0);
+ }
+
+ /**
+ * WSM1002: Expected policy assertion {0} in this namespace.
*
*/
- public static String WSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
- return localizer.localize(localizableWSM_1004_EXPECTED_XML_TAG(arg0, arg1));
+ public static String WSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
+ return LOCALIZER.localize(localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(arg0));
+ }
+
+ public static Localizable localizableWSM_1001_FAILED_ASSERTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSM_1001_FAILED_ASSERTION", arg0);
+ }
+
+ /**
+ * WSM1001: Failed to get policy assertion {0}.
+ *
+ */
+ public static String WSM_1001_FAILED_ASSERTION(Object arg0) {
+ return LOCALIZER.localize(localizableWSM_1001_FAILED_ASSERTION(arg0));
}
public static Localizable localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION() {
- return messageFactory.getMessage("WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION");
+ return MESSAGE_FACTORY.getMessage("WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION");
}
/**
@@ -80,67 +126,30 @@
*
*/
public static String WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION() {
- return localizer.localize(localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION());
- }
-
- public static Localizable localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
- return messageFactory.getMessage("WSM_1002_EXPECTED_MANAGEMENT_ASSERTION", arg0);
- }
-
- /**
- * WSM1002: Expected policy assertion {0} in this namespace.
- *
- */
- public static String WSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
- return localizer.localize(localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(arg0));
+ return LOCALIZER.localize(localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION());
}
- public static Localizable localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED() {
- return messageFactory.getMessage("WSM_1006_CLIENT_MANAGEMENT_ENABLED");
- }
-
- /**
- * WSM1006: The management property of the ManagedClient policy assertion is set to on. Clients cannot be managed and this setting will be ignored.
- *
- */
- public static String WSM_1006_CLIENT_MANAGEMENT_ENABLED() {
- return localizer.localize(localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED());
- }
-
- public static Localizable localizableWSM_1001_FAILED_ASSERTION(Object arg0) {
- return messageFactory.getMessage("WSM_1001_FAILED_ASSERTION", arg0);
+ public static Localizable localizableWSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("WSM_1004_EXPECTED_XML_TAG", arg0, arg1);
}
/**
- * WSM1001: Failed to get policy assertion {0}.
- *
- */
- public static String WSM_1001_FAILED_ASSERTION(Object arg0) {
- return localizer.localize(localizableWSM_1001_FAILED_ASSERTION(arg0));
- }
-
- public static Localizable localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD() {
- return messageFactory.getMessage("WSM_1005_EXPECTED_COMMUNICATION_CHILD");
- }
-
- /**
- * WSM1005: Expected to find a CommunicationServerImplementation tag as child node of CommunicationServerImplementations.
+ * WSM1004: Expected tag <{0}> but instead read <{1}>.
*
*/
- public static String WSM_1005_EXPECTED_COMMUNICATION_CHILD() {
- return localizer.localize(localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD());
+ public static String WSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSM_1004_EXPECTED_XML_TAG(arg0, arg1));
}
- public static Localizable localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(Object arg0) {
- return messageFactory.getMessage("WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID", arg0);
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- /**
- * WSM1003: Policy assertion {0} must have id attribute when management is enabled.
- *
- */
- public static String WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(Object arg0) {
- return localizer.localize(localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(arg0));
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,54 +25,64 @@
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 ModelerMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.modeler";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ModelerMessages::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.modeler";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ModelerMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- public static Localizable localizableNESTED_MODELER_ERROR(Object arg0) {
- return messageFactory.getMessage("nestedModelerError", arg0);
+ public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.unsupported.schema", arg0, arg1);
}
/**
- * runtime modeler error: {0}
+ * Unsupported metadata file schema {0}. Supported schemes are {1}.
*
*/
- public static String NESTED_MODELER_ERROR(Object arg0) {
- return localizer.localize(localizableNESTED_MODELER_ERROR(arg0));
+ public static String RUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(arg0, arg1));
}
- public static Localizable localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.wsfeature.no.ftrconstructor", arg0, arg1);
+ public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.oneway.operation.no.checked.exceptions", arg0, arg1, arg2);
}
/**
- * Annotation {0} is not recognizable, at least one constructor of {1} should be marked with @FeatureConstructor
+ * Oneway operation should not throw any checked exceptions class: {0} method: {1} throws: {2}
*
*/
- public static String RUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(arg0, arg1));
+ public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_NO_PACKAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.no.package", arg0);
+ }
+
+ /**
+ * A @WebService.targetNamespace must be specified on classes with no package. Class: {0}
+ *
+ */
+ public static String RUNTIME_MODELER_NO_PACKAGE(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_NO_PACKAGE(arg0));
}
public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.external.metadata.unable.to.read", arg0);
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.unable.to.read", arg0);
}
/**
@@ -80,119 +90,47 @@
*
*/
public static String RUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.webmethod.must.be.public", arg0);
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(arg0));
}
- /**
- * @WebMethod is not allowed on a non-public method {0}
- *
- */
- public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.wrapper.not.found", arg0);
+ public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.webmethod.must.be.nonstatic", arg0);
}
/**
- * Wrapper class {0} is not found. Have you run annotation processing to generate them?
- *
- */
- public static String RUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.mtom.conflict", arg0, arg1);
- }
-
- /**
- * Error in @BindingType: MTOM Configuration in binding identifier {0} conflicts with feature @MTOM {1}
+ * @WebMethod is not allowed on a static method {0}
*
*/
- public static String RUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_MTOM_CONFLICT(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.external.metadata.generic", arg0);
+ public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(arg0));
}
- /**
- * An error occurred while processing external WS metadata; check configuration/deployment. Nested error: {0}.
- *
- */
- public static String RUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.feature.conflict", arg0, arg1);
+ public static Localizable localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtimemodeler.invalid.soapbindingOnMethod", arg0, arg1, arg2);
}
/**
- * Feature {0} in implementation conflicts with {1} in WSDL configuration
+ * Invalid annotation: {0} on Method {1} in Class {2}, A method cannot be annotated with @SOAPBinding with Style "RPC"
*
*/
- public static String RUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_FEATURE_CONFLICT(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.invalid.soapbinding.parameterstyle", arg0, arg1);
+ public static String RUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(arg0, arg1, arg2));
}
- /**
- * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
- *
- */
- public static String RUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.wsfeature.morethanone.ftrconstructor", arg0, arg1);
+ public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.wrong.format", arg0);
}
/**
- * Annotation {0} is illegal, Only one constructor of {1} can be marked as @FeatureConstructor
- *
- */
- public static String RUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(arg0, arg1));
- }
-
- public static Localizable localizableNOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
- return messageFactory.getMessage("not.a.valid.bare.method", arg0, arg1);
- }
-
- /**
- * SEI {0} has method {1} annotated as BARE but it has more than one parameter bound to body. This is invalid. Please annotate the method with annotation: @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)
+ * Unable to read metadata from {0}. Is the format correct?
*
*/
- public static String NOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
- return localizer.localize(localizableNOT_A_VALID_BARE_METHOD(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_MODELER_NO_PACKAGE(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.no.package", arg0);
- }
-
- /**
- * A @WebService.targetNamespace must be specified on classes with no package. Class: {0}
- *
- */
- public static String RUNTIME_MODELER_NO_PACKAGE(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_NO_PACKAGE(arg0));
+ public static String RUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(arg0));
}
public static Localizable localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.no.webservice.annotation", arg0);
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.no.webservice.annotation", arg0);
}
/**
@@ -200,95 +138,35 @@
*
*/
public static String RUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.addressing.responses.nosuchmethod", arg0);
- }
-
- /**
- * JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 API. Use the endorsed standards override mechanism to load JAX-WS 2.2 API
- *
- */
- public static String RUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.external.metadata.wrong.format", arg0);
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(arg0));
}
- /**
- * Unable to read metadata from {0}. Is the format correct?
- *
- */
- public static String RUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.oneway.operation.no.out.parameters", arg0, arg1);
- }
-
- /**
- * oneway operation should not have OUT parameters class: {0} method: {1}
- *
- */
- public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(arg0, arg1));
- }
-
- public static Localizable localizableUNABLE_TO_CREATE_JAXB_CONTEXT() {
- return messageFactory.getMessage("unable.to.create.JAXBContext");
+ public static Localizable localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.soapbinding.conflict", arg0, arg1, arg2);
}
/**
- * Unable to create JAXBContext
+ * SOAPBinding Style {0} for method {1} conflicts with global SOAPBinding Style {2}
*
*/
- public static String UNABLE_TO_CREATE_JAXB_CONTEXT() {
- return localizer.localize(localizableUNABLE_TO_CREATE_JAXB_CONTEXT());
+ public static String RUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(arg0, arg1, arg2));
}
- public static Localizable localizableRUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.no.operations", arg0);
+ public static Localizable localizableNESTED_MODELER_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("nestedModelerError", arg0);
}
/**
- * The web service defined by the class {0} does not contain any valid WebMethods.
- *
- */
- public static String RUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_NO_OPERATIONS(arg0));
- }
-
- public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.modeler.oneway.operation.no.checked.exceptions", arg0, arg1, arg2);
- }
-
- /**
- * Oneway operation should not throw any checked exceptions class: {0} method: {1} throws: {2}
+ * runtime modeler error: {0}
*
*/
- public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(arg0, arg1, arg2));
- }
-
- public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.webmethod.must.be.nonstatic", arg0);
- }
-
- /**
- * @WebMethod is not allowed on a static method {0}
- *
- */
- public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(arg0));
+ public static String NESTED_MODELER_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableNESTED_MODELER_ERROR(arg0));
}
public static Localizable localizableRUNTIME_MODELER_METHOD_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.method.not.found", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.method.not.found", arg0, arg1);
}
/**
@@ -296,47 +174,119 @@
*
*/
public static String RUNTIME_MODELER_METHOD_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_METHOD_NOT_FOUND(arg0, arg1));
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_METHOD_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableUNABLE_TO_CREATE_JAXB_CONTEXT() {
+ return MESSAGE_FACTORY.getMessage("unable.to.create.JAXBContext");
}
- public static Localizable localizableRUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.class.not.found", arg0);
+ /**
+ * Unable to create JAXBContext
+ *
+ */
+ public static String UNABLE_TO_CREATE_JAXB_CONTEXT() {
+ return LOCALIZER.localize(localizableUNABLE_TO_CREATE_JAXB_CONTEXT());
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.no.operations", arg0);
}
/**
- * class: {0} could not be found
+ * The web service defined by the class {0} does not contain any valid WebMethods.
+ *
+ */
+ public static String RUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_NO_OPERATIONS(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.wrapper.not.found", arg0);
+ }
+
+ /**
+ * Wrapper class {0} is not found. Have you run annotation processing to generate them?
*
*/
- public static String RUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_CLASS_NOT_FOUND(arg0));
+ public static String RUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.invalid.soapbinding.parameterstyle", arg0, arg1);
}
- public static Localizable localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.modeler.soapbinding.conflict", arg0, arg1, arg2);
+ /**
+ * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
+ *
+ */
+ public static String RUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.generic", arg0);
}
/**
- * SOAPBinding Style {0} for method {1} conflicts with global SOAPBinding Style {2}
+ * An error occurred while processing external WS metadata; check configuration/deployment. Nested error: {0}.
*
*/
- public static String RUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(arg0, arg1, arg2));
+ public static String RUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.addressing.responses.nosuchmethod", arg0);
}
- public static Localizable localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.cannot.get.serviceName.from.interface", arg0);
+ /**
+ * JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 or newer API. Use the standard override mechanism to load JAX-WS 2.2 or newer API.
+ *
+ */
+ public static String RUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.wsfeature.illegal.ftrconstructor", arg0, arg1);
}
/**
- * The serviceName cannot be retrieved from an interface. class {0}
+ * Annotation {0} is illegal, In {1} @FeatureConstructor value doesn't match the constructor parameters
+ *
+ */
+ public static String RUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.webmethod.must.be.public", arg0);
+ }
+
+ /**
+ * @WebMethod is not allowed on a non-public method {0}
*
*/
- public static String RUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(arg0));
+ public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.oneway.operation.no.out.parameters", arg0, arg1);
+ }
+
+ /**
+ * oneway operation should not have OUT parameters class: {0} method: {1}
+ *
+ */
+ public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(arg0, arg1));
}
public static Localizable localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.endpoint.interface.no.webservice", arg0);
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.endpoint.interface.no.webservice", arg0);
}
/**
@@ -344,35 +294,107 @@
*
*/
public static String RUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.wsfeature.no.ftrconstructor", arg0, arg1);
+ }
+
+ /**
+ * Annotation {0} is not recognizable, at least one constructor of {1} should be marked with @FeatureConstructor
+ *
+ */
+ public static String RUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.mtom.conflict", arg0, arg1);
}
- public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.external.metadata.unsupported.schema", arg0, arg1);
+ /**
+ * Error in @BindingType: MTOM Configuration in binding identifier {0} conflicts with feature @MTOM {1}
+ *
+ */
+ public static String RUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_MTOM_CONFLICT(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.class.not.found", arg0);
+ }
+
+ /**
+ * class: {0} could not be found
+ *
+ */
+ public static String RUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_CLASS_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.wsfeature.morethanone.ftrconstructor", arg0, arg1);
}
/**
- * Unsupported metadata file schema {0}. Supported schemes are {1}.
+ * Annotation {0} is illegal, Only one constructor of {1} can be marked as @FeatureConstructor
*
*/
- public static String RUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(arg0, arg1));
+ public static String RUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.feature.conflict", arg0, arg1);
}
- public static Localizable localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtimemodeler.invalid.soapbindingOnMethod", arg0, arg1, arg2);
+ /**
+ * Feature {0} in implementation conflicts with {1} in WSDL configuration
+ *
+ */
+ public static String RUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_FEATURE_CONFLICT(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.webmethod.must.be.nonstaticfinal", arg0);
}
/**
- * Invalid annotation: {0} on Method {1} in Class {2}, A method cannot be annotated with @SOAPBinding with Style "RPC"
+ * @WebMethod is not allowed on a static or final method {0}
+ *
+ */
+ public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.cannot.get.serviceName.from.interface", arg0);
+ }
+
+ /**
+ * The serviceName cannot be retrieved from an interface. class {0}
*
*/
- public static String RUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(arg0, arg1, arg2));
+ public static String RUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(arg0));
+ }
+
+ public static Localizable localizableNOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("not.a.valid.bare.method", arg0, arg1);
+ }
+
+ /**
+ * SEI {0} has method {1} annotated as BARE but it has more than one parameter bound to body. This is invalid. Please annotate the method with annotation: @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)
+ *
+ */
+ public static String NOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableNOT_A_VALID_BARE_METHOD(arg0, arg1));
}
public static Localizable localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.portname.servicename.namespace.mismatch", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("runtime.modeler.portname.servicename.namespace.mismatch", arg0, arg1);
}
/**
@@ -380,31 +402,18 @@
*
*/
public static String RUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.modeler.wsfeature.illegal.ftrconstructor", arg0, arg1);
+ return LOCALIZER.localize(localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(arg0, arg1));
}
- /**
- * Annotation {0} is illegal, In {1} @FeatureConstructor value doesn't match the constructor parameters
- *
- */
- public static String RUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(arg0, arg1));
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
- return messageFactory.getMessage("runtime.modeler.webmethod.must.be.nonstaticfinal", arg0);
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * @WebMethod is not allowed on a static or final method {0}
- *
- */
- public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
- return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(arg0));
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,102 +25,64 @@
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 PolicyMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.policy";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, PolicyMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
-
- public static Localizable localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
- return messageFactory.getMessage("WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL");
- }
- /**
- * WSP1007: Policy exception occurred when finishing WSDL parsing.
- *
- */
- public static String WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
- return localizer.localize(localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL());
- }
+ private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.policy";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new PolicyMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- public static Localizable localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
- return messageFactory.getMessage("WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE");
- }
-
- /**
- * WSP1002: Unable to marshall policy or it's reference. See original exception for more details.
- *
- */
- public static String WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
- return localizer.localize(localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE());
- }
-
- public static Localizable localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED", arg0, arg1);
+ public static Localizable localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT", arg0);
}
/**
- * WSP1015: Server side assertion validation failed for "{0}" assertion. Assertion was evaluated as "{1}".
+ * WSP1013: Exception occurred while reading policy element. Following was read so far: {0}.
*
*/
- public static String WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(arg0, arg1));
+ public static String WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(arg0));
}
- public static Localizable localizableWSP_1017_MAP_UPDATE_FAILED() {
- return messageFactory.getMessage("WSP_1017_MAP_UPDATE_FAILED");
+ public static Localizable localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE() {
+ return MESSAGE_FACTORY.getMessage("WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE");
}
/**
- * WSP1048: Policy map setup failed - exception occurred while trying to modify policy map content.
+ * WSP1001: XMLStreamException occurred when reading policy reference element.
*
*/
- public static String WSP_1017_MAP_UPDATE_FAILED() {
- return localizer.localize(localizableWSP_1017_MAP_UPDATE_FAILED());
+ public static String WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE() {
+ return LOCALIZER.localize(localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE());
}
- public static Localizable localizableWSP_1010_NO_POLICIES_DEFINED() {
- return messageFactory.getMessage("WSP_1010_NO_POLICIES_DEFINED");
+ public static Localizable localizableWSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1014_CAN_NOT_FIND_POLICY", arg0);
}
/**
- * WSP1010: No policies defined.
+ * WSP1014: Can not find policy "{0}" that is referenced in from the WSDL. Please, check your policy references in the WSDL.
*
*/
- public static String WSP_1010_NO_POLICIES_DEFINED() {
- return localizer.localize(localizableWSP_1010_NO_POLICIES_DEFINED());
- }
-
- public static Localizable localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
- return messageFactory.getMessage("WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL", arg0);
- }
-
- /**
- * WSP1008: Not marshalling policy, wsdl subject is null for "{0}".
- *
- */
- public static String WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
- return localizer.localize(localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(arg0));
+ public static String WSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1014_CAN_NOT_FIND_POLICY(arg0));
}
public static Localizable localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL() {
- return messageFactory.getMessage("WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL");
+ return MESSAGE_FACTORY.getMessage("WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL");
}
/**
@@ -128,23 +90,47 @@
*
*/
public static String WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL() {
- return localizer.localize(localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL());
+ return LOCALIZER.localize(localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL());
+ }
+
+ public static Localizable localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT", arg0);
}
- public static Localizable localizableWSP_1020_DUPLICATE_ID(Object arg0) {
- return messageFactory.getMessage("WSP_1020_DUPLICATE_ID", arg0);
+ /**
+ * WSP1011: Failed to retrieve effective policy for subject: {0}.
+ *
+ */
+ public static String WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(arg0));
+ }
+
+ public static Localizable localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1016_POLICY_ID_NULL_OR_DUPLICATE", arg0);
}
/**
- * WSP1020: Found two policies in one document with the same id: "{0}".
+ * WSP1016: The policy is not added because it has no ID or a policy with the same ID was already added: {0}.
*
*/
- public static String WSP_1020_DUPLICATE_ID(Object arg0) {
- return localizer.localize(localizableWSP_1020_DUPLICATE_ID(arg0));
+ public static String WSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(arg0));
+ }
+
+ public static Localizable localizableWSP_1021_FAULT_NOT_BOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1021_FAULT_NOT_BOUND", arg0);
+ }
+
+ /**
+ * WSP1021: Fault "{0}" not bound. Check names in port and binding definitions.
+ *
+ */
+ public static String WSP_1021_FAULT_NOT_BOUND(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1021_FAULT_NOT_BOUND(arg0));
}
public static Localizable localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME", arg0, arg1);
}
/**
@@ -152,35 +138,71 @@
*
*/
public static String WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(arg0, arg1));
+ return LOCALIZER.localize(localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableWSP_1019_CREATE_EMPTY_POLICY_MAP() {
+ return MESSAGE_FACTORY.getMessage("WSP_1019_CREATE_EMPTY_POLICY_MAP");
+ }
+
+ /**
+ * WSP1019: Failed to find any configuration file. Creating new empty policy map.
+ *
+ */
+ public static String WSP_1019_CREATE_EMPTY_POLICY_MAP() {
+ return LOCALIZER.localize(localizableWSP_1019_CREATE_EMPTY_POLICY_MAP());
}
- public static Localizable localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(Object arg0) {
- return messageFactory.getMessage("WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT", arg0);
+ public static Localizable localizableWSP_1020_DUPLICATE_ID(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1020_DUPLICATE_ID", arg0);
+ }
+
+ /**
+ * WSP1020: Found two policies in one document with the same id: "{0}".
+ *
+ */
+ public static String WSP_1020_DUPLICATE_ID(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1020_DUPLICATE_ID(arg0));
+ }
+
+ public static Localizable localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
+ return MESSAGE_FACTORY.getMessage("WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE");
}
/**
- * WSP1013: Exception occurred while reading policy element. Following was read so far: {0}.
+ * WSP1002: Unable to marshall policy or it's reference. See original exception for more details.
*
*/
- public static String WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(Object arg0) {
- return localizer.localize(localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(arg0));
+ public static String WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
+ return LOCALIZER.localize(localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE());
}
- public static Localizable localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL");
+ public static Localizable localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL", arg0);
}
/**
- * WSP1006: Policy map extender can not be null.
+ * WSP1008: Not marshalling policy, wsdl subject is null for "{0}".
*
*/
- public static String WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL());
+ public static String WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
+ return LOCALIZER.localize(localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(arg0));
+ }
+
+ public static Localizable localizableWSP_1017_MAP_UPDATE_FAILED() {
+ return MESSAGE_FACTORY.getMessage("WSP_1017_MAP_UPDATE_FAILED");
+ }
+
+ /**
+ * WSP1048: Policy map setup failed - exception occurred while trying to modify policy map content.
+ *
+ */
+ public static String WSP_1017_MAP_UPDATE_FAILED() {
+ return LOCALIZER.localize(localizableWSP_1017_MAP_UPDATE_FAILED());
}
public static Localizable localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(Object arg0) {
- return messageFactory.getMessage("WSP_1018_FAILED_TO_MARSHALL_POLICY", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_1018_FAILED_TO_MARSHALL_POLICY", arg0);
}
/**
@@ -188,11 +210,59 @@
*
*/
public static String WSP_1018_FAILED_TO_MARSHALL_POLICY(Object arg0) {
- return localizer.localize(localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(arg0));
+ return LOCALIZER.localize(localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(arg0));
+ }
+
+ public static Localizable localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL() {
+ return MESSAGE_FACTORY.getMessage("WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL");
+ }
+
+ /**
+ * WSP1004: Policy URIs can not be null.
+ *
+ */
+ public static String WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL() {
+ return LOCALIZER.localize(localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL());
+ }
+
+ public static Localizable localizableWSP_1010_NO_POLICIES_DEFINED() {
+ return MESSAGE_FACTORY.getMessage("WSP_1010_NO_POLICIES_DEFINED");
+ }
+
+ /**
+ * WSP1010: No policies defined.
+ *
+ */
+ public static String WSP_1010_NO_POLICIES_DEFINED() {
+ return LOCALIZER.localize(localizableWSP_1010_NO_POLICIES_DEFINED());
+ }
+
+ public static Localizable localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
+ return MESSAGE_FACTORY.getMessage("WSP_1012_FAILED_CONFIGURE_WSDL_MODEL");
+ }
+
+ /**
+ * WSP1012: Failed to configure wsdl model.
+ *
+ */
+ public static String WSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
+ return LOCALIZER.localize(localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL());
+ }
+
+ public static Localizable localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED", arg0, arg1);
+ }
+
+ /**
+ * WSP1015: Server side assertion validation failed for "{0}" assertion. Assertion was evaluated as "{1}".
+ *
+ */
+ public static String WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(arg0, arg1));
}
public static Localizable localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(Object arg0) {
- return messageFactory.getMessage("WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST", arg0);
+ return MESSAGE_FACTORY.getMessage("WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST", arg0);
}
/**
@@ -200,103 +270,42 @@
*
*/
public static String WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(Object arg0) {
- return localizer.localize(localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(arg0));
- }
-
- public static Localizable localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
- return messageFactory.getMessage("WSP_1016_POLICY_ID_NULL_OR_DUPLICATE", arg0);
+ return LOCALIZER.localize(localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(arg0));
}
- /**
- * WSP1016: The policy is not added because it has no ID or a policy with the same ID was already added: {0}.
- *
- */
- public static String WSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
- return localizer.localize(localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(arg0));
- }
-
- public static Localizable localizableWSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
- return messageFactory.getMessage("WSP_1014_CAN_NOT_FIND_POLICY", arg0);
+ public static Localizable localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
+ return MESSAGE_FACTORY.getMessage("WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL");
}
/**
- * WSP1014: Can not find policy "{0}" that is referenced in from the WSDL. Please, check your policy references in the WSDL.
+ * WSP1006: Policy map extender can not be null.
*
*/
- public static String WSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
- return localizer.localize(localizableWSP_1014_CAN_NOT_FIND_POLICY(arg0));
- }
-
- public static Localizable localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
- return messageFactory.getMessage("WSP_1012_FAILED_CONFIGURE_WSDL_MODEL");
+ public static String WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
+ return LOCALIZER.localize(localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL());
}
- /**
- * WSP1012: Failed to configure wsdl model.
- *
- */
- public static String WSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
- return localizer.localize(localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL());
- }
-
- public static Localizable localizableWSP_1021_FAULT_NOT_BOUND(Object arg0) {
- return messageFactory.getMessage("WSP_1021_FAULT_NOT_BOUND", arg0);
+ public static Localizable localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
+ return MESSAGE_FACTORY.getMessage("WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL");
}
/**
- * WSP1021: Fault "{0}" not bound. Check names in port and binding definitions.
- *
- */
- public static String WSP_1021_FAULT_NOT_BOUND(Object arg0) {
- return localizer.localize(localizableWSP_1021_FAULT_NOT_BOUND(arg0));
- }
-
- public static Localizable localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
- return messageFactory.getMessage("WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT", arg0);
- }
-
- /**
- * WSP1011: Failed to retrieve effective policy for subject: {0}.
- *
- */
- public static String WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
- return localizer.localize(localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(arg0));
- }
-
- public static Localizable localizableWSP_1019_CREATE_EMPTY_POLICY_MAP() {
- return messageFactory.getMessage("WSP_1019_CREATE_EMPTY_POLICY_MAP");
- }
-
- /**
- * WSP1019: Failed to find any configuration file. Creating new empty policy map.
+ * WSP1007: Policy exception occurred when finishing WSDL parsing.
*
*/
- public static String WSP_1019_CREATE_EMPTY_POLICY_MAP() {
- return localizer.localize(localizableWSP_1019_CREATE_EMPTY_POLICY_MAP());
- }
-
- public static Localizable localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE() {
- return messageFactory.getMessage("WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE");
+ public static String WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
+ return LOCALIZER.localize(localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL());
}
- /**
- * WSP1001: XMLStreamException occurred when reading policy reference element.
- *
- */
- public static String WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE() {
- return localizer.localize(localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE());
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL() {
- return messageFactory.getMessage("WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL");
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * WSP1004: Policy URIs can not be null.
- *
- */
- public static String WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL() {
- return localizer.localize(localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL());
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,40 @@
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 ProviderApiMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.providerApi";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ProviderApiMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ProviderApiMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableNULL_SERVICE() {
+ return MESSAGE_FACTORY.getMessage("null.service");
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ /**
+ * serviceName can't be null when portName is specified
+ *
+ */
+ public static String NULL_SERVICE() {
+ return LOCALIZER.localize(localizableNULL_SERVICE());
}
public static Localizable localizableNULL_ADDRESS_SERVICE_ENDPOINT() {
- return messageFactory.getMessage("null.address.service.endpoint");
+ return MESSAGE_FACTORY.getMessage("null.address.service.endpoint");
}
/**
@@ -56,11 +66,35 @@
*
*/
public static String NULL_ADDRESS_SERVICE_ENDPOINT() {
- return localizer.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
+ return LOCALIZER.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
+ }
+
+ public static Localizable localizableNULL_PORTNAME() {
+ return MESSAGE_FACTORY.getMessage("null.portname");
+ }
+
+ /**
+ * EPR doesn't have EndpointName in the Metadata
+ *
+ */
+ public static String NULL_PORTNAME() {
+ return LOCALIZER.localize(localizableNULL_PORTNAME());
+ }
+
+ public static Localizable localizableNULL_WSDL() {
+ return MESSAGE_FACTORY.getMessage("null.wsdl");
+ }
+
+ /**
+ * EPR doesn't have WSDL Metadata which is needed for the current operation
+ *
+ */
+ public static String NULL_WSDL() {
+ return LOCALIZER.localize(localizableNULL_WSDL());
}
public static Localizable localizableNO_WSDL_NO_PORT(Object arg0) {
- return messageFactory.getMessage("no.wsdl.no.port", arg0);
+ return MESSAGE_FACTORY.getMessage("no.wsdl.no.port", arg0);
}
/**
@@ -68,23 +102,47 @@
*
*/
public static String NO_WSDL_NO_PORT(Object arg0) {
- return localizer.localize(localizableNO_WSDL_NO_PORT(arg0));
+ return LOCALIZER.localize(localizableNO_WSDL_NO_PORT(arg0));
+ }
+
+ public static Localizable localizableNOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("notfound.port.in.wsdl", arg0, arg1, arg2);
}
- public static Localizable localizableNULL_SERVICE() {
- return messageFactory.getMessage("null.service");
+ /**
+ * Port: {0} not a valid port in Service: {1} in WSDL: {2}
+ *
+ */
+ public static String NOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableNOTFOUND_PORT_IN_WSDL(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableNOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("notfound.service.in.wsdl", arg0, arg1);
}
/**
- * serviceName can't be null when portName is specified
+ * Service: {0} not found in WSDL: {1}
*
*/
- public static String NULL_SERVICE() {
- return localizer.localize(localizableNULL_SERVICE());
+ public static String NOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableNOTFOUND_SERVICE_IN_WSDL(arg0, arg1));
+ }
+
+ public static Localizable localizableNULL_EPR() {
+ return MESSAGE_FACTORY.getMessage("null.epr");
+ }
+
+ /**
+ * EndpointReference is null
+ *
+ */
+ public static String NULL_EPR() {
+ return LOCALIZER.localize(localizableNULL_EPR());
}
public static Localizable localizableNULL_ADDRESS() {
- return messageFactory.getMessage("null.address");
+ return MESSAGE_FACTORY.getMessage("null.address");
}
/**
@@ -92,71 +150,11 @@
*
*/
public static String NULL_ADDRESS() {
- return localizer.localize(localizableNULL_ADDRESS());
- }
-
- public static Localizable localizableNULL_PORTNAME() {
- return messageFactory.getMessage("null.portname");
- }
-
- /**
- * EPR doesn't have EndpointName in the Metadata
- *
- */
- public static String NULL_PORTNAME() {
- return localizer.localize(localizableNULL_PORTNAME());
- }
-
- public static Localizable localizableNOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
- return messageFactory.getMessage("notfound.service.in.wsdl", arg0, arg1);
- }
-
- /**
- * Service: {0} not found in WSDL: {1}
- *
- */
- public static String NOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
- return localizer.localize(localizableNOTFOUND_SERVICE_IN_WSDL(arg0, arg1));
- }
-
- public static Localizable localizableNULL_EPR() {
- return messageFactory.getMessage("null.epr");
- }
-
- /**
- * EndpointReference is null
- *
- */
- public static String NULL_EPR() {
- return localizer.localize(localizableNULL_EPR());
- }
-
- public static Localizable localizableNULL_WSDL() {
- return messageFactory.getMessage("null.wsdl");
- }
-
- /**
- * EPR doesn't have WSDL Metadata which is needed for the current operation
- *
- */
- public static String NULL_WSDL() {
- return localizer.localize(localizableNULL_WSDL());
- }
-
- public static Localizable localizableNOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("notfound.port.in.wsdl", arg0, arg1, arg2);
- }
-
- /**
- * Port: {0} not a valid port in Service: {1} in WSDL: {2}
- *
- */
- public static String NOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableNOTFOUND_PORT_IN_WSDL(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableNULL_ADDRESS());
}
public static Localizable localizableERROR_WSDL(Object arg0) {
- return messageFactory.getMessage("error.wsdl", arg0);
+ return MESSAGE_FACTORY.getMessage("error.wsdl", arg0);
}
/**
@@ -164,7 +162,18 @@
*
*/
public static String ERROR_WSDL(Object arg0) {
- return localizer.localize(localizableERROR_WSDL(arg0));
+ return LOCALIZER.localize(localizableERROR_WSDL(arg0));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,52 @@
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 SenderMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.sender";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, SenderMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new SenderMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableSENDER_REQUEST_MESSAGE_NOT_READY() {
+ return MESSAGE_FACTORY.getMessage("sender.request.messageNotReady");
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ /**
+ * message not ready to be sent
+ *
+ */
+ public static String SENDER_REQUEST_MESSAGE_NOT_READY() {
+ return LOCALIZER.localize(localizableSENDER_REQUEST_MESSAGE_NOT_READY());
+ }
+
+ public static Localizable localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
+ return MESSAGE_FACTORY.getMessage("sender.response.cannotDecodeFaultDetail");
+ }
+
+ /**
+ * fault detail cannot be decoded
+ *
+ */
+ public static String SENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
+ return LOCALIZER.localize(localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL());
}
public static Localizable localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(Object arg0) {
- return messageFactory.getMessage("sender.request.illegalValueForContentNegotiation", arg0);
+ return MESSAGE_FACTORY.getMessage("sender.request.illegalValueForContentNegotiation", arg0);
}
/**
@@ -56,23 +78,11 @@
*
*/
public static String SENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(Object arg0) {
- return localizer.localize(localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(arg0));
- }
-
- public static Localizable localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
- return messageFactory.getMessage("sender.response.cannotDecodeFaultDetail");
- }
-
- /**
- * fault detail cannot be decoded
- *
- */
- public static String SENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
- return localizer.localize(localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL());
+ return LOCALIZER.localize(localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(arg0));
}
public static Localizable localizableSENDER_NESTED_ERROR(Object arg0) {
- return messageFactory.getMessage("sender.nestedError", arg0);
+ return MESSAGE_FACTORY.getMessage("sender.nestedError", arg0);
}
/**
@@ -80,19 +90,18 @@
*
*/
public static String SENDER_NESTED_ERROR(Object arg0) {
- return localizer.localize(localizableSENDER_NESTED_ERROR(arg0));
- }
-
- public static Localizable localizableSENDER_REQUEST_MESSAGE_NOT_READY() {
- return messageFactory.getMessage("sender.request.messageNotReady");
+ return LOCALIZER.localize(localizableSENDER_NESTED_ERROR(arg0));
}
- /**
- * message not ready to be sent
- *
- */
- public static String SENDER_REQUEST_MESSAGE_NOT_READY() {
- return localizer.localize(localizableSENDER_REQUEST_MESSAGE_NOT_READY());
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,276 @@
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 ServerMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.server";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ServerMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ServerMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableDUPLICATE_ABSTRACT_WSDL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("duplicate.abstract.wsdl", arg0);
+ }
+
+ /**
+ * Metadata has more than one WSDL that has PortType definition for the endpoint. WSDL={0} is one such WSDL.
+ *
+ */
+ public static String DUPLICATE_ABSTRACT_WSDL(Object arg0) {
+ return LOCALIZER.localize(localizableDUPLICATE_ABSTRACT_WSDL(arg0));
+ }
+
+ public static Localizable localizableNOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("not.know.HttpContext.type", arg0, arg1, arg2);
+ }
+
+ /**
+ * Doesn''t support Endpoint.publish({0}). Known context types are {1}, and {2}
+ *
+ */
+ public static String NOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableNOT_KNOW_HTTP_CONTEXT_TYPE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableUNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("unsupported.contentType", arg0, arg1);
+ }
+
+ /**
+ * Unsupported Content-Type: {0} Supported ones are: {1}
+ *
+ */
+ public static String UNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableUNSUPPORTED_CONTENT_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.not.found", arg0);
+ }
+
+ /**
+ * {0} is not found in the WAR file. Package it in the WAR file or correct it in sun-jaxws.xml.
+ *
+ */
+ public static String RUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableSOAPENCODER_ERR() {
+ return MESSAGE_FACTORY.getMessage("soapencoder.err");
+ }
+
+ /**
+ * Error in encoding SOAP Message
+ *
+ */
+ public static String SOAPENCODER_ERR() {
+ return LOCALIZER.localize(localizableSOAPENCODER_ERR());
+ }
+
+ public static Localizable localizableWSDL_REQUIRED() {
+ return MESSAGE_FACTORY.getMessage("wsdl.required");
+ }
+
+ /**
+ * wsdl is required
+ *
+ */
+ public static String WSDL_REQUIRED() {
+ return LOCALIZER.localize(localizableWSDL_REQUIRED());
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.noservice.in.wsdlmodel", arg0);
+ }
+
+ /**
+ * There is an error in processing the WSDL {0} and no valid services are found.
+ *
+ */
+ public static String RUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(arg0));
+ }
+
+ public static Localizable localizableNULL_IMPLEMENTOR() {
+ return MESSAGE_FACTORY.getMessage("null.implementor");
+ }
+
+ /**
+ * Implementor cannot be null
+ *
+ */
+ public static String NULL_IMPLEMENTOR() {
+ return LOCALIZER.localize(localizableNULL_IMPLEMENTOR());
+ }
+
+ public static Localizable localizableSERVER_RT_ERR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("server.rt.err", arg0);
+ }
+
+ /**
+ * Server Runtime Error: {0}
+ *
+ */
+ public static String SERVER_RT_ERR(Object arg0) {
+ return LOCALIZER.localize(localizableSERVER_RT_ERR(arg0));
+ }
+
+ public static Localizable localizableWRONG_PARAMETER_TYPE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wrong.parameter.type", arg0);
+ }
+
+ /**
+ * Incorrect argument types for method "{0}"
+ *
+ */
+ public static String WRONG_PARAMETER_TYPE(Object arg0) {
+ return LOCALIZER.localize(localizableWRONG_PARAMETER_TYPE(arg0));
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.incorrectserviceport", arg0, arg1, arg2);
+ }
+
+ /**
+ * could not get binding from WSDL! service: {0} or port {1} not found in the WSDL {2}.
+ * It could be because service and port names do not match WSDL''s wsdl:service and wsdl:port names:
+ * 1. service and port names are not there in deployment descriptor OR
+ * 2. Either there is a typo in deployment descriptor''s service and port names OR
+ * 3. The computed names from @WebService do not match wsdl:service and wsdl:port names
+ * Suggest doing the following:
+ * 1. Add/Correct entries for service and port names in deployment descriptor OR
+ * 2. Specify targetNamespace, serviceName, portName in @WebService on the endpoint class
+ *
+ */
+ public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_XML_READER(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.xmlReader", arg0);
+ }
+
+ /**
+ * error parsing runtime descriptor: {0}
+ *
+ */
+ public static String RUNTIME_PARSER_XML_READER(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_XML_READER(arg0));
+ }
+
+ public static Localizable localizableDD_MTOM_CONFLICT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("dd.mtom.conflict", arg0, arg1);
+ }
+
+ /**
+ * Error in Deployment Descriptor : MTOM Configuration in binding {0} conflicts with enable-mtom attribute value {1}
+ *
+ */
+ public static String DD_MTOM_CONFLICT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableDD_MTOM_CONFLICT(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.invalid.attribute.value", arg0, arg1);
+ }
+
+ /**
+ * invalid attribute value "{1}" in runtime descriptor (line {0})
+ *
+ */
+ public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.saxparser.exception", arg0, arg1);
+ }
+
+ /**
+ * {0}
+ * {1}
+ *
+ */
+ public static String RUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_SAXPARSER_EXCEPTION(arg0, arg1));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER() {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.invalidVersionNumber");
+ }
+
+ /**
+ * unsupported runtime descriptor version: {2}
+ *
+ */
+ public static String RUNTIME_PARSER_INVALID_VERSION_NUMBER() {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER());
+ }
+
+ public static Localizable localizableWRONG_TNS_FOR_PORT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wrong.tns.for.port", arg0);
+ }
+
+ /**
+ * Port namespace {0} doesn't match Service namespace {1}
+ *
+ */
+ public static String WRONG_TNS_FOR_PORT(Object arg0) {
+ return LOCALIZER.localize(localizableWRONG_TNS_FOR_PORT(arg0));
+ }
+
+ public static Localizable localizableANNOTATION_ONLY_ONCE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("annotation.only.once", arg0);
+ }
+
+ /**
+ * Only one method should have the annotation "{0}"
+ *
+ */
+ public static String ANNOTATION_ONLY_ONCE(Object arg0) {
+ return LOCALIZER.localize(localizableANNOTATION_ONLY_ONCE(arg0));
+ }
+
+ public static Localizable localizableSTATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("stateful.cookie.header.incorrect", arg0, arg1);
+ }
+
+ /**
+ * Invalid/expired {0} header value: {1}
+ *
+ */
+ public static String STATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableSTATEFUL_COOKIE_HEADER_INCORRECT(arg0, arg1));
+ }
+
+ public static Localizable localizableSERVICE_NAME_REQUIRED() {
+ return MESSAGE_FACTORY.getMessage("service.name.required");
+ }
+
+ /**
+ * Service QName is not found
+ *
+ */
+ public static String SERVICE_NAME_REQUIRED() {
+ return LOCALIZER.localize(localizableSERVICE_NAME_REQUIRED());
}
public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.parser.wsdl.incorrectservice", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.incorrectservice", arg0, arg1);
}
/**
@@ -65,71 +311,23 @@
*
*/
public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICE(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
- return messageFactory.getMessage("runtime.parser.missing.attribute.no.line");
- }
-
- /**
- * missing attribute "{2}" in element "{1}" of runtime descriptor
- *
- */
- public static String RUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
- return localizer.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE());
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(arg0, arg1));
}
- public static Localizable localizableSTATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
- return messageFactory.getMessage("stateful.cookie.header.incorrect", arg0, arg1);
- }
-
- /**
- * Invalid/expired {0} header value: {1}
- *
- */
- public static String STATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
- return localizer.localize(localizableSTATEFUL_COOKIE_HEADER_INCORRECT(arg0, arg1));
- }
-
- public static Localizable localizableNOT_IMPLEMENT_PROVIDER(Object arg0) {
- return messageFactory.getMessage("not.implement.provider", arg0);
+ public static Localizable localizableDUPLICATE_PRIMARY_WSDL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("duplicate.primary.wsdl", arg0);
}
/**
- * "{0}" doesn't implement Provider
- *
- */
- public static String NOT_IMPLEMENT_PROVIDER(Object arg0) {
- return localizer.localize(localizableNOT_IMPLEMENT_PROVIDER(arg0));
- }
-
- public static Localizable localizableSTATEFUL_REQURES_ADDRESSING(Object arg0) {
- return messageFactory.getMessage("stateful.requres.addressing", arg0);
- }
-
- /**
- * Stateful web service {0} requires the WS-Addressing support to be enabled. Perhaps you are missing @Addressing
+ * Metadata has more than one WSDL that has Service definition for the endpoint. WSDL={0} is one such WSDL.
*
*/
- public static String STATEFUL_REQURES_ADDRESSING(Object arg0) {
- return localizer.localize(localizableSTATEFUL_REQURES_ADDRESSING(arg0));
- }
-
- public static Localizable localizableSOAPDECODER_ERR() {
- return messageFactory.getMessage("soapdecoder.err");
- }
-
- /**
- * Error in decoding SOAP Message
- *
- */
- public static String SOAPDECODER_ERR() {
- return localizer.localize(localizableSOAPDECODER_ERR());
+ public static String DUPLICATE_PRIMARY_WSDL(Object arg0) {
+ return LOCALIZER.localize(localizableDUPLICATE_PRIMARY_WSDL(arg0));
}
public static Localizable localizableGENERATE_NON_STANDARD_WSDL() {
- return messageFactory.getMessage("generate.non.standard.wsdl");
+ return MESSAGE_FACTORY.getMessage("generate.non.standard.wsdl");
}
/**
@@ -137,11 +335,59 @@
*
*/
public static String GENERATE_NON_STANDARD_WSDL() {
- return localizer.localize(localizableGENERATE_NON_STANDARD_WSDL());
+ return LOCALIZER.localize(localizableGENERATE_NON_STANDARD_WSDL());
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.missing.attribute.no.line");
+ }
+
+ /**
+ * missing attribute "{2}" in element "{1}" of runtime descriptor
+ *
+ */
+ public static String RUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE());
+ }
+
+ public static Localizable localizableWRONG_FIELD_TYPE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wrong.field.type", arg0);
+ }
+
+ /**
+ * Incorrect type for field "{0}"
+ *
+ */
+ public static String WRONG_FIELD_TYPE(Object arg0) {
+ return LOCALIZER.localize(localizableWRONG_FIELD_TYPE(arg0));
+ }
+
+ public static Localizable localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("failed.to.instantiate.instanceResolver", arg0, arg1, arg2);
+ }
+
+ /**
+ * Unable to instantiate {0} (which is specified in {1} on {2})
+ *
+ */
+ public static String FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizablePROVIDER_NOT_PARAMETERIZED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("provider.not.parameterized", arg0);
+ }
+
+ /**
+ * "{0}" implements Provider but doesn't specify the type parameter
+ *
+ */
+ public static String PROVIDER_NOT_PARAMETERIZED(Object arg0) {
+ return LOCALIZER.localize(localizablePROVIDER_NOT_PARAMETERIZED(arg0));
}
public static Localizable localizableDISPATCH_CANNOT_FIND_METHOD(Object arg0) {
- return messageFactory.getMessage("dispatch.cannotFindMethod", arg0);
+ return MESSAGE_FACTORY.getMessage("dispatch.cannotFindMethod", arg0);
}
/**
@@ -149,47 +395,95 @@
*
*/
public static String DISPATCH_CANNOT_FIND_METHOD(Object arg0) {
- return localizer.localize(localizableDISPATCH_CANNOT_FIND_METHOD(arg0));
+ return LOCALIZER.localize(localizableDISPATCH_CANNOT_FIND_METHOD(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wrong.element", arg0, arg1, arg2);
}
- public static Localizable localizableNO_CONTENT_TYPE() {
- return messageFactory.getMessage("no.contentType");
+ /**
+ * found element "{1}", expected "{2}" in runtime descriptor (line {0})
+ *
+ */
+ public static String RUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableUNSUPPORTED_CHARSET(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("unsupported.charset", arg0);
}
/**
- * Request doesn't have a Content-Type
+ * Unsupported charset "{0}" in the received message''s Content-Type
*
*/
- public static String NO_CONTENT_TYPE() {
- return localizer.localize(localizableNO_CONTENT_TYPE());
+ public static String UNSUPPORTED_CHARSET(Object arg0) {
+ return LOCALIZER.localize(localizableUNSUPPORTED_CHARSET(arg0));
+ }
+
+ public static Localizable localizableSTATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("stateful.cookie.header.required", arg0);
}
- public static Localizable localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER() {
- return messageFactory.getMessage("runtime.parser.invalidVersionNumber");
+ /**
+ * This is a stateful web service and {0} header is required.
+ *
+ */
+ public static String STATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
+ return LOCALIZER.localize(localizableSTATEFUL_COOKIE_HEADER_REQUIRED(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_WSDL_PATCHER() {
+ return MESSAGE_FACTORY.getMessage("runtime.wsdl.patcher");
}
/**
- * unsupported runtime descriptor version: {2}
+ * error while patching WSDL related document
*
*/
- public static String RUNTIME_PARSER_INVALID_VERSION_NUMBER() {
- return localizer.localize(localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER());
+ public static String RUNTIME_WSDL_PATCHER() {
+ return LOCALIZER.localize(localizableRUNTIME_WSDL_PATCHER());
}
- public static Localizable localizablePROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("provider.invalid.parameterType", arg0, arg1);
+ public static Localizable localizableSTATEFUL_REQURES_ADDRESSING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("stateful.requres.addressing", arg0);
}
/**
- * "{0}" implements Provider but its type parameter {1} is incorrect
+ * Stateful web service {0} requires the WS-Addressing support to be enabled. Perhaps you are missing @Addressing
+ *
+ */
+ public static String STATEFUL_REQURES_ADDRESSING(Object arg0) {
+ return LOCALIZER.localize(localizableSTATEFUL_REQURES_ADDRESSING(arg0));
+ }
+
+ public static Localizable localizableNON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("non.unique.dispatch.qname", arg0, arg1);
+ }
+
+ /**
+ * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. Methods {0} have the same request body block {1}. Method dispatching may fail, runtime will try to dispatch using SOAPAction. Another option is to enable AddressingFeature to enabled runtime to uniquely identify WSDL operation using wsa:Action header.
*
*/
- public static String PROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizablePROVIDER_INVALID_PARAMETER_TYPE(arg0, arg1));
+ public static String NON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableNON_UNIQUE_DISPATCH_QNAME(arg0, arg1));
+ }
+
+ public static Localizable localizableALREADY_HTTP_SERVER(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("already.http.server", arg0);
+ }
+
+ /**
+ * There is already a HTTP server at : {0}# {0} - probably URL/port of a server
+ *
+ */
+ public static String ALREADY_HTTP_SERVER(Object arg0) {
+ return LOCALIZER.localize(localizableALREADY_HTTP_SERVER(arg0));
}
public static Localizable localizableWRONG_NO_PARAMETERS(Object arg0) {
- return messageFactory.getMessage("wrong.no.parameters", arg0);
+ return MESSAGE_FACTORY.getMessage("wrong.no.parameters", arg0);
}
/**
@@ -197,23 +491,131 @@
*
*/
public static String WRONG_NO_PARAMETERS(Object arg0) {
- return localizer.localize(localizableWRONG_NO_PARAMETERS(arg0));
+ return LOCALIZER.localize(localizableWRONG_NO_PARAMETERS(arg0));
+ }
+
+ public static Localizable localizableNOT_ZERO_PARAMETERS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("not.zero.parameters", arg0);
+ }
+
+ /**
+ * Method "{0}" shouldn''t have any arguments
+ *
+ */
+ public static String NOT_ZERO_PARAMETERS(Object arg0) {
+ return LOCALIZER.localize(localizableNOT_ZERO_PARAMETERS(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.invalidAttributeValue", arg0, arg1, arg2);
+ }
+
+ /**
+ * invalid value for attribute "{2}" of element "{1}" in runtime descriptor (line {0})
+ *
+ */
+ public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1, arg2));
}
- public static Localizable localizableANNOTATION_ONLY_ONCE(Object arg0) {
- return messageFactory.getMessage("annotation.only.once", arg0);
+ public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.missing.attribute", arg0, arg1, arg2);
+ }
+
+ /**
+ * missing attribute "{2}" in element "{1}" of runtime descriptor (line {0})
+ *
+ */
+ public static String RUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.unexpectedContent", arg0);
+ }
+
+ /**
+ * unexpected content in runtime descriptor (line {0})
+ *
+ */
+ public static String RUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(arg0));
+ }
+
+ public static Localizable localizableRUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.classNotFound", arg0);
}
/**
- * Only one method should have the annotation "{0}"
+ * class not found in runtime descriptor: {0}
+ *
+ */
+ public static String RUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_CLASS_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("stateful.invalid.webservice.context", arg0);
+ }
+
+ /**
+ * Not a WebServiceContext from JAX-WS RI: {0}
+ *
+ */
+ public static String STATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
+ return LOCALIZER.localize(localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(arg0));
+ }
+
+ public static Localizable localizableNO_CURRENT_PACKET() {
+ return MESSAGE_FACTORY.getMessage("no.current.packet");
+ }
+
+ /**
+ * This thread is not currently processing any web service request.
*
*/
- public static String ANNOTATION_ONLY_ONCE(Object arg0) {
- return localizer.localize(localizableANNOTATION_ONLY_ONCE(arg0));
+ public static String NO_CURRENT_PACKET() {
+ return LOCALIZER.localize(localizableNO_CURRENT_PACKET());
+ }
+
+ public static Localizable localizableDUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("duplicate.portKnownHeader", arg0);
+ }
+
+ /**
+ * Received SOAP message contains duplicate header: {0} for a bound parameter
+ *
+ */
+ public static String DUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
+ return LOCALIZER.localize(localizableDUPLICATE_PORT_KNOWN_HEADER(arg0));
+ }
+
+ public static Localizable localizableSTATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("static.resource.injection.only", arg0, arg1);
+ }
+
+ /**
+ * Static resource {0} cannot be injected to non-static "{1}"
+ *
+ */
+ public static String STATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableSTATIC_RESOURCE_INJECTION_ONLY(arg0, arg1));
+ }
+
+ public static Localizable localizableCAN_NOT_GENERATE_WSDL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("can.not.generate.wsdl", arg0);
+ }
+
+ /**
+ * Cannot generate WSDL for binding "{0}"
+ *
+ */
+ public static String CAN_NOT_GENERATE_WSDL(Object arg0) {
+ return LOCALIZER.localize(localizableCAN_NOT_GENERATE_WSDL(arg0));
}
public static Localizable localizableALREADY_HTTPS_SERVER(Object arg0) {
- return messageFactory.getMessage("already.https.server", arg0);
+ return MESSAGE_FACTORY.getMessage("already.https.server", arg0);
}
/**
@@ -221,114 +623,59 @@
*
*/
public static String ALREADY_HTTPS_SERVER(Object arg0) {
- return localizer.localize(localizableALREADY_HTTPS_SERVER(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_XML_READER(Object arg0) {
- return messageFactory.getMessage("runtime.parser.xmlReader", arg0);
+ return LOCALIZER.localize(localizableALREADY_HTTPS_SERVER(arg0));
}
- /**
- * error parsing runtime descriptor: {0}
- *
- */
- public static String RUNTIME_PARSER_XML_READER(Object arg0) {
- return localizer.localize(localizableRUNTIME_PARSER_XML_READER(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.parser.wsdl.incorrectserviceport", arg0, arg1, arg2);
+ public static Localizable localizableRUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.invalidElement", arg0, arg1);
}
/**
- * could not get binding from WSDL! service: {0} or port {1} not found in the WSDL {2}.
- * It could be because service and port names do not match WSDL''s wsdl:service and wsdl:port names:
- * 1. service and port names are not there in deployment descriptor OR
- * 2. Either there is a typo in deployment descriptor''s service and port names OR
- * 3. The computed names from @WebService do not match wsdl:service and wsdl:port names
- * Suggest doing the following:
- * 1. Add/Correct entries for service and port names in deployment descriptor OR
- * 2. Specify targetNamespace, serviceName, portName in @WebService on the endpoint class
+ * invalid element "{1}" in runtime descriptor (line {0})
*
*/
- public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(arg0, arg1, arg2));
+ public static String RUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_ELEMENT(arg0, arg1));
}
- public static Localizable localizableSERVER_RT_ERR(Object arg0) {
- return messageFactory.getMessage("server.rt.err", arg0);
- }
-
- /**
- * Server Runtime Error: {0}
- *
- */
- public static String SERVER_RT_ERR(Object arg0) {
- return localizer.localize(localizableSERVER_RT_ERR(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.parser.invalidAttributeValue", arg0, arg1, arg2);
+ public static Localizable localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.multiplebinding", arg0, arg1, arg2);
}
/**
- * invalid value for attribute "{2}" of element "{1}" in runtime descriptor (line {0})
+ * multiple bindings found for binding ID {0} for service {1} in WSDL {2}
*
*/
- public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableNO_CURRENT_PACKET() {
- return messageFactory.getMessage("no.current.packet");
+ public static String RUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(arg0, arg1, arg2));
}
- /**
- * This thread is not currently processing any web service request.
- *
- */
- public static String NO_CURRENT_PACKET() {
- return localizer.localize(localizableNO_CURRENT_PACKET());
- }
-
- public static Localizable localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
- return messageFactory.getMessage("runtime.parser.unexpectedContent", arg0);
+ public static Localizable localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("runtimemodeler.invalidannotationOnImpl", arg0, arg1, arg2);
}
/**
- * unexpected content in runtime descriptor (line {0})
+ * Invalid annotation: {0} on endpoint implementation class "{1}" - will be ignored. "{1}" is annotated with @WebService(endpointInterface="{2}"}, it must not be annotated with {0}, to fix it - put this annotation on the SEI {2}.
*
*/
- public static String RUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
- return localizer.localize(localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(arg0));
+ public static String RUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(arg0, arg1, arg2));
}
- public static Localizable localizableSTATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
- return messageFactory.getMessage("stateful.cookie.header.required", arg0);
+ public static Localizable localizablePROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("provider.invalid.parameterType", arg0, arg1);
}
/**
- * This is a stateful web service and {0} header is required.
+ * "{0}" implements Provider but its type parameter {1} is incorrect
*
*/
- public static String STATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
- return localizer.localize(localizableSTATEFUL_COOKIE_HEADER_REQUIRED(arg0));
- }
-
- public static Localizable localizableNULL_IMPLEMENTOR() {
- return messageFactory.getMessage("null.implementor");
- }
-
- /**
- * Implementor cannot be null
- *
- */
- public static String NULL_IMPLEMENTOR() {
- return localizer.localize(localizableNULL_IMPLEMENTOR());
+ public static String PROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizablePROVIDER_INVALID_PARAMETER_TYPE(arg0, arg1));
}
public static Localizable localizableRUNTIME_PARSER_WSDL(Object arg0) {
- return messageFactory.getMessage("runtime.parser.wsdl", arg0);
+ return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl", arg0);
}
/**
@@ -336,47 +683,47 @@
*
*/
public static String RUNTIME_PARSER_WSDL(Object arg0) {
- return localizer.localize(localizableRUNTIME_PARSER_WSDL(arg0));
+ return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL(arg0));
}
- public static Localizable localizableSOAPENCODER_ERR() {
- return messageFactory.getMessage("soapencoder.err");
+ public static Localizable localizableNO_CONTENT_TYPE() {
+ return MESSAGE_FACTORY.getMessage("no.contentType");
}
/**
- * Error in encoding SOAP Message
+ * Request doesn't have a Content-Type
*
*/
- public static String SOAPENCODER_ERR() {
- return localizer.localize(localizableSOAPENCODER_ERR());
+ public static String NO_CONTENT_TYPE() {
+ return LOCALIZER.localize(localizableNO_CONTENT_TYPE());
}
- public static Localizable localizableWSDL_REQUIRED() {
- return messageFactory.getMessage("wsdl.required");
+ public static Localizable localizableNOT_IMPLEMENT_PROVIDER(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("not.implement.provider", arg0);
}
/**
- * wsdl is required
+ * "{0}" doesn't implement Provider
*
*/
- public static String WSDL_REQUIRED() {
- return localizer.localize(localizableWSDL_REQUIRED());
+ public static String NOT_IMPLEMENT_PROVIDER(Object arg0) {
+ return LOCALIZER.localize(localizableNOT_IMPLEMENT_PROVIDER(arg0));
}
- public static Localizable localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
- return messageFactory.getMessage("runtime.parser.wsdl.noservice.in.wsdlmodel", arg0);
+ public static Localizable localizableSOAPDECODER_ERR() {
+ return MESSAGE_FACTORY.getMessage("soapdecoder.err");
}
/**
- * There is an error in processing the WSDL {0} and no valid services are found.
+ * Error in decoding SOAP Message
*
*/
- public static String RUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
- return localizer.localize(localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(arg0));
+ public static String SOAPDECODER_ERR() {
+ return LOCALIZER.localize(localizableSOAPDECODER_ERR());
}
public static Localizable localizablePORT_NAME_REQUIRED() {
- return messageFactory.getMessage("port.name.required");
+ return MESSAGE_FACTORY.getMessage("port.name.required");
}
/**
@@ -384,356 +731,18 @@
*
*/
public static String PORT_NAME_REQUIRED() {
- return localizer.localize(localizablePORT_NAME_REQUIRED());
- }
-
- public static Localizable localizableWRONG_TNS_FOR_PORT(Object arg0) {
- return messageFactory.getMessage("wrong.tns.for.port", arg0);
- }
-
- /**
- * Port namespace {0} doesn't match Service namespace {1}
- *
- */
- public static String WRONG_TNS_FOR_PORT(Object arg0) {
- return localizer.localize(localizableWRONG_TNS_FOR_PORT(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.parser.wsdl.multiplebinding", arg0, arg1, arg2);
- }
-
- /**
- * multiple bindings found for binding ID {0} for service {1} in WSDL {2}
- *
- */
- public static String RUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(arg0, arg1, arg2));
- }
-
- public static Localizable localizableNOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("not.know.HttpContext.type", arg0, arg1, arg2);
- }
-
- /**
- * Doesn''t support Endpoint.publish({0}). Known context types are {1}, and {2}
- *
- */
- public static String NOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableNOT_KNOW_HTTP_CONTEXT_TYPE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableNON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("non.unique.dispatch.qname", arg0, arg1);
- }
-
- /**
- * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. Methods {0} have the same request body block {1}. Method dispatching may fail, runtime will try to dispatch using SOAPAction. Another option is to enable AddressingFeature to enabled runtime to uniquely identify WSDL operation using wsa:Action header.
- *
- */
- public static String NON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
- return localizer.localize(localizableNON_UNIQUE_DISPATCH_QNAME(arg0, arg1));
- }
-
- public static Localizable localizableALREADY_HTTP_SERVER(Object arg0) {
- return messageFactory.getMessage("already.http.server", arg0);
- }
-
- /**
- * There is already a HTTP server at : {0}# {0} - probably URL/port of a server
- *
- */
- public static String ALREADY_HTTP_SERVER(Object arg0) {
- return localizer.localize(localizableALREADY_HTTP_SERVER(arg0));
- }
-
- public static Localizable localizableCAN_NOT_GENERATE_WSDL(Object arg0) {
- return messageFactory.getMessage("can.not.generate.wsdl", arg0);
- }
-
- /**
- * Cannot generate WSDL for binding "{0}"
- *
- */
- public static String CAN_NOT_GENERATE_WSDL(Object arg0) {
- return localizer.localize(localizableCAN_NOT_GENERATE_WSDL(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.parser.invalid.attribute.value", arg0, arg1);
- }
-
- /**
- * invalid attribute value "{1}" in runtime descriptor (line {0})
- *
- */
- public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.parser.wrong.element", arg0, arg1, arg2);
- }
-
- /**
- * found element "{1}", expected "{2}" in runtime descriptor (line {0})
- *
- */
- public static String RUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
- }
-
- public static Localizable localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtimemodeler.invalidannotationOnImpl", arg0, arg1, arg2);
- }
-
- /**
- * Invalid annotation: {0} on endpoint implementation class "{1}" - will be ignored. "{1}" is annotated with @WebService(endpointInterface="{2}"}, it must not be annotated with {0}, to fix it - put this annotation on the SEI {2}.
- *
- */
- public static String RUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(arg0, arg1, arg2));
- }
-
- public static Localizable localizableSERVICE_NAME_REQUIRED() {
- return messageFactory.getMessage("service.name.required");
- }
-
- /**
- * Service QName is not found
- *
- */
- public static String SERVICE_NAME_REQUIRED() {
- return localizer.localize(localizableSERVICE_NAME_REQUIRED());
- }
-
- public static Localizable localizablePROVIDER_NOT_PARAMETERIZED(Object arg0) {
- return messageFactory.getMessage("provider.not.parameterized", arg0);
- }
-
- /**
- * "{0}" implements Provider but doesn't specify the type parameter
- *
- */
- public static String PROVIDER_NOT_PARAMETERIZED(Object arg0) {
- return localizer.localize(localizablePROVIDER_NOT_PARAMETERIZED(arg0));
- }
-
- public static Localizable localizableRUNTIME_WSDL_PATCHER() {
- return messageFactory.getMessage("runtime.wsdl.patcher");
- }
-
- /**
- * error while patching WSDL related document
- *
- */
- public static String RUNTIME_WSDL_PATCHER() {
- return localizer.localize(localizableRUNTIME_WSDL_PATCHER());
- }
-
- public static Localizable localizableRUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.saxparser.exception", arg0, arg1);
- }
-
- /**
- * {0}
- * {1}
- *
- */
- public static String RUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_SAXPARSER_EXCEPTION(arg0, arg1));
- }
-
- public static Localizable localizableWRONG_PARAMETER_TYPE(Object arg0) {
- return messageFactory.getMessage("wrong.parameter.type", arg0);
- }
-
- /**
- * Incorrect argument types for method "{0}"
- *
- */
- public static String WRONG_PARAMETER_TYPE(Object arg0) {
- return localizer.localize(localizableWRONG_PARAMETER_TYPE(arg0));
+ return LOCALIZER.localize(localizablePORT_NAME_REQUIRED());
}
- public static Localizable localizableRUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("runtime.parser.wsdl.not.found", arg0);
- }
-
- /**
- * {0} is not found in the WAR file. Package it in the WAR file or correct it in sun-jaxws.xml.
- *
- */
- public static String RUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableRUNTIME_PARSER_WSDL_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("runtime.parser.classNotFound", arg0);
- }
-
- /**
- * class not found in runtime descriptor: {0}
- *
- */
- public static String RUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableRUNTIME_PARSER_CLASS_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableUNSUPPORTED_CHARSET(Object arg0) {
- return messageFactory.getMessage("unsupported.charset", arg0);
- }
-
- /**
- * Unsupported charset "{0}" in the received message''s Content-Type
- *
- */
- public static String UNSUPPORTED_CHARSET(Object arg0) {
- return localizer.localize(localizableUNSUPPORTED_CHARSET(arg0));
- }
-
- public static Localizable localizableSTATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
- return messageFactory.getMessage("static.resource.injection.only", arg0, arg1);
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
- /**
- * Static resource {0} cannot be injected to non-static "{1}"
- *
- */
- public static String STATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
- return localizer.localize(localizableSTATIC_RESOURCE_INJECTION_ONLY(arg0, arg1));
- }
-
- public static Localizable localizableNOT_ZERO_PARAMETERS(Object arg0) {
- return messageFactory.getMessage("not.zero.parameters", arg0);
- }
-
- /**
- * Method "{0}" shouldn''t have any arguments
- *
- */
- public static String NOT_ZERO_PARAMETERS(Object arg0) {
- return localizer.localize(localizableNOT_ZERO_PARAMETERS(arg0));
- }
-
- public static Localizable localizableDUPLICATE_PRIMARY_WSDL(Object arg0) {
- return messageFactory.getMessage("duplicate.primary.wsdl", arg0);
- }
-
- /**
- * Metadata has more than one WSDL that has Service definition for the endpoint. WSDL={0} is one such WSDL.
- *
- */
- public static String DUPLICATE_PRIMARY_WSDL(Object arg0) {
- return localizer.localize(localizableDUPLICATE_PRIMARY_WSDL(arg0));
- }
-
- public static Localizable localizableDUPLICATE_ABSTRACT_WSDL(Object arg0) {
- return messageFactory.getMessage("duplicate.abstract.wsdl", arg0);
- }
-
- /**
- * Metadata has more than one WSDL that has PortType definition for the endpoint. WSDL={0} is one such WSDL.
- *
- */
- public static String DUPLICATE_ABSTRACT_WSDL(Object arg0) {
- return localizer.localize(localizableDUPLICATE_ABSTRACT_WSDL(arg0));
- }
-
- public static Localizable localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
- return messageFactory.getMessage("stateful.invalid.webservice.context", arg0);
- }
- /**
- * Not a WebServiceContext from JAX-WS RI: {0}
- *
- */
- public static String STATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
- return localizer.localize(localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(arg0));
- }
-
- public static Localizable localizableRUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
- return messageFactory.getMessage("runtime.parser.invalidElement", arg0, arg1);
- }
-
- /**
- * invalid element "{1}" in runtime descriptor (line {0})
- *
- */
- public static String RUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
- return localizer.localize(localizableRUNTIME_PARSER_INVALID_ELEMENT(arg0, arg1));
- }
-
- public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("runtime.parser.missing.attribute", arg0, arg1, arg2);
- }
-
- /**
- * missing attribute "{2}" in element "{1}" of runtime descriptor (line {0})
- *
- */
- public static String RUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWRONG_FIELD_TYPE(Object arg0) {
- return messageFactory.getMessage("wrong.field.type", arg0);
- }
-
- /**
- * Incorrect type for field "{0}"
- *
- */
- public static String WRONG_FIELD_TYPE(Object arg0) {
- return localizer.localize(localizableWRONG_FIELD_TYPE(arg0));
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- public static Localizable localizableDUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
- return messageFactory.getMessage("duplicate.portKnownHeader", arg0);
- }
-
- /**
- * Received SOAP message contains duplicate header: {0} for a bound parameter
- *
- */
- public static String DUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
- return localizer.localize(localizableDUPLICATE_PORT_KNOWN_HEADER(arg0));
- }
-
- public static Localizable localizableUNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("unsupported.contentType", arg0, arg1);
- }
-
- /**
- * Unsupported Content-Type: {0} Supported ones are: {1}
- *
- */
- public static String UNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableUNSUPPORTED_CONTENT_TYPE(arg0, arg1));
- }
-
- public static Localizable localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("failed.to.instantiate.instanceResolver", arg0, arg1, arg2);
- }
-
- /**
- * Unable to instantiate {0} (which is specified in {1} on {2})
- *
- */
- public static String FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(arg0, arg1, arg2));
- }
-
- public static Localizable localizableDD_MTOM_CONFLICT(Object arg0, Object arg1) {
- return messageFactory.getMessage("dd.mtom.conflict", arg0, arg1);
- }
-
- /**
- * Error in Deployment Descriptor : MTOM Configuration in binding {0} conflicts with enable-mtom attribute value {1}
- *
- */
- public static String DD_MTOM_CONFLICT(Object arg0, Object arg1) {
- return localizer.localize(localizableDD_MTOM_CONFLICT(arg0, arg1));
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,28 @@
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 SoapMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.soap";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, SoapMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new SoapMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableSOAP_FAULT_CREATE_ERR(Object arg0) {
- return messageFactory.getMessage("soap.fault.create.err", arg0);
+ return MESSAGE_FACTORY.getMessage("soap.fault.create.err", arg0);
}
/**
@@ -56,11 +54,35 @@
*
*/
public static String SOAP_FAULT_CREATE_ERR(Object arg0) {
- return localizer.localize(localizableSOAP_FAULT_CREATE_ERR(arg0));
+ return LOCALIZER.localize(localizableSOAP_FAULT_CREATE_ERR(arg0));
+ }
+
+ public static Localizable localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("soap.protocol.invalidFaultCode", arg0);
+ }
+
+ /**
+ * Invalid fault code: {0}
+ *
+ */
+ public static String SOAP_PROTOCOL_INVALID_FAULT_CODE(Object arg0) {
+ return LOCALIZER.localize(localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(arg0));
+ }
+
+ public static Localizable localizableSOAP_VERSION_MISMATCH_ERR(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("soap.version.mismatch.err", arg0, arg1);
+ }
+
+ /**
+ * Couldn''t create SOAP message. Expecting Envelope in namespace {0}, but got {1}
+ *
+ */
+ public static String SOAP_VERSION_MISMATCH_ERR(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableSOAP_VERSION_MISMATCH_ERR(arg0, arg1));
}
public static Localizable localizableSOAP_MSG_FACTORY_CREATE_ERR(Object arg0) {
- return messageFactory.getMessage("soap.msg.factory.create.err", arg0);
+ return MESSAGE_FACTORY.getMessage("soap.msg.factory.create.err", arg0);
}
/**
@@ -68,11 +90,11 @@
*
*/
public static String SOAP_MSG_FACTORY_CREATE_ERR(Object arg0) {
- return localizer.localize(localizableSOAP_MSG_FACTORY_CREATE_ERR(arg0));
+ return LOCALIZER.localize(localizableSOAP_MSG_FACTORY_CREATE_ERR(arg0));
}
public static Localizable localizableSOAP_MSG_CREATE_ERR(Object arg0) {
- return messageFactory.getMessage("soap.msg.create.err", arg0);
+ return MESSAGE_FACTORY.getMessage("soap.msg.create.err", arg0);
}
/**
@@ -80,11 +102,11 @@
*
*/
public static String SOAP_MSG_CREATE_ERR(Object arg0) {
- return localizer.localize(localizableSOAP_MSG_CREATE_ERR(arg0));
+ return LOCALIZER.localize(localizableSOAP_MSG_CREATE_ERR(arg0));
}
public static Localizable localizableSOAP_FACTORY_CREATE_ERR(Object arg0) {
- return messageFactory.getMessage("soap.factory.create.err", arg0);
+ return MESSAGE_FACTORY.getMessage("soap.factory.create.err", arg0);
}
/**
@@ -92,31 +114,18 @@
*
*/
public static String SOAP_FACTORY_CREATE_ERR(Object arg0) {
- return localizer.localize(localizableSOAP_FACTORY_CREATE_ERR(arg0));
- }
-
- public static Localizable localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(Object arg0) {
- return messageFactory.getMessage("soap.protocol.invalidFaultCode", arg0);
+ return LOCALIZER.localize(localizableSOAP_FACTORY_CREATE_ERR(arg0));
}
- /**
- * Invalid fault code: {0}
- *
- */
- public static String SOAP_PROTOCOL_INVALID_FAULT_CODE(Object arg0) {
- return localizer.localize(localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(arg0));
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableSOAP_VERSION_MISMATCH_ERR(Object arg0, Object arg1) {
- return messageFactory.getMessage("soap.version.mismatch.err", arg0, arg1);
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * Couldn''t create SOAP message. Expecting Envelope in namespace {0}, but got {1}
- *
- */
- public static String SOAP_VERSION_MISMATCH_ERR(Object arg0, Object arg1) {
- return localizer.localize(localizableSOAP_VERSION_MISMATCH_ERR(arg0, arg1));
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,160 @@
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 final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new StreamingMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState.message", arg0, arg1, arg2);
+ }
+
+ /**
+ * unexpected XML reader state. expected: {0} but found: {1}. {2}
+ *
+ */
+ 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 localizableXMLRECORDER_RECORDING_ENDED() {
+ return MESSAGE_FACTORY.getMessage("xmlrecorder.recording.ended");
+ }
+
+ /**
+ * no more recorded elements available
+ *
+ */
+ public static String XMLRECORDER_RECORDING_ENDED() {
+ return LOCALIZER.localize(localizableXMLRECORDER_RECORDING_ENDED());
+ }
+
+ public static Localizable localizableXMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState.tag", arg0, arg1);
+ }
+
+ /**
+ * unexpected XML tag. expected: {0} but found: {1}
+ *
+ */
+ public static String XMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE_TAG(arg0, arg1));
+ }
+
+ public static Localizable localizableFASTINFOSET_NO_IMPLEMENTATION() {
+ return MESSAGE_FACTORY.getMessage("fastinfoset.noImplementation");
+ }
+
+ /**
+ * Unable to locate compatible implementation of Fast Infoset in classpath
+ *
+ */
+ public static String FASTINFOSET_NO_IMPLEMENTATION() {
+ return LOCALIZER.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
+ }
+
+ public static Localizable localizableXMLREADER_NESTED_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.nestedError", arg0);
+ }
+
+ /**
+ * XML reader error: {0}
+ *
+ */
+ public static String XMLREADER_NESTED_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableXMLREADER_NESTED_ERROR(arg0));
+ }
+
+ public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("woodstox.cant.load", arg0);
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ /**
+ * Unable to load Woodstox class {0}
+ *
+ */
+ public static String WOODSTOX_CANT_LOAD(Object arg0) {
+ return LOCALIZER.localize(localizableWOODSTOX_CANT_LOAD(arg0));
+ }
+
+ public static Localizable localizableSOURCEREADER_INVALID_SOURCE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("sourcereader.invalidSource", arg0);
+ }
+
+ /**
+ * Unable to create reader from source "{0}"
+ *
+ */
+ public static String SOURCEREADER_INVALID_SOURCE(Object arg0) {
+ return LOCALIZER.localize(localizableSOURCEREADER_INVALID_SOURCE(arg0));
+ }
+
+ public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
+ }
+
+ /**
+ * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
+ *
+ */
+ 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 localizableXMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xmlwriter.noPrefixForURI", arg0);
+ }
+
+ /**
+ * XML writer error: no prefix for URI: "{0}"
+ *
+ */
+ public static String XMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
+ return LOCALIZER.localize(localizableXMLWRITER_NO_PREFIX_FOR_URI(arg0));
+ }
+
+ public static Localizable localizableSTREAMING_PARSE_EXCEPTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("streaming.parseException", arg0);
+ }
+
+ /**
+ * XML parsing error: {0}
+ *
+ */
+ public static String STREAMING_PARSE_EXCEPTION(Object arg0) {
+ return LOCALIZER.localize(localizableSTREAMING_PARSE_EXCEPTION(arg0));
+ }
+
+ public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.ioException", arg0);
+ }
+
+ /**
+ * XML reader error: {0}
+ *
+ */
+ public static String XMLREADER_IO_EXCEPTION(Object arg0) {
+ return LOCALIZER.localize(localizableXMLREADER_IO_EXCEPTION(arg0));
}
public static Localizable localizableFASTINFOSET_DECODING_NOT_ACCEPTED() {
- return messageFactory.getMessage("fastinfoset.decodingNotAccepted");
+ return MESSAGE_FACTORY.getMessage("fastinfoset.decodingNotAccepted");
}
/**
@@ -56,11 +186,23 @@
*
*/
public static String FASTINFOSET_DECODING_NOT_ACCEPTED() {
- return localizer.localize(localizableFASTINFOSET_DECODING_NOT_ACCEPTED());
+ return LOCALIZER.localize(localizableFASTINFOSET_DECODING_NOT_ACCEPTED());
+ }
+
+ public static Localizable localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.illegalStateEncountered", arg0);
+ }
+
+ /**
+ * XML reader internal error: illegal state ({0})
+ *
+ */
+ public static String XMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
+ return LOCALIZER.localize(localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(arg0));
}
public static Localizable localizableSTAX_CANT_CREATE() {
- return messageFactory.getMessage("stax.cantCreate");
+ return MESSAGE_FACTORY.getMessage("stax.cantCreate");
}
/**
@@ -68,11 +210,47 @@
*
*/
public static String STAX_CANT_CREATE() {
- return localizer.localize(localizableSTAX_CANT_CREATE());
+ return LOCALIZER.localize(localizableSTAX_CANT_CREATE());
+ }
+
+ public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("staxreader.xmlstreamexception", arg0);
+ }
+
+ /**
+ * XML stream reader exception: {0}
+ *
+ */
+ public static String STAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
+ return LOCALIZER.localize(localizableSTAXREADER_XMLSTREAMEXCEPTION(arg0));
+ }
+
+ public static Localizable localizableXMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState", arg0, arg1);
+ }
+
+ /**
+ * unexpected XML reader state. expected: {0} but found: {1}
+ *
+ */
+ public static String XMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
+ }
+
+ public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("invalid.property.value.long", arg0, arg1, arg2);
+ }
+
+ /**
+ * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
+ *
+ */
+ 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 localizableSTREAMING_IO_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("streaming.ioException", arg0);
+ return MESSAGE_FACTORY.getMessage("streaming.ioException", arg0);
}
/**
@@ -80,83 +258,35 @@
*
*/
public static String STREAMING_IO_EXCEPTION(Object arg0) {
- return localizer.localize(localizableSTREAMING_IO_EXCEPTION(arg0));
- }
-
- public static Localizable localizableSOURCEREADER_INVALID_SOURCE(Object arg0) {
- return messageFactory.getMessage("sourcereader.invalidSource", arg0);
- }
-
- /**
- * Unable to create reader from source "{0}"
- *
- */
- public static String SOURCEREADER_INVALID_SOURCE(Object arg0) {
- return localizer.localize(localizableSOURCEREADER_INVALID_SOURCE(arg0));
+ return LOCALIZER.localize(localizableSTREAMING_IO_EXCEPTION(arg0));
}
- public static Localizable localizableXMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
- return messageFactory.getMessage("xmlreader.unexpectedState", arg0, arg1);
- }
-
- /**
- * unexpected XML reader state. expected: {0} but found: {1}
- *
- */
- public static String XMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
- return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
- }
-
- public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) {
- return messageFactory.getMessage("woodstox.cant.load", arg0);
+ public static Localizable localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedCharacterContent", arg0);
}
/**
- * Unable to load Woodstox class {0}
+ * XML reader error: unexpected character content: "{0}"
*
*/
- public static String WOODSTOX_CANT_LOAD(Object arg0) {
- return localizer.localize(localizableWOODSTOX_CANT_LOAD(arg0));
+ public static String XMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
+ return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(arg0));
}
- public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("xmlreader.ioException", arg0);
+ public static Localizable localizableXMLWRITER_NESTED_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("xmlwriter.nestedError", arg0);
}
/**
- * XML reader error: {0}
- *
- */
- public static String XMLREADER_IO_EXCEPTION(Object arg0) {
- return localizer.localize(localizableXMLREADER_IO_EXCEPTION(arg0));
- }
-
- public static Localizable localizableFASTINFOSET_NO_IMPLEMENTATION() {
- return messageFactory.getMessage("fastinfoset.noImplementation");
- }
-
- /**
- * Unable to locate compatible implementation of Fast Infoset in classpath
+ * XML writer error: {0}
*
*/
- public static String FASTINFOSET_NO_IMPLEMENTATION() {
- return localizer.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
- }
-
- public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
- }
-
- /**
- * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
- *
- */
- 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_NESTED_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableXMLWRITER_NESTED_ERROR(arg0));
}
public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("xmlwriter.ioException", arg0);
+ return MESSAGE_FACTORY.getMessage("xmlwriter.ioException", arg0);
}
/**
@@ -164,131 +294,11 @@
*
*/
public static String XMLWRITER_IO_EXCEPTION(Object arg0) {
- return localizer.localize(localizableXMLWRITER_IO_EXCEPTION(arg0));
- }
-
- public static Localizable localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
- return messageFactory.getMessage("xmlreader.unexpectedCharacterContent", arg0);
- }
-
- /**
- * XML reader error: unexpected character content: "{0}"
- *
- */
- public static String XMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
- return localizer.localize(localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(arg0));
- }
-
- public static Localizable localizableSTREAMING_PARSE_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("streaming.parseException", arg0);
- }
-
- /**
- * XML parsing error: {0}
- *
- */
- public static String STREAMING_PARSE_EXCEPTION(Object arg0) {
- return localizer.localize(localizableSTREAMING_PARSE_EXCEPTION(arg0));
- }
-
- public static Localizable localizableXMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
- return messageFactory.getMessage("xmlwriter.noPrefixForURI", arg0);
- }
-
- /**
- * XML writer error: no prefix for URI: "{0}"
- *
- */
- public static String XMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
- return localizer.localize(localizableXMLWRITER_NO_PREFIX_FOR_URI(arg0));
- }
-
- public static Localizable localizableXMLREADER_NESTED_ERROR(Object arg0) {
- return messageFactory.getMessage("xmlreader.nestedError", arg0);
- }
-
- /**
- * XML reader error: {0}
- *
- */
- public static String XMLREADER_NESTED_ERROR(Object arg0) {
- return localizer.localize(localizableXMLREADER_NESTED_ERROR(arg0));
- }
-
- public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("invalid.property.value.long", arg0, arg1, arg2);
- }
-
- /**
- * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
- *
- */
- 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 localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
- return messageFactory.getMessage("staxreader.xmlstreamexception", arg0);
- }
-
- /**
- * XML stream reader exception: {0}
- *
- */
- public static String STAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
- return localizer.localize(localizableSTAXREADER_XMLSTREAMEXCEPTION(arg0));
- }
-
- public static Localizable localizableXMLWRITER_NESTED_ERROR(Object arg0) {
- return messageFactory.getMessage("xmlwriter.nestedError", arg0);
- }
-
- /**
- * XML writer error: {0}
- *
- */
- public static String XMLWRITER_NESTED_ERROR(Object arg0) {
- return localizer.localize(localizableXMLWRITER_NESTED_ERROR(arg0));
- }
-
- public static Localizable localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
- return messageFactory.getMessage("xmlreader.illegalStateEncountered", arg0);
- }
-
- /**
- * XML reader internal error: illegal state ({0})
- *
- */
- public static String XMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
- return localizer.localize(localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(arg0));
- }
-
- public static Localizable localizableXMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
- return messageFactory.getMessage("xmlreader.unexpectedState.tag", arg0, arg1);
- }
-
- /**
- * unexpected XML tag. expected: {0} but found: {1}
- *
- */
- public static String XMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
- return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE_TAG(arg0, arg1));
- }
-
- public static Localizable localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("xmlreader.unexpectedState.message", arg0, arg1, arg2);
- }
-
- /**
- * unexpected XML reader state. expected: {0} but found: {1}. {2}
- *
- */
- public static String XMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableXMLWRITER_IO_EXCEPTION(arg0));
}
public static Localizable localizableXMLREADER_PARSE_EXCEPTION(Object arg0) {
- return messageFactory.getMessage("xmlreader.parseException", arg0);
+ return MESSAGE_FACTORY.getMessage("xmlreader.parseException", arg0);
}
/**
@@ -296,19 +306,18 @@
*
*/
public static String XMLREADER_PARSE_EXCEPTION(Object arg0) {
- return localizer.localize(localizableXMLREADER_PARSE_EXCEPTION(arg0));
- }
-
- public static Localizable localizableXMLRECORDER_RECORDING_ENDED() {
- return messageFactory.getMessage("xmlrecorder.recording.ended");
+ return LOCALIZER.localize(localizableXMLREADER_PARSE_EXCEPTION(arg0));
}
- /**
- * no more recorded elements available
- *
- */
- public static String XMLRECORDER_RECORDING_ENDED() {
- return localizer.localize(localizableXMLRECORDER_RECORDING_ENDED());
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,28 @@
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 TubelineassemblyMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.tubelineassembly";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, TubelineassemblyMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
-
- public static Localizable localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("MASM0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE", arg0, arg1);
- }
-
- /**
- * MASM0019: Illegal logging level value "{1}" stored in the {0} message logging system property. Using default logging level.
- *
- */
- public static String MASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
- return localizer.localize(localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(arg0, arg1));
- }
-
- public static Localizable localizableMASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
- return messageFactory.getMessage("MASM0009_CANNOT_FORM_VALID_URL", arg0);
- }
-
- /**
- * MASM0009: Cannot form a valid URL from the resource name "{0}". For more details see the nested exception.
- *
- */
- public static String MASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
- return localizer.localize(localizableMASM_0009_CANNOT_FORM_VALID_URL(arg0));
- }
- public static Localizable localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
- return messageFactory.getMessage("MASM0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE", arg0);
- }
-
- /**
- * MASM0005: No default tubeline is defined in the default [ {0} ] configuration file
- *
- */
- public static String MASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
- return localizer.localize(localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(arg0));
- }
-
- public static Localizable localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
- return messageFactory.getMessage("MASM0003_DEFAULT_CFG_FILE_NOT_LOADED", arg0);
- }
-
- /**
- * MASM0003: Default [ {0} ] configuration file was not loaded
- *
- */
- public static String MASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
- return localizer.localize(localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(arg0));
- }
-
- public static Localizable localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("MASM0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE", arg0, arg1);
- }
-
- /**
- * MASM0018: Message logging {0} system property detected to be set to value {1}
- *
- */
- public static String MASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
- return localizer.localize(localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(arg0, arg1));
- }
+ private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.tubelineassembly";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new TubelineassemblyMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableMASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("MASM0001_DEFAULT_CFG_FILE_NOT_FOUND", arg0);
+ return MESSAGE_FACTORY.getMessage("MASM0001_DEFAULT_CFG_FILE_NOT_FOUND", arg0);
}
/**
@@ -116,35 +54,23 @@
*
*/
public static String MASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableMASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(arg0));
+ return LOCALIZER.localize(localizableMASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(arg0));
}
- public static Localizable localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
- return messageFactory.getMessage("MASM0020_ERROR_CREATING_URI_FROM_GENERATED_STRING", arg0);
+ public static Localizable localizableMASM_0011_LOADING_RESOURCE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("MASM0011_LOADING_RESOURCE", arg0, arg1);
}
/**
- * MASM0020: Unable to create a new URI instance for generated endpoint URI string [ {0} ]
+ * MASM0011: Trying to load [ {0} ] via parent resouce loader [ {1} ]
*
*/
- public static String MASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
- return localizer.localize(localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(arg0));
- }
-
- public static Localizable localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
- return messageFactory.getMessage("MASM0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY", arg0);
- }
-
- /**
- * MASM0016: Unable to instantiate Tube factory class [ {0} ]
- *
- */
- public static String MASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
- return localizer.localize(localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(arg0));
+ public static String MASM_0011_LOADING_RESOURCE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMASM_0011_LOADING_RESOURCE(arg0, arg1));
}
public static Localizable localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(Object arg0, Object arg1) {
- return messageFactory.getMessage("MASM0012_LOADING_VIA_SERVLET_CONTEXT", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("MASM0012_LOADING_VIA_SERVLET_CONTEXT", arg0, arg1);
}
/**
@@ -152,59 +78,11 @@
*
*/
public static String MASM_0012_LOADING_VIA_SERVLET_CONTEXT(Object arg0, Object arg1) {
- return localizer.localize(localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(arg0, arg1));
- }
-
- public static Localizable localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
- return messageFactory.getMessage("MASM0010_ERROR_READING_CFG_FILE_FROM_LOCATION", arg0);
- }
-
- /**
- * MASM0010: Unable to unmarshall metro config file from location [ {0} ]
- *
- */
- public static String MASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
- return localizer.localize(localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(arg0));
- }
-
- public static Localizable localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
- return messageFactory.getMessage("MASM0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE", arg0);
- }
-
- /**
- * MASM0004: No section found in the default [ {0} ] configuration file
- *
- */
- public static String MASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
- return localizer.localize(localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(arg0));
- }
-
- public static Localizable localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
- return messageFactory.getMessage("MASM0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD", arg0);
- }
-
- /**
- * MASM0013: Unable to invoke {0} method on servlet context instance
- *
- */
- public static String MASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
- return localizer.localize(localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(arg0));
- }
-
- public static Localizable localizableMASM_0007_APP_CFG_FILE_NOT_FOUND() {
- return messageFactory.getMessage("MASM0007_APP_CFG_FILE_NOT_FOUND");
- }
-
- /**
- * MASM0007: No application metro.xml configuration file found.
- *
- */
- public static String MASM_0007_APP_CFG_FILE_NOT_FOUND() {
- return localizer.localize(localizableMASM_0007_APP_CFG_FILE_NOT_FOUND());
+ return LOCALIZER.localize(localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(arg0, arg1));
}
public static Localizable localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(Object arg0, Object arg1) {
- return messageFactory.getMessage("MASM0002_DEFAULT_CFG_FILE_LOCATED", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("MASM0002_DEFAULT_CFG_FILE_LOCATED", arg0, arg1);
}
/**
@@ -212,11 +90,143 @@
*
*/
public static String MASM_0002_DEFAULT_CFG_FILE_LOCATED(Object arg0, Object arg1) {
- return localizer.localize(localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(arg0, arg1));
+ return LOCALIZER.localize(localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(arg0, arg1));
+ }
+
+ public static Localizable localizableMASM_0007_APP_CFG_FILE_NOT_FOUND() {
+ return MESSAGE_FACTORY.getMessage("MASM0007_APP_CFG_FILE_NOT_FOUND");
+ }
+
+ /**
+ * MASM0007: No application metro.xml configuration file found.
+ *
+ */
+ public static String MASM_0007_APP_CFG_FILE_NOT_FOUND() {
+ return LOCALIZER.localize(localizableMASM_0007_APP_CFG_FILE_NOT_FOUND());
+ }
+
+ public static Localizable localizableMASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0006_APP_CFG_FILE_LOCATED", arg0);
+ }
+
+ /**
+ * MASM0006: Application metro.xml configuration file located at [ {0} ]
+ *
+ */
+ public static String MASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0006_APP_CFG_FILE_LOCATED(arg0));
+ }
+
+ public static Localizable localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("MASM0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE", arg0, arg1);
+ }
+
+ /**
+ * MASM0018: Message logging {0} system property detected to be set to value {1}
+ *
+ */
+ public static String MASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(arg0, arg1));
+ }
+
+ public static Localizable localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0003_DEFAULT_CFG_FILE_NOT_LOADED", arg0);
+ }
+
+ /**
+ * MASM0003: Default [ {0} ] configuration file was not loaded
+ *
+ */
+ public static String MASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(arg0));
+ }
+
+ public static Localizable localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE", arg0);
+ }
+
+ /**
+ * MASM0004: No section found in the default [ {0} ] configuration file
+ *
+ */
+ public static String MASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(arg0));
+ }
+
+ public static Localizable localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("MASM0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE", arg0, arg1);
+ }
+
+ /**
+ * MASM0015: Class [ {0} ] does not implement [ {1} ] interface
+ *
+ */
+ public static String MASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(arg0, arg1));
+ }
+
+ public static Localizable localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0020_ERROR_CREATING_URI_FROM_GENERATED_STRING", arg0);
+ }
+
+ /**
+ * MASM0020: Unable to create a new URI instance for generated endpoint URI string [ {0} ]
+ *
+ */
+ public static String MASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(arg0));
+ }
+
+ public static Localizable localizableMASM_0008_INVALID_URI_REFERENCE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0008_INVALID_URI_REFERENCE", arg0);
+ }
+
+ /**
+ * MASM0008: Invalid URI reference [ {0} ]
+ *
+ */
+ public static String MASM_0008_INVALID_URI_REFERENCE(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0008_INVALID_URI_REFERENCE(arg0));
+ }
+
+ public static Localizable localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY", arg0);
+ }
+
+ /**
+ * MASM0016: Unable to instantiate Tube factory class [ {0} ]
+ *
+ */
+ public static String MASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(arg0));
+ }
+
+ public static Localizable localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0010_ERROR_READING_CFG_FILE_FROM_LOCATION", arg0);
+ }
+
+ /**
+ * MASM0010: Unable to unmarshall metro config file from location [ {0} ]
+ *
+ */
+ public static String MASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(arg0));
+ }
+
+ public static Localizable localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE", arg0);
+ }
+
+ /**
+ * MASM0005: No default tubeline is defined in the default [ {0} ] configuration file
+ *
+ */
+ public static String MASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(arg0));
}
public static Localizable localizableMASM_0014_UNABLE_TO_LOAD_CLASS(Object arg0) {
- return messageFactory.getMessage("MASM0014_UNABLE_TO_LOAD_CLASS", arg0);
+ return MESSAGE_FACTORY.getMessage("MASM0014_UNABLE_TO_LOAD_CLASS", arg0);
}
/**
@@ -224,23 +234,47 @@
*
*/
public static String MASM_0014_UNABLE_TO_LOAD_CLASS(Object arg0) {
- return localizer.localize(localizableMASM_0014_UNABLE_TO_LOAD_CLASS(arg0));
+ return LOCALIZER.localize(localizableMASM_0014_UNABLE_TO_LOAD_CLASS(arg0));
+ }
+
+ public static Localizable localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD", arg0);
}
- public static Localizable localizableMASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
- return messageFactory.getMessage("MASM0006_APP_CFG_FILE_LOCATED", arg0);
+ /**
+ * MASM0013: Unable to invoke {0} method on servlet context instance
+ *
+ */
+ public static String MASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(arg0));
+ }
+
+ public static Localizable localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("MASM0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE", arg0, arg1);
}
/**
- * MASM0006: Application metro.xml configuration file located at [ {0} ]
+ * MASM0019: Illegal logging level value "{1}" stored in the {0} message logging system property. Using default logging level.
*
*/
- public static String MASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
- return localizer.localize(localizableMASM_0006_APP_CFG_FILE_LOCATED(arg0));
+ public static String MASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(arg0, arg1));
+ }
+
+ public static Localizable localizableMASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("MASM0009_CANNOT_FORM_VALID_URL", arg0);
+ }
+
+ /**
+ * MASM0009: Cannot form a valid URL from the resource name "{0}". For more details see the nested exception.
+ *
+ */
+ public static String MASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
+ return LOCALIZER.localize(localizableMASM_0009_CANNOT_FORM_VALID_URL(arg0));
}
public static Localizable localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(Object arg0) {
- return messageFactory.getMessage("MASM0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS", arg0);
+ return MESSAGE_FACTORY.getMessage("MASM0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS", arg0);
}
/**
@@ -248,43 +282,18 @@
*
*/
public static String MASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(Object arg0) {
- return localizer.localize(localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(arg0));
- }
-
- public static Localizable localizableMASM_0008_INVALID_URI_REFERENCE(Object arg0) {
- return messageFactory.getMessage("MASM0008_INVALID_URI_REFERENCE", arg0);
- }
-
- /**
- * MASM0008: Invalid URI reference [ {0} ]
- *
- */
- public static String MASM_0008_INVALID_URI_REFERENCE(Object arg0) {
- return localizer.localize(localizableMASM_0008_INVALID_URI_REFERENCE(arg0));
- }
-
- public static Localizable localizableMASM_0011_LOADING_RESOURCE(Object arg0, Object arg1) {
- return messageFactory.getMessage("MASM0011_LOADING_RESOURCE", arg0, arg1);
+ return LOCALIZER.localize(localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(arg0));
}
- /**
- * MASM0011: Trying to load [ {0} ] via parent resouce loader [ {1} ]
- *
- */
- public static String MASM_0011_LOADING_RESOURCE(Object arg0, Object arg1) {
- return localizer.localize(localizableMASM_0011_LOADING_RESOURCE(arg0, arg1));
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(Object arg0, Object arg1) {
- return messageFactory.getMessage("MASM0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE", arg0, arg1);
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * MASM0015: Class [ {0} ] does not implement [ {1} ] interface
- *
- */
- public static String MASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(Object arg0, Object arg1) {
- return localizer.localize(localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(arg0, arg1));
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,40 @@
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 UtilMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.util";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, UtilMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new UtilMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS() {
+ return MESSAGE_FACTORY.getMessage("util.handler.cannot.combine.soapmessagehandlers");
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ /**
+ * You must use HanlderChain annotation, not SOAPMessageHandlers
+ *
+ */
+ public static String UTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS() {
+ return LOCALIZER.localize(localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS());
}
public static Localizable localizableUTIL_LOCATION(Object arg0, Object arg1) {
- return messageFactory.getMessage("util.location", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("util.location", arg0, arg1);
}
/**
@@ -56,23 +66,47 @@
*
*/
public static String UTIL_LOCATION(Object arg0, Object arg1) {
- return localizer.localize(localizableUTIL_LOCATION(arg0, arg1));
+ return LOCALIZER.localize(localizableUTIL_LOCATION(arg0, arg1));
+ }
+
+ public static Localizable localizableUTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("util.handler.class.not.found", arg0);
}
- public static Localizable localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
- return messageFactory.getMessage("util.failed.to.parse.handlerchain.file", arg0, arg1);
+ /**
+ * "Class: {0} could not be found"
+ *
+ */
+ public static String UTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableUTIL_HANDLER_CLASS_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("util.handler.no.webservice.annotation", arg0);
}
/**
- * Could not parse handler chain file {1} for class {0}
+ * "A WebService annotation is not present on class: {0}"
*
*/
- public static String UTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
- return localizer.localize(localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
+ public static String UTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+ return LOCALIZER.localize(localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(arg0));
+ }
+
+ public static Localizable localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("util.handler.endpoint.interface.no.webservice", arg0);
+ }
+
+ /**
+ * "The Endpoint Interface: {0} does not have WebService Annotation"
+ *
+ */
+ public static String UTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
+ return LOCALIZER.localize(localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
}
public static Localizable localizableUTIL_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("util.parser.wrong.element", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("util.parser.wrong.element", arg0, arg1, arg2);
}
/**
@@ -80,47 +114,23 @@
*
*/
public static String UTIL_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableUTIL_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
- }
-
- public static Localizable localizableUTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("util.handler.class.not.found", arg0);
+ return LOCALIZER.localize(localizableUTIL_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
}
- /**
- * "Class: {0} could not be found"
- *
- */
- public static String UTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableUTIL_HANDLER_CLASS_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
- return messageFactory.getMessage("util.handler.endpoint.interface.no.webservice", arg0);
+ public static Localizable localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("util.failed.to.parse.handlerchain.file", arg0, arg1);
}
/**
- * "The Endpoint Interface: {0} does not have WebService Annotation"
+ * Could not parse handler chain file {1} for class {0}
*
*/
- public static String UTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
- return localizer.localize(localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
- }
-
- public static Localizable localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
- return messageFactory.getMessage("util.handler.no.webservice.annotation", arg0);
- }
-
- /**
- * "A WebService annotation is not present on class: {0}"
- *
- */
- public static String UTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
- return localizer.localize(localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(arg0));
+ public static String UTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
}
public static Localizable localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
- return messageFactory.getMessage("util.failed.to.find.handlerchain.file", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("util.failed.to.find.handlerchain.file", arg0, arg1);
}
/**
@@ -128,19 +138,18 @@
*
*/
public static String UTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
- return localizer.localize(localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
- }
-
- public static Localizable localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS() {
- return messageFactory.getMessage("util.handler.cannot.combine.soapmessagehandlers");
+ return LOCALIZER.localize(localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
}
- /**
- * You must use HanlderChain annotation, not SOAPMessageHandlers
- *
- */
- public static String UTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS() {
- return localizer.localize(localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS());
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,28 @@
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 WsdlmodelMessages {
+
private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsdlmodel";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, WsdlmodelMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WsdlmodelMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdl.portaddress.epraddress.not.match", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("wsdl.portaddress.epraddress.not.match", arg0, arg1, arg2);
}
/**
@@ -56,11 +54,11 @@
*
*/
public static String WSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(arg0, arg1, arg2));
}
public static Localizable localizableWSDL_IMPORT_SHOULD_BE_WSDL(Object arg0) {
- return messageFactory.getMessage("wsdl.import.should.be.wsdl", arg0);
+ return MESSAGE_FACTORY.getMessage("wsdl.import.should.be.wsdl", arg0);
}
/**
@@ -69,11 +67,11 @@
*
*/
public static String WSDL_IMPORT_SHOULD_BE_WSDL(Object arg0) {
- return localizer.localize(localizableWSDL_IMPORT_SHOULD_BE_WSDL(arg0));
+ return LOCALIZER.localize(localizableWSDL_IMPORT_SHOULD_BE_WSDL(arg0));
}
public static Localizable localizableMEX_METADATA_SYSTEMID_NULL() {
- return messageFactory.getMessage("Mex.metadata.systemid.null");
+ return MESSAGE_FACTORY.getMessage("Mex.metadata.systemid.null");
}
/**
@@ -81,7 +79,18 @@
*
*/
public static String MEX_METADATA_SYSTEMID_NULL() {
- return localizer.localize(localizableMEX_METADATA_SYSTEMID_NULL());
+ return LOCALIZER.localize(localizableMEX_METADATA_SYSTEMID_NULL());
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,390 +25,148 @@
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 WsservletMessages {
- private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsservlet";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, WsservletMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
-
- public static Localizable localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
- return messageFactory.getMessage("error.wsdlPublisher.cannotReadConfiguration");
- }
- /**
- * WSSERVLET46: cannot read configuration
- *
- */
- public static String ERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
- return localizer.localize(localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION());
- }
+ private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsservlet";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WsservletMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- public static Localizable localizableWSSERVLET_22_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET22.diag.check.1");
- }
-
- /**
- * Set endpoint with stub.setTargetEndpoint property
- *
- */
- public static String WSSERVLET_22_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_22_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_2() {
- return messageFactory.getMessage("WSSERVLET33.diag.cause.2");
+ public static Localizable localizableWSSERVLET_23_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET23.diag.cause.1");
}
/**
- * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
+ * The request generated no response from the service
*
*/
- public static String WSSERVLET_33_DIAG_CAUSE_2() {
- return localizer.localize(localizableWSSERVLET_33_DIAG_CAUSE_2());
- }
-
- public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET33.diag.cause.1");
- }
-
- /**
- * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
- *
- */
- public static String WSSERVLET_33_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_33_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
- return messageFactory.getMessage("error.implementorRegistry.duplicateName", arg0);
+ public static String WSSERVLET_23_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_23_DIAG_CAUSE_1());
}
- /**
- * WSSERVLET42: duplicate port name: {0}
- *
- */
- public static String ERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
- return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(arg0));
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("error.implementorRegistry.fileNotFound", arg0);
- }
-
- /**
- * WSSERVLET45: file not found: {0}
- *
- */
- public static String ERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
- return messageFactory.getMessage("servlet.trace.invokingImplementor", arg0);
+ public static Localizable localizableWSSERVLET_30_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET30.diag.check.1");
}
/**
- * WSSERVLET21: invoking implementor: {0}
- *
- */
- public static String SERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
- return localizer.localize(localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(arg0));
- }
-
- public static Localizable localizableWSSERVLET_17_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET17.diag.cause.1");
- }
-
- /**
- * Two or more endpoints with the same name where found in the jaxrpc-ri.xml runtime descriptor
+ * This could be due to a number of causes. Check the server log file for exceptions.
*
*/
- public static String WSSERVLET_17_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_17_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_2() {
- return messageFactory.getMessage("html.nonRootPage.body2");
+ public static String WSSERVLET_30_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_30_DIAG_CHECK_1());
}
- /**
- * Invalid request URI.
Please check your deployment information.
- *
- */
- public static String HTML_NON_ROOT_PAGE_BODY_2() {
- return localizer.localize(localizableHTML_NON_ROOT_PAGE_BODY_2());
- }
-
- public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_1() {
- return messageFactory.getMessage("html.nonRootPage.body1");
+ public static Localizable localizableWSSERVLET_34_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET34.diag.check.1");
}
/**
- * A Web Service is installed at this URL.
+ * Check the log file(s) for more detailed errors/exceptions.
*
*/
- public static String HTML_NON_ROOT_PAGE_BODY_1() {
- return localizer.localize(localizableHTML_NON_ROOT_PAGE_BODY_1());
- }
-
- public static Localizable localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
- return messageFactory.getMessage("publisher.info.applyingTransformation", arg0);
+ public static String WSSERVLET_34_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_34_DIAG_CHECK_1());
}
- /**
- * WSSERVLET31: applying transformation with actual address: {0}
- *
- */
- public static String PUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
- return localizer.localize(localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(arg0));
- }
-
- public static Localizable localizableWSSERVLET_29_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET29.diag.check.1");
+ public static Localizable localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
+ return MESSAGE_FACTORY.getMessage("servlet.faultstring.invalidContentType");
}
/**
- * Is the port valid? Unzip the war file and make sure the tie and serializers are present
- *
- */
- public static String WSSERVLET_29_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_29_DIAG_CHECK_1());
- }
-
- public static Localizable localizableSERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(Object arg0) {
- return messageFactory.getMessage("servlet.trace.gotRequestForEndpoint", arg0);
- }
-
- /**
- * WSSERVLET19: got request for endpoint: {0}
+ * WSSERVLET64: Invalid Content-Type, text/xml required
*
*/
- public static String SERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(Object arg0) {
- return localizer.localize(localizableSERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(arg0));
- }
-
- public static Localizable localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
- return messageFactory.getMessage("error.servlet.init.config.parameter.missing", arg0);
+ public static String SERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
+ return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE());
}
- /**
- * WSSERVLET47: cannot find configuration parameter: "{0}"
- *
- */
- public static String ERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
- return localizer.localize(localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(arg0));
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
- return messageFactory.getMessage("error.implementorFactory.servantInitFailed", arg0);
+ public static Localizable localizableWSSERVLET_27_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET27.diag.cause.1");
}
/**
- * WSSERVLET44: failed to initialize the service implementor for port "{0}"
- *
- */
- public static String ERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
- return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(arg0));
- }
-
- public static Localizable localizableWSSERVLET_13_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET13.diag.check.1");
- }
-
- /**
- * Normal web service shutdown
+ * Implicit URLS are not supported in this release
*
*/
- public static String WSSERVLET_13_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_13_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_31_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET31.diag.cause.1");
+ public static String WSSERVLET_27_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_27_DIAG_CAUSE_1());
}
- /**
- * Transformation being applied
- *
- */
- public static String WSSERVLET_31_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_31_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_50_DIAG_CHECK_3() {
- return messageFactory.getMessage("WSSERVLET50.diag.check.3");
+ public static Localizable localizableHTML_WSDL_PAGE_NO_WSDL() {
+ return MESSAGE_FACTORY.getMessage("html.wsdlPage.noWsdl");
}
/**
- * Check the server.xml file in the domain directory for failures
+ * No WSDL document available for publishing.
Please check your deployment information.
*
*/
- public static String WSSERVLET_50_DIAG_CHECK_3() {
- return localizer.localize(localizableWSSERVLET_50_DIAG_CHECK_3());
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
- return messageFactory.getMessage("error.implementorFactory.noInputStream");
- }
-
- /**
- * WSSERVLET37: no configuration specified
- *
- */
- public static String ERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
- return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM());
- }
-
- public static Localizable localizableWSSERVLET_24_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET24.diag.cause.1");
+ public static String HTML_WSDL_PAGE_NO_WSDL() {
+ return LOCALIZER.localize(localizableHTML_WSDL_PAGE_NO_WSDL());
}
- /**
- * SOAPFault message is being returned to the client.
- *
- */
- public static String WSSERVLET_24_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_24_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_50_DIAG_CHECK_2() {
- return messageFactory.getMessage("WSSERVLET50.diag.check.2");
- }
-
- /**
- * Verify that Application server deployment descriptors are correct in the service war file
- *
- */
- public static String WSSERVLET_50_DIAG_CHECK_2() {
- return localizer.localize(localizableWSSERVLET_50_DIAG_CHECK_2());
- }
-
- public static Localizable localizableWSSERVLET_50_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET50.diag.check.1");
+ public static Localizable localizableWSSERVLET_19_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET19.diag.check.1");
}
/**
- * Verify that sun-jaxws.xml and web.xml are correct in the service war file
+ * Informational message only. Normal operation.
*
*/
- public static String WSSERVLET_50_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_50_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_43_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET43.diag.check.1");
- }
-
- /**
- * Make sure web service is available and public. Examine exception for more details
- *
- */
- public static String WSSERVLET_43_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_43_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_15_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET15.diag.cause.1");
+ public static String WSSERVLET_19_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_19_DIAG_CHECK_1());
}
- /**
- * Web Services servlet shutdown.
- *
- */
- public static String WSSERVLET_15_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_15_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_27_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET27.diag.check.1");
- }
-
- /**
- * Remove the implicit URL
- *
- */
- public static String WSSERVLET_27_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_27_DIAG_CHECK_1());
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
- return messageFactory.getMessage("error.implementorRegistry.unknownName", arg0);
+ public static Localizable localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE() {
+ return MESSAGE_FACTORY.getMessage("servlet.trace.writingFaultResponse");
}
/**
- * WSSERVLET38: unknown port name: {0}
+ * WSSERVLET24: writing fault response
*
*/
- public static String ERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
- return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(arg0));
- }
-
- public static Localizable localizableSERVLET_HTML_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("servlet.html.notFound", arg0);
+ public static String SERVLET_TRACE_WRITING_FAULT_RESPONSE() {
+ return LOCALIZER.localize(localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE());
}
- /**
- * 404 Not Found: {0}
- *
- */
- public static String SERVLET_HTML_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableSERVLET_HTML_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableHTML_ROOT_PAGE_TITLE() {
- return messageFactory.getMessage("html.rootPage.title");
+ public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_NAME() {
+ return MESSAGE_FACTORY.getMessage("servlet.warning.duplicateEndpointName");
}
/**
- * Web Service
+ * WSSERVLET17: duplicate endpoint name
*
*/
- public static String HTML_ROOT_PAGE_TITLE() {
- return localizer.localize(localizableHTML_ROOT_PAGE_TITLE());
+ public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME() {
+ return LOCALIZER.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_NAME());
}
- public static Localizable localizableWSSERVLET_20_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET20.diag.check.1");
+ public static Localizable localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("trace.servlet.handingRequestOverToImplementor", arg0);
}
/**
- * Unzip the war, are the tie and serializer classes found?
+ * WSSERVLET59: handing request over to implementor: {0}
*
*/
- public static String WSSERVLET_20_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_20_DIAG_CHECK_1());
- }
-
- public static Localizable localizableJAXRPCSERVLET_11_DIAG_CAUSE_1() {
- return messageFactory.getMessage("JAXRPCSERVLET11.diag.cause.1");
- }
-
- /**
- * WSRuntimeInfoParser could not parse sun-jaxws.xml runtime descriptor
- *
- */
- public static String JAXRPCSERVLET_11_DIAG_CAUSE_1() {
- return localizer.localize(localizableJAXRPCSERVLET_11_DIAG_CAUSE_1());
+ public static String TRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
+ return LOCALIZER.localize(localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(arg0));
}
public static Localizable localizableWSSERVLET_11_DIAG_CHECK_2() {
- return messageFactory.getMessage("WSSERVLET11.diag.check.2");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET11.diag.check.2");
}
/**
@@ -416,11 +174,23 @@
*
*/
public static String WSSERVLET_11_DIAG_CHECK_2() {
- return localizer.localize(localizableWSSERVLET_11_DIAG_CHECK_2());
+ return LOCALIZER.localize(localizableWSSERVLET_11_DIAG_CHECK_2());
+ }
+
+ public static Localizable localizableWSSERVLET_65_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET65.diag.check.1");
+ }
+
+ /**
+ * Add SOAPAction and appropriate value
+ *
+ */
+ public static String WSSERVLET_65_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_65_DIAG_CHECK_1());
}
public static Localizable localizableWSSERVLET_11_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET11.diag.check.1");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET11.diag.check.1");
}
/**
@@ -428,95 +198,23 @@
*
*/
public static String WSSERVLET_11_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_11_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_22_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET22.diag.cause.1");
- }
-
- /**
- * A request was invoked with no endpoint
- *
- */
- public static String WSSERVLET_22_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_22_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_34_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET34.diag.check.1");
+ return LOCALIZER.localize(localizableWSSERVLET_11_DIAG_CHECK_1());
}
- /**
- * Check the log file(s) for more detailed errors/exceptions.
- *
- */
- public static String WSSERVLET_34_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_34_DIAG_CHECK_1());
- }
-
- public static Localizable localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
- return messageFactory.getMessage("error.servlet.noImplementorForPort", arg0);
- }
-
- /**
- * WSSERVLET52: no implementor registered for port: {0}
- *
- */
- public static String ERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
- return localizer.localize(localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(arg0));
- }
-
- public static Localizable localizableWSSERVLET_64_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET64.diag.check.1");
+ public static Localizable localizableWSSERVLET_15_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET15.diag.check.1");
}
/**
- * Make sure the client request is using text/xml
- *
- */
- public static String WSSERVLET_64_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_64_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_18_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET18.diag.check.1");
- }
-
- /**
- * This may or may not be intentional. If not examine client program for errors.
+ * Normal Web service undeployment. Undeployment complete.
*
*/
- public static String WSSERVLET_18_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_18_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_29_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET29.diag.cause.1");
- }
-
- /**
- * A port is specified, but a corresponding service implementation is not found
- *
- */
- public static String WSSERVLET_29_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_29_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE() {
- return messageFactory.getMessage("servlet.error.noResponseMessage");
- }
-
- /**
- * WSSERVLET23: no response message
- *
- */
- public static String SERVLET_ERROR_NO_RESPONSE_MESSAGE() {
- return localizer.localize(localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE());
+ public static String WSSERVLET_15_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_15_DIAG_CHECK_1());
}
public static Localizable localizableMESSAGE_TOO_LONG(Object arg0) {
- return messageFactory.getMessage("message.too.long", arg0);
+ return MESSAGE_FACTORY.getMessage("message.too.long", arg0);
}
/**
@@ -526,323 +224,59 @@
*
*/
public static String MESSAGE_TOO_LONG(Object arg0) {
- return localizer.localize(localizableMESSAGE_TOO_LONG(arg0));
- }
-
- public static Localizable localizableLISTENER_INFO_INITIALIZE() {
- return messageFactory.getMessage("listener.info.initialize");
- }
-
- /**
- * WSSERVLET12: JAX-WS context listener initializing
- *
- */
- public static String LISTENER_INFO_INITIALIZE() {
- return localizer.localize(localizableLISTENER_INFO_INITIALIZE());
- }
-
- public static Localizable localizableSERVLET_HTML_NO_INFO_AVAILABLE() {
- return messageFactory.getMessage("servlet.html.noInfoAvailable");
- }
-
- /**
- * No JAX-WS context information available.
- *
- */
- public static String SERVLET_HTML_NO_INFO_AVAILABLE() {
- return localizer.localize(localizableSERVLET_HTML_NO_INFO_AVAILABLE());
- }
-
- public static Localizable localizableSERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
- return messageFactory.getMessage("servlet.html.information.table", arg0, arg1);
+ return LOCALIZER.localize(localizableMESSAGE_TOO_LONG(arg0));
}
- /**
- * Address: {0} WSDL: {0}?wsdl Implementation class: {1}
- *
- */
- public static String SERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
- return localizer.localize(localizableSERVLET_HTML_INFORMATION_TABLE(arg0, arg1));
- }
-
- public static Localizable localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE() {
- return messageFactory.getMessage("servlet.trace.writingFaultResponse");
- }
-
- /**
- * WSSERVLET24: writing fault response
- *
- */
- public static String SERVLET_TRACE_WRITING_FAULT_RESPONSE() {
- return localizer.localize(localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE());
- }
-
- public static Localizable localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
- return messageFactory.getMessage("servlet.error.noImplementorForEndpoint", arg0);
- }
-
- /**
- * WSSERVLET20: no implementor for endpoint: {0}
- *
- */
- public static String SERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
- return localizer.localize(localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(arg0));
- }
-
- public static Localizable localizableWSSERVLET_13_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET13.diag.cause.1");
+ public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.implementorFactory.newInstanceFailed", arg0);
}
/**
- * Context listener shutdown
- *
- */
- public static String WSSERVLET_13_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_13_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_3() {
- return messageFactory.getMessage("WSSERVLET50.diag.cause.3");
- }
-
- /**
- * There may some Application Server initialization problems
- *
- */
- public static String WSSERVLET_50_DIAG_CAUSE_3() {
- return localizer.localize(localizableWSSERVLET_50_DIAG_CAUSE_3());
- }
-
- public static Localizable localizableWSSERVLET_32_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET32.diag.check.1");
- }
-
- /**
- * Normal Operation.
- *
- */
- public static String WSSERVLET_32_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_32_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_2() {
- return messageFactory.getMessage("WSSERVLET50.diag.cause.2");
- }
-
- /**
- * Application server deployment descriptors may be incorrect
+ * WSSERVLET43: failed to instantiate service implementor for port "{0}"
*
*/
- public static String WSSERVLET_50_DIAG_CAUSE_2() {
- return localizer.localize(localizableWSSERVLET_50_DIAG_CAUSE_2());
- }
-
- public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET50.diag.cause.1");
- }
-
- /**
- * WS runtime sun-jaxws.xml or web.xml may be incorrect
- *
- */
- public static String WSSERVLET_50_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_50_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_25_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET25.diag.check.1");
+ public static String ERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(arg0));
}
- /**
- * Tracing message, normal response.
- *
- */
- public static String WSSERVLET_25_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_25_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_43_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET43.diag.cause.1");
- }
-
- /**
- * Instantiation of the web service failed.
- *
- */
- public static String WSSERVLET_43_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_43_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_27_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET27.diag.cause.1");
+ public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
+ return MESSAGE_FACTORY.getMessage("error.implementorRegistry.cannotReadConfiguration");
}
/**
- * Implicit URLS are not supported in this release
- *
- */
- public static String WSSERVLET_27_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_27_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
- return messageFactory.getMessage("error.servlet.caughtThrowableInInit", arg0);
- }
-
- /**
- * WSSERVLET50: caught throwable during servlet initialization: {0}
+ * WSSERVLET39: cannot read configuration
*
*/
- public static String ERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
- return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(arg0));
- }
-
- public static Localizable localizableSERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
- return messageFactory.getMessage("servlet.html.endpoint.table", arg0, arg1);
- }
-
- /**
- * Service Name: {0} Port Name: {1}
- *
- */
- public static String SERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
- return localizer.localize(localizableSERVLET_HTML_ENDPOINT_TABLE(arg0, arg1));
- }
-
- public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
- return messageFactory.getMessage("error.servlet.caughtThrowableWhileRecovering", arg0);
+ public static String ERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION());
}
- /**
- * WSSERVLET51: caught throwable while recovering from a previous exception: {0}
- *
- */
- public static String ERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
- return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(arg0));
- }
-
- public static Localizable localizableNO_SUNJAXWS_XML(Object arg0) {
- return messageFactory.getMessage("no.sunjaxws.xml", arg0);
- }
-
- /**
- * Runtime descriptor "{0}" is missing
- *
- */
- public static String NO_SUNJAXWS_XML(Object arg0) {
- return localizer.localize(localizableNO_SUNJAXWS_XML(arg0));
- }
-
- public static Localizable localizableSERVLET_HTML_TITLE_2() {
- return messageFactory.getMessage("servlet.html.title2");
- }
-
- /**
- * Web Services
- *
- */
- public static String SERVLET_HTML_TITLE_2() {
- return localizer.localize(localizableSERVLET_HTML_TITLE_2());
- }
-
- public static Localizable localizableLISTENER_INFO_DESTROY() {
- return messageFactory.getMessage("listener.info.destroy");
+ public static Localizable localizableWSSERVLET_35_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET35.diag.cause.1");
}
/**
- * WSSERVLET13: JAX-WS context listener destroyed
- *
- */
- public static String LISTENER_INFO_DESTROY() {
- return localizer.localize(localizableLISTENER_INFO_DESTROY());
- }
-
- public static Localizable localizableEXCEPTION_TEMPLATE_CREATION_FAILED() {
- return messageFactory.getMessage("exception.templateCreationFailed");
- }
-
- /**
- * WSSERVLET35: failed to create a template object
+ * A XSLT stylesheet template is create for the wsdl location patching using transformation. Template create failed.
*
*/
- public static String EXCEPTION_TEMPLATE_CREATION_FAILED() {
- return localizer.localize(localizableEXCEPTION_TEMPLATE_CREATION_FAILED());
- }
-
- public static Localizable localizableWSSERVLET_20_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET20.diag.cause.1");
+ public static String WSSERVLET_35_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_35_DIAG_CAUSE_1());
}
- /**
- * Implementation for this service can not be found
- *
- */
- public static String WSSERVLET_20_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_20_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE() {
- return messageFactory.getMessage("trace.servlet.writingFaultResponse");
+ public static Localizable localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.servlet.init.config.fileNotFound", arg0);
}
/**
- * WSSERVLET61: writing fault response
- *
- */
- public static String TRACE_SERVLET_WRITING_FAULT_RESPONSE() {
- return localizer.localize(localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE());
- }
-
- public static Localizable localizableWSSERVLET_23_DIAG_CHECK_2() {
- return messageFactory.getMessage("WSSERVLET23.diag.check.2");
- }
-
- /**
- * The request may be malformed and be accepted by the service, yet did not generate a response
- *
- */
- public static String WSSERVLET_23_DIAG_CHECK_2() {
- return localizer.localize(localizableWSSERVLET_23_DIAG_CHECK_2());
- }
-
- public static Localizable localizableWSSERVLET_23_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET23.diag.check.1");
- }
-
- /**
- * If a response was expected, check that a request message was actually sent
+ * WSSERVLET48: config file: "{0}" not found
*
*/
- public static String WSSERVLET_23_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_23_DIAG_CHECK_1());
- }
-
- public static Localizable localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
- return messageFactory.getMessage("servlet.warning.missingContextInformation");
- }
-
- /**
- * WSSERVLET16: missing context information
- *
- */
- public static String SERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
- return localizer.localize(localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION());
- }
-
- public static Localizable localizableWSSERVLET_16_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET16.diag.check.1");
- }
-
- /**
- * Unjar the service war file; check to see that the jaxrpc-ri-runtime.xml file is present
- *
- */
- public static String WSSERVLET_16_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_16_DIAG_CHECK_1());
+ public static String ERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(arg0));
}
public static Localizable localizableWSSERVLET_34_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET34.diag.cause.1");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET34.diag.cause.1");
}
/**
@@ -850,71 +284,251 @@
*
*/
public static String WSSERVLET_34_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_34_DIAG_CAUSE_1());
+ return LOCALIZER.localize(localizableWSSERVLET_34_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.servlet.caughtThrowableInInit", arg0);
+ }
+
+ /**
+ * WSSERVLET50: caught throwable during servlet initialization: {0}
+ *
+ */
+ public static String ERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(arg0));
+ }
+
+ public static Localizable localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE() {
+ return MESSAGE_FACTORY.getMessage("servlet.error.noResponseMessage");
+ }
+
+ /**
+ * WSSERVLET23: no response message
+ *
+ */
+ public static String SERVLET_ERROR_NO_RESPONSE_MESSAGE() {
+ return LOCALIZER.localize(localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE());
}
- public static Localizable localizableHTML_NON_ROOT_PAGE_TITLE() {
- return messageFactory.getMessage("html.nonRootPage.title");
+ public static Localizable localizableSERVLET_NO_ADDRESS_AVAILABLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.no.address.available", arg0);
+ }
+
+ /**
+ * No address is available for {0}
+ *
+ */
+ public static String SERVLET_NO_ADDRESS_AVAILABLE(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_NO_ADDRESS_AVAILABLE(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_31_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET31.diag.cause.1");
+ }
+
+ /**
+ * Transformation being applied
+ *
+ */
+ public static String WSSERVLET_31_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_31_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_30_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET30.diag.cause.1");
}
/**
- * Web Service
+ * There was a server error processing the request
*
*/
- public static String HTML_NON_ROOT_PAGE_TITLE() {
- return localizer.localize(localizableHTML_NON_ROOT_PAGE_TITLE());
+ public static String WSSERVLET_30_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_30_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableINFO_SERVLET_DESTROYING() {
+ return MESSAGE_FACTORY.getMessage("info.servlet.destroying");
}
- public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_INFORMATION() {
- return messageFactory.getMessage("servlet.html.columnHeader.information");
+ /**
+ * WSSERVLET57: JAX-WS servlet: destroy
+ *
+ */
+ public static String INFO_SERVLET_DESTROYING() {
+ return LOCALIZER.localize(localizableINFO_SERVLET_DESTROYING());
+ }
+
+ public static Localizable localizableWSSERVLET_22_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET22.diag.cause.1");
}
/**
- * Information
+ * A request was invoked with no endpoint
+ *
+ */
+ public static String WSSERVLET_22_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_22_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_26_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET26.diag.cause.1");
+ }
+
+ /**
+ * The endpoint URL is a duplicate
*
*/
- public static String SERVLET_HTML_COLUMN_HEADER_INFORMATION() {
- return localizer.localize(localizableSERVLET_HTML_COLUMN_HEADER_INFORMATION());
+ public static String WSSERVLET_26_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_26_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableSERVLET_HTML_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.html.notFound", arg0);
}
- public static Localizable localizableWSSERVLET_18_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET18.diag.cause.1");
+ /**
+ * 404 Not Found: {0}
+ *
+ */
+ public static String SERVLET_HTML_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_HTML_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableNO_SUNJAXWS_XML(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("no.sunjaxws.xml", arg0);
}
/**
- * Message sent by client is empty
+ * Runtime descriptor "{0}" is missing
+ *
+ */
+ public static String NO_SUNJAXWS_XML(Object arg0) {
+ return LOCALIZER.localize(localizableNO_SUNJAXWS_XML(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_18_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET18.diag.check.1");
+ }
+
+ /**
+ * This may or may not be intentional. If not examine client program for errors.
+ *
+ */
+ public static String WSSERVLET_18_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_18_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_24_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET24.diag.cause.1");
+ }
+
+ /**
+ * SOAPFault message is being returned to the client.
*
*/
- public static String WSSERVLET_18_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_18_DIAG_CAUSE_1());
+ public static String WSSERVLET_24_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_24_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_51_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET51.diag.cause.1");
}
- public static Localizable localizableWSSERVLET_64_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET64.diag.cause.1");
+ /**
+ * Service processing of the request generated an exception; while attempting to return a SOAPPFaultMessage a throwable was again generated
+ *
+ */
+ public static String WSSERVLET_51_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_51_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableERROR_SERVLET_NO_PORT_SPECIFIED() {
+ return MESSAGE_FACTORY.getMessage("error.servlet.noPortSpecified");
+ }
+
+ /**
+ * WSSERVLET53: no port specified in HTTP POST request URL
+ *
+ */
+ public static String ERROR_SERVLET_NO_PORT_SPECIFIED() {
+ return LOCALIZER.localize(localizableERROR_SERVLET_NO_PORT_SPECIFIED());
+ }
+
+ public static Localizable localizableWSSERVLET_43_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET43.diag.cause.1");
}
/**
- * Web service requests must be a content type text/xml: WSI BP 1.0
+ * Instantiation of the web service failed.
*
*/
- public static String WSSERVLET_64_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_64_DIAG_CAUSE_1());
+ public static String WSSERVLET_43_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_43_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
+ return MESSAGE_FACTORY.getMessage("trace.servlet.writingSuccessResponse");
}
- public static Localizable localizableINFO_SERVLET_INITIALIZING() {
- return messageFactory.getMessage("info.servlet.initializing");
+ /**
+ * WSSERVLET62: writing success response
+ *
+ */
+ public static String TRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
+ return LOCALIZER.localize(localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE());
+ }
+
+ public static Localizable localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
+ return MESSAGE_FACTORY.getMessage("info.servlet.gotEmptyRequestMessage");
}
/**
- * WSSERVLET56: JAX-WS servlet: init
+ * WSSERVLET55: got empty request message
+ *
+ */
+ public static String INFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
+ return LOCALIZER.localize(localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE());
+ }
+
+ public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.servlet.caughtThrowableWhileRecovering", arg0);
+ }
+
+ /**
+ * WSSERVLET51: caught throwable while recovering from a previous exception: {0}
*
*/
- public static String INFO_SERVLET_INITIALIZING() {
- return localizer.localize(localizableINFO_SERVLET_INITIALIZING());
+ public static String ERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_12_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET12.diag.check.1");
+ }
+
+ /**
+ * Normal web service startup
+ *
+ */
+ public static String WSSERVLET_12_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_12_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_16_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET16.diag.check.1");
+ }
+
+ /**
+ * Unjar the service war file; check to see that the jaxrpc-ri-runtime.xml file is present
+ *
+ */
+ public static String WSSERVLET_16_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_16_DIAG_CHECK_1());
}
public static Localizable localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE() {
- return messageFactory.getMessage("servlet.info.emptyRequestMessage");
+ return MESSAGE_FACTORY.getMessage("servlet.info.emptyRequestMessage");
}
/**
@@ -922,59 +536,143 @@
*
*/
public static String SERVLET_INFO_EMPTY_REQUEST_MESSAGE() {
- return localizer.localize(localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE());
+ return LOCALIZER.localize(localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE());
+ }
+
+ public static Localizable localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.warning.ignoringImplicitUrlPattern", arg0);
+ }
+
+ /**
+ * WSSERVLET27: unsupported implicit URL pattern in endpoint: {0}
+ *
+ */
+ public static String SERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(arg0));
}
- public static Localizable localizableSERVLET_ERROR_NO_ENDPOINT_SPECIFIED() {
- return messageFactory.getMessage("servlet.error.noEndpointSpecified");
+ public static Localizable localizableWSSERVLET_14_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET14.diag.check.1");
+ }
+
+ /**
+ * Normal Web Service deployment. Deployment of service complete.
+ *
+ */
+ public static String WSSERVLET_14_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_14_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_20_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET20.diag.cause.1");
}
/**
- * WSSERVLET22: no endpoint specified
+ * Implementation for this service can not be found
+ *
+ */
+ public static String WSSERVLET_20_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_20_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_14_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET14.diag.cause.1");
+ }
+
+ /**
+ * Web Services servlet starting up.
*
*/
- public static String SERVLET_ERROR_NO_ENDPOINT_SPECIFIED() {
- return localizer.localize(localizableSERVLET_ERROR_NO_ENDPOINT_SPECIFIED());
+ public static String WSSERVLET_14_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_14_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_28_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET28.diag.check.1");
}
- public static Localizable localizableWSSERVLET_11_DIAG_CAUSE_2() {
- return messageFactory.getMessage("WSSERVLET11.diag.cause.2");
+ /**
+ * Set target endpoint with stub.setTargetEndpoint() property.
+ *
+ */
+ public static String WSSERVLET_28_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_28_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_26_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET26.diag.check.1");
}
/**
- * The sun-jaxws.xml runtime deployment descriptor may be missing
+ * This may cause a problem, please remove duplicate endpoints
*
*/
- public static String WSSERVLET_11_DIAG_CAUSE_2() {
- return localizer.localize(localizableWSSERVLET_11_DIAG_CAUSE_2());
+ public static String WSSERVLET_26_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_26_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableHTML_ROOT_PAGE_TITLE() {
+ return MESSAGE_FACTORY.getMessage("html.rootPage.title");
}
- public static Localizable localizableWSSERVLET_30_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET30.diag.check.1");
+ /**
+ * Web Service
+ *
+ */
+ public static String HTML_ROOT_PAGE_TITLE() {
+ return LOCALIZER.localize(localizableHTML_ROOT_PAGE_TITLE());
+ }
+
+ public static Localizable localizableWSSERVLET_18_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET18.diag.cause.1");
}
/**
- * This could be due to a number of causes. Check the server log file for exceptions.
+ * Message sent by client is empty
*
*/
- public static String WSSERVLET_30_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_30_DIAG_CHECK_1());
+ public static String WSSERVLET_18_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_18_DIAG_CAUSE_1());
}
- public static Localizable localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER() {
- return messageFactory.getMessage("exception.cannotCreateTransformer");
+ public static Localizable localizableWSSERVLET_63_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET63.diag.cause.1");
}
/**
- * WSSERVLET33: cannot create transformer
+ * Web service requests must use HTTP POST method: WSI BP 1.0
+ *
+ */
+ public static String WSSERVLET_63_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_63_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableHTML_NON_ROOT_PAGE_TITLE() {
+ return MESSAGE_FACTORY.getMessage("html.nonRootPage.title");
+ }
+
+ /**
+ * Web Service
*
*/
- public static String EXCEPTION_CANNOT_CREATE_TRANSFORMER() {
- return localizer.localize(localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER());
+ public static String HTML_NON_ROOT_PAGE_TITLE() {
+ return LOCALIZER.localize(localizableHTML_NON_ROOT_PAGE_TITLE());
+ }
+
+ public static Localizable localizableSERVLET_INFO_DESTROY() {
+ return MESSAGE_FACTORY.getMessage("servlet.info.destroy");
+ }
+
+ /**
+ * WSSERVLET15: JAX-WS servlet destroyed
+ *
+ */
+ public static String SERVLET_INFO_DESTROY() {
+ return LOCALIZER.localize(localizableSERVLET_INFO_DESTROY());
}
public static Localizable localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION() {
- return messageFactory.getMessage("servlet.faultstring.invalidSOAPAction");
+ return MESSAGE_FACTORY.getMessage("servlet.faultstring.invalidSOAPAction");
}
/**
@@ -982,35 +680,227 @@
*
*/
public static String SERVLET_FAULTSTRING_INVALID_SOAP_ACTION() {
- return localizer.localize(localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION());
+ return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION());
+ }
+
+ public static Localizable localizableWSSERVLET_16_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET16.diag.cause.1");
+ }
+
+ /**
+ * The jaxrpc-ri.xml file may be missing from the war file
+ *
+ */
+ public static String WSSERVLET_16_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_16_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_63_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET63.diag.check.1");
+ }
+
+ /**
+ * Make sure that your HTTP client is using POST requests, not GET requests
+ *
+ */
+ public static String WSSERVLET_63_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_63_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableEXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("exception.transformationFailed", arg0);
+ }
+
+ /**
+ * WSSERVLET34: transformation failed : {0}
+ *
+ */
+ public static String EXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
+ return LOCALIZER.localize(localizableEXCEPTION_TRANSFORMATION_FAILED(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_28_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET28.diag.cause.1");
+ }
+
+ /**
+ * Target endpoint is null
+ *
+ */
+ public static String WSSERVLET_28_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_28_DIAG_CAUSE_1());
}
- public static Localizable localizableWSSERVLET_14_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET14.diag.check.1");
+ public static Localizable localizableWSSERVLET_20_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET20.diag.check.1");
+ }
+
+ /**
+ * Unzip the war, are the tie and serializer classes found?
+ *
+ */
+ public static String WSSERVLET_20_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_20_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.servlet.noImplementorForPort", arg0);
+ }
+
+ /**
+ * WSSERVLET52: no implementor registered for port: {0}
+ *
+ */
+ public static String ERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(arg0));
+ }
+
+ public static Localizable localizablePUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("publisher.info.generatingWSDL", arg0);
+ }
+
+ /**
+ * WSSERVLET32: generating WSDL for endpoint: {0}
+ *
+ */
+ public static String PUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
+ return LOCALIZER.localize(localizablePUBLISHER_INFO_GENERATING_WSDL(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_22_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET22.diag.check.1");
+ }
+
+ /**
+ * Set endpoint with stub.setTargetEndpoint property
+ *
+ */
+ public static String WSSERVLET_22_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_22_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_24_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET24.diag.check.1");
}
/**
- * Normal Web Service deployment. Deployment of service complete.
+ * Tracing message fault recorded.
+ *
+ */
+ public static String WSSERVLET_24_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_24_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_12_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET12.diag.cause.1");
+ }
+
+ /**
+ * Context listener starting
*
*/
- public static String WSSERVLET_14_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_14_DIAG_CHECK_1());
+ public static String WSSERVLET_12_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_12_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_65_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET65.diag.cause.1");
}
- public static Localizable localizableWSSERVLET_32_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET32.diag.cause.1");
+ /**
+ * SOAP Action is required
+ *
+ */
+ public static String WSSERVLET_65_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_65_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.trace.invokingImplementor", arg0);
+ }
+
+ /**
+ * WSSERVLET21: invoking implementor: {0}
+ *
+ */
+ public static String SERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_21_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET21.diag.cause.1");
}
/**
- * WSDL being generated
+ * The Web service is being invoked
+ *
+ */
+ public static String WSSERVLET_21_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_21_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableTRACE_SERVLET_REQUEST_FOR_PORT_NAMED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("trace.servlet.requestForPortNamed", arg0);
+ }
+
+ /**
+ * WSSERVLET58: got request for port: {0}
+ *
+ */
+ public static String TRACE_SERVLET_REQUEST_FOR_PORT_NAMED(Object arg0) {
+ return LOCALIZER.localize(localizableTRACE_SERVLET_REQUEST_FOR_PORT_NAMED(arg0));
+ }
+
+ public static Localizable localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("publisher.info.applyingTransformation", arg0);
+ }
+
+ /**
+ * WSSERVLET31: applying transformation with actual address: {0}
*
*/
- public static String WSSERVLET_32_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_32_DIAG_CAUSE_1());
+ public static String PUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
+ return LOCALIZER.localize(localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(arg0));
+ }
+
+ public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.implementorFactory.servantInitFailed", arg0);
+ }
+
+ /**
+ * WSSERVLET44: failed to initialize the service implementor for port "{0}"
+ *
+ */
+ public static String ERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_17_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET17.diag.check.1");
+ }
+
+ /**
+ * Note that this may cause problems with service deployment
+ *
+ */
+ public static String WSSERVLET_17_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_17_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.servlet.caughtThrowable", arg0);
+ }
+
+ /**
+ * WSSERVLET49: caught throwable: {0}
+ *
+ */
+ public static String ERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE(arg0));
}
public static Localizable localizableWSSERVLET_25_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET25.diag.cause.1");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET25.diag.cause.1");
}
/**
@@ -1018,71 +908,107 @@
*
*/
public static String WSSERVLET_25_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_25_DIAG_CAUSE_1());
+ return LOCALIZER.localize(localizableWSSERVLET_25_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableSERVLET_HTML_METHOD() {
+ return MESSAGE_FACTORY.getMessage("servlet.html.method");
}
- public static Localizable localizableWSSERVLET_44_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET44.diag.check.1");
+ /**
+ * WSSERVLET63: must use Post for this type of request
+ *
+ */
+ public static String SERVLET_HTML_METHOD() {
+ return LOCALIZER.localize(localizableSERVLET_HTML_METHOD());
+ }
+
+ public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
+ return MESSAGE_FACTORY.getMessage("error.implementorFactory.noInputStream");
}
/**
- * Check the exception for more details. Make sure all the configuration files are correct.
+ * WSSERVLET37: no configuration specified
*
*/
- public static String WSSERVLET_44_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_44_DIAG_CHECK_1());
+ public static String ERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM());
}
- public static Localizable localizableWSSERVLET_28_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET28.diag.check.1");
+ public static Localizable localizableWSSERVLET_51_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET51.diag.check.1");
}
/**
- * Set target endpoint with stub.setTargetEndpoint() property.
+ * Check the server.xml log file for exception information
*
*/
- public static String WSSERVLET_28_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_28_DIAG_CHECK_1());
+ public static String WSSERVLET_51_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_51_DIAG_CHECK_1());
}
- public static Localizable localizableSERVLET_INFO_INITIALIZE() {
- return messageFactory.getMessage("servlet.info.initialize");
+ public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.implementorRegistry.unknownName", arg0);
}
/**
- * WSSERVLET14: JAX-WS servlet initializing
+ * WSSERVLET38: unknown port name: {0}
*
*/
- public static String SERVLET_INFO_INITIALIZE() {
- return localizer.localize(localizableSERVLET_INFO_INITIALIZE());
+ public static String ERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(arg0));
+ }
+
+ public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
+ return MESSAGE_FACTORY.getMessage("error.implementorRegistry.incompleteInformation");
}
- public static Localizable localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("error.servlet.init.config.fileNotFound", arg0);
+ /**
+ * WSSERVLET41: configuration information is incomplete
+ *
+ */
+ public static String ERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION());
+ }
+
+ public static Localizable localizableWSSERVLET_13_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET13.diag.check.1");
}
/**
- * WSSERVLET48: config file: "{0}" not found
+ * Normal web service shutdown
*
*/
- public static String ERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(arg0));
+ public static String WSSERVLET_13_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_13_DIAG_CHECK_1());
}
- public static Localizable localizableHTML_WSDL_PAGE_TITLE() {
- return messageFactory.getMessage("html.wsdlPage.title");
+ public static Localizable localizableWSSERVLET_32_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET32.diag.check.1");
}
/**
- * Web Service
+ * Normal Operation.
*
*/
- public static String HTML_WSDL_PAGE_TITLE() {
- return localizer.localize(localizableHTML_WSDL_PAGE_TITLE());
+ public static String WSSERVLET_32_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_32_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableSERVLET_HTML_TITLE_2() {
+ return MESSAGE_FACTORY.getMessage("servlet.html.title2");
+ }
+
+ /**
+ * Web Services
+ *
+ */
+ public static String SERVLET_HTML_TITLE_2() {
+ return LOCALIZER.localize(localizableSERVLET_HTML_TITLE_2());
}
public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
- return messageFactory.getMessage("servlet.html.columnHeader.portName");
+ return MESSAGE_FACTORY.getMessage("servlet.html.columnHeader.portName");
}
/**
@@ -1090,107 +1016,203 @@
*
*/
public static String SERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
- return localizer.localize(localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME());
+ return LOCALIZER.localize(localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME());
+ }
+
+ public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_STATUS() {
+ return MESSAGE_FACTORY.getMessage("servlet.html.columnHeader.status");
}
- public static Localizable localizableHTML_ROOT_PAGE_BODY_2_B() {
- return messageFactory.getMessage("html.rootPage.body2b");
+ /**
+ * Status
+ *
+ */
+ public static String SERVLET_HTML_COLUMN_HEADER_STATUS() {
+ return LOCALIZER.localize(localizableSERVLET_HTML_COLUMN_HEADER_STATUS());
+ }
+
+ public static Localizable localizableWSSERVLET_43_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET43.diag.check.1");
}
/**
- *
+ * Make sure web service is available and public. Examine exception for more details
*
*/
- public static String HTML_ROOT_PAGE_BODY_2_B() {
- return localizer.localize(localizableHTML_ROOT_PAGE_BODY_2_B());
+ public static String WSSERVLET_43_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_43_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableINFO_SERVLET_INITIALIZING() {
+ return MESSAGE_FACTORY.getMessage("info.servlet.initializing");
}
- public static Localizable localizableHTML_ROOT_PAGE_BODY_2_A() {
- return messageFactory.getMessage("html.rootPage.body2a");
+ /**
+ * WSSERVLET56: JAX-WS servlet: init
+ *
+ */
+ public static String INFO_SERVLET_INITIALIZING() {
+ return LOCALIZER.localize(localizableINFO_SERVLET_INITIALIZING());
+ }
+
+ public static Localizable localizableWSSERVLET_32_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET32.diag.cause.1");
}
/**
- * It supports the following ports:
+ * WSDL being generated
*
*/
- public static String HTML_ROOT_PAGE_BODY_2_A() {
- return localizer.localize(localizableHTML_ROOT_PAGE_BODY_2_A());
+ public static String WSSERVLET_32_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_32_DIAG_CAUSE_1());
}
- public static Localizable localizableWSSERVLET_21_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET21.diag.check.1");
+ public static Localizable localizableJAXRPCSERVLET_11_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("JAXRPCSERVLET11.diag.cause.1");
}
/**
- * Normal web service invocation.
+ * WSRuntimeInfoParser could not parse sun-jaxws.xml runtime descriptor
+ *
+ */
+ public static String JAXRPCSERVLET_11_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableJAXRPCSERVLET_11_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.cause.1");
+ }
+
+ /**
+ * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
*
*/
- public static String WSSERVLET_21_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_21_DIAG_CHECK_1());
+ public static String WSSERVLET_33_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_44_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET44.diag.check.1");
}
- public static Localizable localizableERROR_SERVLET_NO_PORT_SPECIFIED() {
- return messageFactory.getMessage("error.servlet.noPortSpecified");
+ /**
+ * Check the exception for more details. Make sure all the configuration files are correct.
+ *
+ */
+ public static String WSSERVLET_44_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_44_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_2() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.cause.2");
}
/**
- * WSSERVLET53: no port specified in HTTP POST request URL
+ * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
*
*/
- public static String ERROR_SERVLET_NO_PORT_SPECIFIED() {
- return localizer.localize(localizableERROR_SERVLET_NO_PORT_SPECIFIED());
+ public static String WSSERVLET_33_DIAG_CAUSE_2() {
+ return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CAUSE_2());
}
- public static Localizable localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
- return messageFactory.getMessage("info.servlet.gotEmptyRequestMessage");
+ public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
+ return MESSAGE_FACTORY.getMessage("error.implementorFactory.noConfiguration");
}
/**
- * WSSERVLET55: got empty request message
+ * WSSERVLET36: no configuration specified
+ *
+ */
+ public static String ERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION());
+ }
+
+ public static Localizable localizableWSSERVLET_44_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET44.diag.cause.1");
+ }
+
+ /**
+ * The web service was instantiated, however, it could not be initialized
*
*/
- public static String INFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
- return localizer.localize(localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE());
+ public static String WSSERVLET_44_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_44_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableHTML_WSDL_PAGE_TITLE() {
+ return MESSAGE_FACTORY.getMessage("html.wsdlPage.title");
}
- public static Localizable localizableWSSERVLET_51_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET51.diag.check.1");
+ /**
+ * Web Service
+ *
+ */
+ public static String HTML_WSDL_PAGE_TITLE() {
+ return LOCALIZER.localize(localizableHTML_WSDL_PAGE_TITLE());
+ }
+
+ public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.implementorRegistry.duplicateName", arg0);
}
/**
- * Check the server.xml log file for exception information
+ * WSSERVLET42: duplicate port name: {0}
*
*/
- public static String WSSERVLET_51_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_51_DIAG_CHECK_1());
+ public static String ERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(arg0));
+ }
+
+ public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.warning.duplicateEndpointUrlPattern", arg0);
}
- public static Localizable localizableWSSERVLET_23_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET23.diag.cause.1");
+ /**
+ * WSSERVLET26: duplicate URL pattern in endpoint: {0}
+ *
+ */
+ public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(arg0));
+ }
+
+ public static Localizable localizableSERVLET_HTML_NO_INFO_AVAILABLE() {
+ return MESSAGE_FACTORY.getMessage("servlet.html.noInfoAvailable");
}
/**
- * The request generated no response from the service
+ *
No JAX-WS context information available.
*
*/
- public static String WSSERVLET_23_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_23_DIAG_CAUSE_1());
+ public static String SERVLET_HTML_NO_INFO_AVAILABLE() {
+ return LOCALIZER.localize(localizableSERVLET_HTML_NO_INFO_AVAILABLE());
}
- public static Localizable localizableWSSERVLET_16_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET16.diag.cause.1");
+ public static Localizable localizableWSSERVLET_49_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET49.diag.cause.1");
}
/**
- * The jaxrpc-ri.xml file may be missing from the war file
+ * Service processing of the request generated an exception; while attempting to return a SOAPFaultMessage a throwable was again generated
*
*/
- public static String WSSERVLET_16_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_16_DIAG_CAUSE_1());
+ public static String WSSERVLET_49_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_49_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_33_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.check.1");
+ }
+
+ /**
+ * There maybe a transformation engine being used that is not compatible. Make sure you are using the correct transformer and version.
+ *
+ */
+ public static String WSSERVLET_33_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CHECK_1());
}
public static Localizable localizableWSSERVLET_35_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET35.diag.check.1");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET35.diag.check.1");
}
/**
@@ -1198,71 +1220,155 @@
*
*/
public static String WSSERVLET_35_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_35_DIAG_CHECK_1());
+ return LOCALIZER.localize(localizableWSSERVLET_35_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_33_DIAG_CHECK_2() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.check.2");
+ }
+
+ /**
+ * There maybe a transformation engine may not be supported or compatible. Check the server.xml file for exceptions.
+ *
+ */
+ public static String WSSERVLET_33_DIAG_CHECK_2() {
+ return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CHECK_2());
}
- public static Localizable localizableWSSERVLET_65_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET65.diag.check.1");
+ public static Localizable localizableSERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("servlet.html.information.table", arg0, arg1);
+ }
+
+ /**
+ * Address: {0} WSDL: {0}?wsdl Implementation class: {1}
+ *
+ */
+ public static String SERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableSERVLET_HTML_INFORMATION_TABLE(arg0, arg1));
+ }
+
+ public static Localizable localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
+ return MESSAGE_FACTORY.getMessage("error.wsdlPublisher.cannotReadConfiguration");
}
/**
- * Add SOAPAction and appropriate value
+ * WSSERVLET46: cannot read configuration
*
*/
- public static String WSSERVLET_65_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_65_DIAG_CHECK_1());
+ public static String ERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
+ return LOCALIZER.localize(localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION());
}
- public static Localizable localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
- return messageFactory.getMessage("trace.servlet.handingRequestOverToImplementor", arg0);
+ public static Localizable localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER() {
+ return MESSAGE_FACTORY.getMessage("exception.cannotCreateTransformer");
}
/**
- * WSSERVLET59: handing request over to implementor: {0}
+ * WSSERVLET33: cannot create transformer
*
*/
- public static String TRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
- return localizer.localize(localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(arg0));
+ public static String EXCEPTION_CANNOT_CREATE_TRANSFORMER() {
+ return LOCALIZER.localize(localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER());
+ }
+
+ public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_2() {
+ return MESSAGE_FACTORY.getMessage("html.nonRootPage.body2");
}
- public static Localizable localizableWSSERVLET_19_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET19.diag.check.1");
+ /**
+ * Invalid request URI.
Please check your deployment information.
+ *
+ */
+ public static String HTML_NON_ROOT_PAGE_BODY_2() {
+ return LOCALIZER.localize(localizableHTML_NON_ROOT_PAGE_BODY_2());
+ }
+
+ public static Localizable localizableLISTENER_PARSING_FAILED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("listener.parsingFailed", arg0);
}
/**
- * Informational message only. Normal operation.
+ * WSSERVLET11: failed to parse runtime descriptor: {0}
+ *
+ */
+ public static String LISTENER_PARSING_FAILED(Object arg0) {
+ return LOCALIZER.localize(localizableLISTENER_PARSING_FAILED(arg0));
+ }
+
+ public static Localizable localizableLISTENER_INFO_DESTROY() {
+ return MESSAGE_FACTORY.getMessage("listener.info.destroy");
+ }
+
+ /**
+ * WSSERVLET13: JAX-WS context listener destroyed
*
*/
- public static String WSSERVLET_19_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_19_DIAG_CHECK_1());
+ public static String LISTENER_INFO_DESTROY() {
+ return LOCALIZER.localize(localizableLISTENER_INFO_DESTROY());
+ }
+
+ public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_1() {
+ return MESSAGE_FACTORY.getMessage("html.nonRootPage.body1");
}
- public static Localizable localizablePUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
- return messageFactory.getMessage("publisher.info.generatingWSDL", arg0);
+ /**
+ * A Web Service is installed at this URL.
+ *
+ */
+ public static String HTML_NON_ROOT_PAGE_BODY_1() {
+ return LOCALIZER.localize(localizableHTML_NON_ROOT_PAGE_BODY_1());
+ }
+
+ public static Localizable localizableSERVLET_INFO_INITIALIZE() {
+ return MESSAGE_FACTORY.getMessage("servlet.info.initialize");
}
/**
- * WSSERVLET32: generating WSDL for endpoint: {0}
+ * WSSERVLET14: JAX-WS servlet initializing
*
*/
- public static String PUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
- return localizer.localize(localizablePUBLISHER_INFO_GENERATING_WSDL(arg0));
+ public static String SERVLET_INFO_INITIALIZE() {
+ return LOCALIZER.localize(localizableSERVLET_INFO_INITIALIZE());
}
- public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
- return messageFactory.getMessage("servlet.warning.duplicateEndpointUrlPattern", arg0);
+ public static Localizable localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
+ return MESSAGE_FACTORY.getMessage("servlet.warning.missingContextInformation");
}
/**
- * WSSERVLET26: duplicate URL pattern in endpoint: {0}
+ * WSSERVLET16: missing context information
+ *
+ */
+ public static String SERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
+ return LOCALIZER.localize(localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION());
+ }
+
+ public static Localizable localizableWSSERVLET_64_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET64.diag.check.1");
+ }
+
+ /**
+ * Make sure the client request is using text/xml
*
*/
- public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
- return localizer.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(arg0));
+ public static String WSSERVLET_64_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_64_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableSERVLET_FAULTSTRING_PORT_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.faultstring.portNotFound", arg0);
+ }
+
+ /**
+ * WSSERVLET29: Port not found ({0})
+ *
+ */
+ public static String SERVLET_FAULTSTRING_PORT_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_PORT_NOT_FOUND(arg0));
}
public static Localizable localizableWSSERVLET_49_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET49.diag.check.1");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET49.diag.check.1");
}
/**
@@ -1270,263 +1376,11 @@
*
*/
public static String WSSERVLET_49_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_49_DIAG_CHECK_1());
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
- return messageFactory.getMessage("error.implementorRegistry.cannotReadConfiguration");
- }
-
- /**
- * WSSERVLET39: cannot read configuration
- *
- */
- public static String ERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
- return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION());
- }
-
- public static Localizable localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
- return messageFactory.getMessage("trace.servlet.gotResponseFromImplementor", arg0);
- }
-
- /**
- * WSSERVLET60: got response from implementor: {0}
- *
- */
- public static String TRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
- return localizer.localize(localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(arg0));
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
- return messageFactory.getMessage("error.implementorRegistry.incompleteInformation");
- }
-
- /**
- * WSSERVLET41: configuration information is incomplete
- *
- */
- public static String ERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
- return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION());
- }
-
- public static Localizable localizableWSSERVLET_12_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET12.diag.check.1");
- }
-
- /**
- * Normal web service startup
- *
- */
- public static String WSSERVLET_12_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_12_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_30_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET30.diag.cause.1");
- }
-
- /**
- * There was a server error processing the request
- *
- */
- public static String WSSERVLET_30_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_30_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableHTML_WSDL_PAGE_NO_WSDL() {
- return messageFactory.getMessage("html.wsdlPage.noWsdl");
- }
-
- /**
- * No WSDL document available for publishing.
Please check your deployment information.
- *
- */
- public static String HTML_WSDL_PAGE_NO_WSDL() {
- return localizer.localize(localizableHTML_WSDL_PAGE_NO_WSDL());
- }
-
- public static Localizable localizableWSSERVLET_14_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET14.diag.cause.1");
- }
-
- /**
- * Web Services servlet starting up.
- *
- */
- public static String WSSERVLET_14_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_14_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableINFO_SERVLET_DESTROYING() {
- return messageFactory.getMessage("info.servlet.destroying");
- }
-
- /**
- * WSSERVLET57: JAX-WS servlet: destroy
- *
- */
- public static String INFO_SERVLET_DESTROYING() {
- return localizer.localize(localizableINFO_SERVLET_DESTROYING());
- }
-
- public static Localizable localizableERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED() {
- return messageFactory.getMessage("error.servlet.noResponseWasProduced");
- }
-
- /**
- * WSSERVLET54: no response was produced (internal error)
- *
- */
- public static String ERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED() {
- return localizer.localize(localizableERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED());
- }
-
- public static Localizable localizableWSSERVLET_26_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET26.diag.check.1");
- }
-
- /**
- * This may cause a problem, please remove duplicate endpoints
- *
- */
- public static String WSSERVLET_26_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_26_DIAG_CHECK_1());
- }
-
- public static Localizable localizableSERVLET_HTML_TITLE() {
- return messageFactory.getMessage("servlet.html.title");
- }
-
- /**
- * Web Services
- *
- */
- public static String SERVLET_HTML_TITLE() {
- return localizer.localize(localizableSERVLET_HTML_TITLE());
- }
-
- public static Localizable localizableWSSERVLET_44_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET44.diag.cause.1");
- }
-
- /**
- * The web service was instantiated, however, it could not be initialized
- *
- */
- public static String WSSERVLET_44_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_44_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_63_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET63.diag.check.1");
- }
-
- /**
- * Make sure that your HTTP client is using POST requests, not GET requests
- *
- */
- public static String WSSERVLET_63_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_63_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_28_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET28.diag.cause.1");
- }
-
- /**
- * Target endpoint is null
- *
- */
- public static String WSSERVLET_28_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_28_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
- return messageFactory.getMessage("error.implementorFactory.noConfiguration");
- }
-
- /**
- * WSSERVLET36: no configuration specified
- *
- */
- public static String ERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
- return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION());
- }
-
- public static Localizable localizableHTML_ROOT_PAGE_BODY_4() {
- return messageFactory.getMessage("html.rootPage.body4");
- }
-
- /**
- * This endpoint is incorrectly configured. Please check the location and contents of the configuration file.
- *
- */
- public static String HTML_ROOT_PAGE_BODY_4() {
- return localizer.localize(localizableHTML_ROOT_PAGE_BODY_4());
- }
-
- public static Localizable localizableHTML_ROOT_PAGE_BODY_1() {
- return messageFactory.getMessage("html.rootPage.body1");
- }
-
- /**
- * A Web Service is installed at this URL.
- *
- */
- public static String HTML_ROOT_PAGE_BODY_1() {
- return localizer.localize(localizableHTML_ROOT_PAGE_BODY_1());
- }
-
- public static Localizable localizableEXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
- return messageFactory.getMessage("exception.transformationFailed", arg0);
- }
-
- /**
- * WSSERVLET34: transformation failed : {0}
- *
- */
- public static String EXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
- return localizer.localize(localizableEXCEPTION_TRANSFORMATION_FAILED(arg0));
- }
-
- public static Localizable localizableSERVLET_HTML_METHOD() {
- return messageFactory.getMessage("servlet.html.method");
- }
-
- /**
- * WSSERVLET63: must use Post for this type of request
- *
- */
- public static String SERVLET_HTML_METHOD() {
- return localizer.localize(localizableSERVLET_HTML_METHOD());
- }
-
- public static Localizable localizableSERVLET_FAULTSTRING_MISSING_PORT() {
- return messageFactory.getMessage("servlet.faultstring.missingPort");
- }
-
- /**
- * WSSERVLET28: Missing port information
- *
- */
- public static String SERVLET_FAULTSTRING_MISSING_PORT() {
- return localizer.localize(localizableSERVLET_FAULTSTRING_MISSING_PORT());
- }
-
- public static Localizable localizableWSSERVLET_21_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET21.diag.cause.1");
- }
-
- /**
- * The Web service is being invoked
- *
- */
- public static String WSSERVLET_21_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_21_DIAG_CAUSE_1());
+ return LOCALIZER.localize(localizableWSSERVLET_49_DIAG_CHECK_1());
}
public static Localizable localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE() {
- return messageFactory.getMessage("servlet.trace.writingSuccessResponse");
+ return MESSAGE_FACTORY.getMessage("servlet.trace.writingSuccessResponse");
}
/**
@@ -1534,167 +1388,47 @@
*
*/
public static String SERVLET_TRACE_WRITING_SUCCESS_RESPONSE() {
- return localizer.localize(localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE());
- }
-
- public static Localizable localizableWSSERVLET_33_DIAG_CHECK_2() {
- return messageFactory.getMessage("WSSERVLET33.diag.check.2");
- }
-
- /**
- * There maybe a transformation engine may not be supported or compatible. Check the server.xml file for exceptions.
- *
- */
- public static String WSSERVLET_33_DIAG_CHECK_2() {
- return localizer.localize(localizableWSSERVLET_33_DIAG_CHECK_2());
+ return LOCALIZER.localize(localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE());
}
- public static Localizable localizableWSSERVLET_33_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET33.diag.check.1");
- }
-
- /**
- * There maybe a transformation engine being used that is not compatible. Make sure you are using the correct transformer and version.
- *
- */
- public static String WSSERVLET_33_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_33_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_51_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET51.diag.cause.1");
+ public static Localizable localizableWSSERVLET_50_DIAG_CHECK_2() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.check.2");
}
/**
- * Service processing of the request generated an exception; while attempting to return a SOAPPFaultMessage a throwable was again generated
+ * Verify that Application server deployment descriptors are correct in the service war file
*
*/
- public static String WSSERVLET_51_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_51_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_24_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET24.diag.check.1");
- }
-
- /**
- * Tracing message fault recorded.
- *
- */
- public static String WSSERVLET_24_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_24_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_17_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET17.diag.check.1");
+ public static String WSSERVLET_50_DIAG_CHECK_2() {
+ return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CHECK_2());
}
- /**
- * Note that this may cause problems with service deployment
- *
- */
- public static String WSSERVLET_17_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_17_DIAG_CHECK_1());
- }
-
- public static Localizable localizableWSSERVLET_35_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET35.diag.cause.1");
- }
-
- /**
- * A XSLT stylesheet template is create for the wsdl location patching using transformation. Template create failed.
- *
- */
- public static String WSSERVLET_35_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_35_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_19_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET19.diag.cause.1");
+ public static Localizable localizableSERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.faultstring.internalServerError", arg0);
}
/**
- * Client request for this endpoint arrived
- *
- */
- public static String WSSERVLET_19_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_19_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableWSSERVLET_65_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET65.diag.cause.1");
- }
-
- /**
- * SOAP Action is required
+ * WSSERVLET30: Internal server error ({0})
*
*/
- public static String WSSERVLET_65_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_65_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableLISTENER_PARSING_FAILED(Object arg0) {
- return messageFactory.getMessage("listener.parsingFailed", arg0);
+ public static String SERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(arg0));
}
- /**
- * WSSERVLET11: failed to parse runtime descriptor: {0}
- *
- */
- public static String LISTENER_PARSING_FAILED(Object arg0) {
- return localizer.localize(localizableLISTENER_PARSING_FAILED(arg0));
- }
-
- public static Localizable localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
- return messageFactory.getMessage("servlet.warning.ignoringImplicitUrlPattern", arg0);
+ public static Localizable localizableWSSERVLET_50_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.check.1");
}
/**
- * WSSERVLET27: unsupported implicit URL pattern in endpoint: {0}
- *
- */
- public static String SERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
- return localizer.localize(localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(arg0));
- }
-
- public static Localizable localizableWSSERVLET_49_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET49.diag.cause.1");
- }
-
- /**
- * Service processing of the request generated an exception; while attempting to return a SOAPFaultMessage a throwable was again generated
+ * Verify that sun-jaxws.xml and web.xml are correct in the service war file
*
*/
- public static String WSSERVLET_49_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_49_DIAG_CAUSE_1());
- }
-
- public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(Object arg0) {
- return messageFactory.getMessage("error.implementorFactory.newInstanceFailed", arg0);
- }
-
- /**
- * WSSERVLET43: failed to instantiate service implementor for port "{0}"
- *
- */
- public static String ERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(Object arg0) {
- return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(arg0));
- }
-
- public static Localizable localizableWSSERVLET_12_DIAG_CAUSE_1() {
- return messageFactory.getMessage("WSSERVLET12.diag.cause.1");
- }
-
- /**
- * Context listener starting
- *
- */
- public static String WSSERVLET_12_DIAG_CAUSE_1() {
- return localizer.localize(localizableWSSERVLET_12_DIAG_CAUSE_1());
+ public static String WSSERVLET_50_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CHECK_1());
}
public static Localizable localizableWSSERVLET_31_DIAG_CHECK_1() {
- return messageFactory.getMessage("WSSERVLET31.diag.check.1");
+ return MESSAGE_FACTORY.getMessage("WSSERVLET31.diag.check.1");
}
/**
@@ -1702,47 +1436,383 @@
*
*/
public static String WSSERVLET_31_DIAG_CHECK_1() {
- return localizer.localize(localizableWSSERVLET_31_DIAG_CHECK_1());
+ return LOCALIZER.localize(localizableWSSERVLET_31_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableEXCEPTION_TEMPLATE_CREATION_FAILED() {
+ return MESSAGE_FACTORY.getMessage("exception.templateCreationFailed");
+ }
+
+ /**
+ * WSSERVLET35: failed to create a template object
+ *
+ */
+ public static String EXCEPTION_TEMPLATE_CREATION_FAILED() {
+ return LOCALIZER.localize(localizableEXCEPTION_TEMPLATE_CREATION_FAILED());
+ }
+
+ public static Localizable localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("servlet.error.noImplementorForEndpoint", arg0);
+ }
+
+ /**
+ * WSSERVLET20: no implementor for endpoint: {0}
+ *
+ */
+ public static String SERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
+ return LOCALIZER.localize(localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_50_DIAG_CHECK_3() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.check.3");
+ }
+
+ /**
+ * Check the server.xml file in the domain directory for failures
+ *
+ */
+ public static String WSSERVLET_50_DIAG_CHECK_3() {
+ return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CHECK_3());
+ }
+
+ public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.implementorRegistry.fileNotFound", arg0);
}
- public static Localizable localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
- return messageFactory.getMessage("servlet.faultstring.invalidContentType");
+ /**
+ * WSSERVLET45: file not found: {0}
+ *
+ */
+ public static String ERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_13_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET13.diag.cause.1");
+ }
+
+ /**
+ * Context listener shutdown
+ *
+ */
+ public static String WSSERVLET_13_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_13_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_27_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET27.diag.check.1");
+ }
+
+ /**
+ * Remove the implicit URL
+ *
+ */
+ public static String WSSERVLET_27_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_27_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableHTML_ROOT_PAGE_BODY_2_B() {
+ return MESSAGE_FACTORY.getMessage("html.rootPage.body2b");
+ }
+
+ /**
+ *
+ *
+ */
+ public static String HTML_ROOT_PAGE_BODY_2_B() {
+ return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_2_B());
+ }
+
+ public static Localizable localizableWSSERVLET_15_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET15.diag.cause.1");
}
/**
- * WSSERVLET64: Invalid Content-Type, text/xml required
+ * Web Services servlet shutdown.
+ *
+ */
+ public static String WSSERVLET_15_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_15_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_29_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET29.diag.check.1");
+ }
+
+ /**
+ * Is the port valid? Unzip the war file and make sure the tie and serializers are present
+ *
+ */
+ public static String WSSERVLET_29_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_29_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("error.servlet.init.config.parameter.missing", arg0);
+ }
+
+ /**
+ * WSSERVLET47: cannot find configuration parameter: "{0}"
+ *
+ */
+ public static String ERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
+ return LOCALIZER.localize(localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_25_DIAG_CHECK_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET25.diag.check.1");
+ }
+
+ /**
+ * Tracing message, normal response.
*
*/
- public static String SERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
- return localizer.localize(localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE());
+ public static String WSSERVLET_25_DIAG_CHECK_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_25_DIAG_CHECK_1());
+ }
+
+ public static Localizable localizableWSSERVLET_64_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET64.diag.cause.1");
+ }
+
+ /**
+ * Web service requests must be a content type text/xml: WSI BP 1.0
+ *
+ */
+ public static String WSSERVLET_64_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_64_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableHTML_ROOT_PAGE_BODY_2_A() {
+ return MESSAGE_FACTORY.getMessage("html.rootPage.body2a");
}
- public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
- return messageFactory.getMessage("error.servlet.caughtThrowable", arg0);
+ /**
+ * It supports the following ports:
+ *
+ */
+ public static String HTML_ROOT_PAGE_BODY_2_A() {
+ return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_2_A());
+ }
+
+ public static Localizable localizableWSSERVLET_19_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET19.diag.cause.1");
+ }
+
+ /**
+ * Client request for this endpoint arrived
+ *
+ */
+ public static String WSSERVLET_19_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_19_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableHTML_ROOT_PAGE_BODY_4() {
+ return MESSAGE_FACTORY.getMessage("html.rootPage.body4");
+ }
+
+ /**
+ *
This endpoint is incorrectly configured. Please check the location and contents of the configuration file.
+ *
+ */
+ public static String HTML_ROOT_PAGE_BODY_4() {
+ return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_4());
+ }
+
+ public static Localizable localizableSERVLET_FAULTSTRING_MISSING_PORT() {
+ return MESSAGE_FACTORY.getMessage("servlet.faultstring.missingPort");
}
/**
- * WSSERVLET49: caught throwable: {0}
+ * WSSERVLET28: Missing port information
+ *
+ */
+ public static String SERVLET_FAULTSTRING_MISSING_PORT() {
+ return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_MISSING_PORT());
+ }
+
+ public static Localizable localizableHTML_ROOT_PAGE_BODY_1() {
+ return MESSAGE_FACTORY.getMessage("html.rootPage.body1");
+ }
+
+ /**
+ * A Web Service is installed at this URL.
+ *
+ */
+ public static String HTML_ROOT_PAGE_BODY_1() {
+ return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_1());
+ }
+
+ public static Localizable localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE() {
+ return MESSAGE_FACTORY.getMessage("trace.servlet.writingFaultResponse");
+ }
+
+ /**
+ * WSSERVLET61: writing fault response
+ *
+ */
+ public static String TRACE_SERVLET_WRITING_FAULT_RESPONSE() {
+ return LOCALIZER.localize(localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE());
+ }
+
+ public static Localizable localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("trace.servlet.gotResponseFromImplementor", arg0);
+ }
+
+ /**
+ * WSSERVLET60: got response from implementor: {0}
*
*/
- public static String ERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
- return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE(arg0));
+ public static String TRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
+ return LOCALIZER.localize(localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(arg0));
+ }
+
+ public static Localizable localizableWSSERVLET_17_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET17.diag.cause.1");
+ }
+
+ /**
+ * Two or more endpoints with the same name where found in the jaxrpc-ri.xml runtime descriptor
+ *
+ */
+ public static String WSSERVLET_17_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_17_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_1() {
+ return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.cause.1");
}
- public static Localizable localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
- return messageFactory.getMessage("trace.servlet.writingSuccessResponse");
+ /**
+ * WS runtime sun-jaxws.xml or web.xml may be incorrect
+ *
+ */
+ public static String WSSERVLET_50_DIAG_CAUSE_1() {
+ return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CAUSE_1());
+ }
+
+ public static Localizable localizableSERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("servlet.html.endpoint.table", arg0, arg1);
+ }
+
+ /**
+ * | Service Name: | {0} |
| Port Name: | {1} |
- * Calling this method may cause child {@code Element},
+ * Calling this method must cause child {@code Element},
* {@code SOAPElement} and {@code org.w3c.dom.Text} nodes to be
* replaced by {@code SOAPElement}, {@code SOAPHeaderElement},
* {@code SOAPBodyElement} or {@code javax.xml.soap.Text} nodes as
@@ -444,14 +444,14 @@
* @return an iterator with the content of this {@code SOAPElement}
* object
*/
- public Iterator getChildElements();
+ public Iterator
- * Calling this method may cause child {@code Element},
+ * Calling this method must cause child {@code Element},
* {@code SOAPElement} and {@code org.w3c.dom.Text} nodes to be
* replaced by {@code SOAPElement}, {@code SOAPHeaderElement},
* {@code SOAPBodyElement} or {@code javax.xml.soap.Text} nodes as
@@ -471,14 +471,14 @@
* specified name
* @see SOAPElement#getChildElements(javax.xml.namespace.QName)
*/
- public Iterator getChildElements(Name name);
+ public Iterator
- * Calling this method may cause child {@code Element},
+ * Calling this method must cause child {@code Element},
* {@code SOAPElement} and {@code org.w3c.dom.Text} nodes to be
* replaced by {@code SOAPElement}, {@code SOAPHeaderElement},
* {@code SOAPBodyElement} or {@code javax.xml.soap.Text} nodes as
@@ -499,7 +499,7 @@
* @see SOAPElement#getChildElements(Name)
* @since 1.6, SAAJ 1.3
*/
- public Iterator getChildElements(QName qname);
+ public Iterator serviceLoader = ServiceLoader.load(spiClass);
for (P impl : serviceLoader) {
- logger.fine("ServiceProvider loading Facility used; returning object [" +
- impl.getClass().getName() + "]");
+ logger.log(Level.FINE, "ServiceProvider loading Facility used; returning object [{0}]", impl.getClass().getName());
return impl;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,8 +25,7 @@
/**
* Provides the API for creating and building SOAP messages. This package
- * is defined in the SOAP with Attachments API for JavaTM
- * (SAAJ) 1.4 specification.
+ * is defined in the SOAP with Attachments API for Java™ (SAAJ) 1.4 specification.
*
* The API in the
- * This annotation may be overriden programmatically or via
+ * This annotation may be overridden programmatically or via
* deployment descriptors, depending on the platform in use.
*
* @since 1.6, JAX-WS 2.0
@@ -47,12 +49,11 @@
@Documented
public @interface BindingType {
/**
- * A binding identifier (a URI).
- * If not specified, the default is the SOAP 1.1 / HTTP binding.
- *
- * See the {@code SOAPBinding} and {@code HTTPBinding}
+ * A binding identifier (a URI). If not specified, the default is the SOAP 1.1 / HTTP binding.
* This annotation MUST only be used in conjunction with the
- * {@link javax.jws.WebService}, {@link WebServiceProvider},
+ * {@code javax.jws.WebService}, {@link WebServiceProvider},
* and {@link WebServiceRef} annotations.
* When used with a {@code javax.jws.WebService} annotation, this
* annotation MUST only be used on the service endpoint implementation
@@ -70,6 +68,8 @@
* Corresponding
*
* 3.1.1 Addressing Assertion must be generated in the generated WSDL.
+ *
+ * @return {@code true} if endpoint supports WS-Addressing, {@code false} otherwise
*/
boolean enabled() default true;
@@ -80,6 +80,8 @@
* be present on incoming messages. A corresponding
*
* 3.1.1 Addressing Assertion must be generated in the WSDL.
+ *
+ * @return {@code true} if endpoint requires WS-Addressing, {@code false} otherwise
*/
boolean required() default false;
@@ -106,6 +108,7 @@
*
* 3.1.3 NonAnonymousResponses Assertion in the generated WSDL.
*
+ * @return supported response types
* @since 1.7, JAX-WS 2.2
*/
Responses responses() default Responses.ALL;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -63,6 +63,8 @@
public @interface MTOM {
/**
* Specifies if this feature is enabled or disabled.
+ *
+ * @return {@code true} if MTOM is supported, {@code false} otherwise
*/
boolean enabled() default true;
@@ -70,6 +72,8 @@
* Property for MTOM threshold value. When MTOM is enabled, binary data above this
* size in bytes will be XOP encoded or sent as attachment. The value of this property
* MUST always be {@literal >=} 0. Default value is 0.
+ *
+ * @return MTOM threshold in bytes
*/
int threshold() default 0;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java Thu Aug 24 16:24:44 2017 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package defines APIs specific to the SOAP binding.
+ */
+package javax.xml.ws.soap;
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html Thu Aug 24 16:24:37 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-
-
-
- This module is upgradeble.
+ *
* @uses javax.xml.soap.MessageFactory
* @uses javax.xml.soap.SAAJMetaFactory
* @uses javax.xml.soap.SOAPConnectionFactory
@@ -38,21 +40,16 @@
*/
@Deprecated(since="9", forRemoval=true)
module java.xml.ws {
- requires transitive java.activation;
- requires transitive java.xml;
- requires transitive java.xml.bind;
- requires java.xml.ws.annotation;
requires java.desktop;
requires java.logging;
requires java.management;
+ requires java.xml.ws.annotation;
requires jdk.httpserver;
requires jdk.unsupported;
- uses javax.xml.ws.spi.Provider;
- uses javax.xml.soap.MessageFactory;
- uses javax.xml.soap.SAAJMetaFactory;
- uses javax.xml.soap.SOAPConnectionFactory;
- uses javax.xml.soap.SOAPFactory;
+ requires transitive java.activation;
+ requires transitive java.xml;
+ requires transitive java.xml.bind;
exports javax.jws;
exports javax.jws.soap;
@@ -66,8 +63,6 @@
exports javax.xml.ws.spi.http;
exports javax.xml.ws.wsaddressing;
- opens javax.xml.ws.wsaddressing to java.xml.bind;
-
exports com.oracle.webservices.internal.api.databinding to
jdk.xml.ws;
exports com.sun.xml.internal.ws.addressing to
@@ -113,6 +108,13 @@
jdk.xml.ws;
exports com.sun.xml.internal.ws.wsdl.writer to
jdk.xml.ws;
+ // JAF data handlers
+ exports com.sun.xml.internal.messaging.saaj.soap to
+ java.activation;
+ exports com.sun.xml.internal.ws.encoding to
+ java.activation;
+
+ opens javax.xml.ws.wsaddressing to java.xml.bind;
// XML document content needs to be exported
opens com.sun.xml.internal.ws.runtime.config to java.xml.bind;
@@ -120,13 +122,23 @@
// com.sun.xml.internal.ws.fault.SOAPFaultBuilder uses JAXBContext.newInstance
opens com.sun.xml.internal.ws.fault to java.xml.bind;
- // classes passed to JAXBContext.newInstance for deep reflection
+ // com.sun.xml.internal.ws.addressing.WsaTubeHelperImpl uses JAXBContext.newInstance
opens com.sun.xml.internal.ws.addressing to java.xml.bind;
- // JAF data handlers
- exports com.sun.xml.internal.messaging.saaj.soap to
- java.activation;
- exports com.sun.xml.internal.ws.encoding to
- java.activation;
+ // com.sun.xml.internal.ws.addressing.v200408.WsaTubeHelperImpl uses JAXBContext.newInstance
+ opens com.sun.xml.internal.ws.addressing.v200408 to java.xml.bind;
+
+ // com.sun.xml.ws.developer.MemberSubmissionEndpointReference uses JAXBContext.newInstance
+ opens com.sun.xml.internal.ws.developer to java.xml.bind;
+
+ // com.sun.xml.ws.model.ExternalMetadataReader uses JAXBContext.newInstance
+ opens com.oracle.xmlns.internal.webservices.jaxws_databinding to java.xml.bind;
+
+
+ uses javax.xml.ws.spi.Provider;
+ uses javax.xml.soap.MessageFactory;
+ uses javax.xml.soap.SAAJMetaFactory;
+ uses javax.xml.soap.SOAPConnectionFactory;
+ uses javax.xml.soap.SOAPFactory;
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java Thu Aug 24 16:24:44 2017 +0200
@@ -94,14 +94,17 @@
/**
* Returns a hash code for this module directive based on directive type and name.
- * The hash code for a module directive is computed as
+ * Boolean
*
- * Boolean
* @since 2.2.6
*/
public boolean disableXmlSecurity;
@@ -116,7 +132,7 @@
* Check the source schemas with extra scrutiny.
* The exact meaning depends on the schema language.
*/
- public boolean strictCheck =true;
+ public boolean strictCheck = true;
/**
* If -explicit-annotation option is specified.
@@ -149,7 +165,7 @@
public int compatibilityMode = STRICT;
public boolean isExtensionMode() {
- return compatibilityMode==EXTENSION;
+ return compatibilityMode == EXTENSION;
}
private static final Logger logger = com.sun.xml.internal.bind.Util.getClassLogger();
@@ -277,30 +293,26 @@
/**
* Sets the {@link FieldRendererFactory}.
- *
+ *
*
* This method is for plugins to call to set a custom {@link FieldRendererFactory}.
*
- * @param frf
- * The {@link FieldRendererFactory} to be installed. Must not be null.
- * @param owner
- * Identifies the plugin that owns this {@link FieldRendererFactory}.
- * When two {@link Plugin}s try to call this method, this allows XJC
- * to report it as a user-friendly error message.
- *
- * @throws BadCommandLineException
- * If a conflit happens, this exception carries a user-friendly error
- * message, indicating a conflict.
+ * @param frf The {@link FieldRendererFactory} to be installed. Must not be null.
+ * @param owner Identifies the plugin that owns this {@link FieldRendererFactory}.
+ * When two {@link Plugin}s try to call this method, this allows XJC
+ * to report it as a user-friendly error message.
+ * @throws BadCommandLineException If a conflit happens, this exception carries a user-friendly error
+ * message, indicating a conflict.
*/
public void setFieldRendererFactory(FieldRendererFactory frf, Plugin owner) throws BadCommandLineException {
// since this method is for plugins, make it bit more fool-proof than usual
- if(frf==null)
+ if (frf == null)
throw new IllegalArgumentException();
- if(fieldRendererFactoryOwner!=null) {
+ if (fieldRendererFactoryOwner != null) {
throw new BadCommandLineException(
Messages.format(Messages.FIELD_RENDERER_CONFLICT,
fieldRendererFactoryOwner.getOptionName(),
- owner.getOptionName() ));
+ owner.getOptionName()));
}
this.fieldRendererFactoryOwner = owner;
this.fieldRendererFactory = frf;
@@ -318,30 +330,26 @@
/**
* Sets the {@link NameConverter}.
- *
+ *
*
* This method is for plugins to call to set a custom {@link NameConverter}.
*
- * @param nc
- * The {@link NameConverter} to be installed. Must not be null.
- * @param owner
- * Identifies the plugin that owns this {@link NameConverter}.
- * When two {@link Plugin}s try to call this method, this allows XJC
- * to report it as a user-friendly error message.
- *
- * @throws BadCommandLineException
- * If a conflit happens, this exception carries a user-friendly error
- * message, indicating a conflict.
+ * @param nc The {@link NameConverter} to be installed. Must not be null.
+ * @param owner Identifies the plugin that owns this {@link NameConverter}.
+ * When two {@link Plugin}s try to call this method, this allows XJC
+ * to report it as a user-friendly error message.
+ * @throws BadCommandLineException If a conflit happens, this exception carries a user-friendly error
+ * message, indicating a conflict.
*/
public void setNameConverter(NameConverter nc, Plugin owner) throws BadCommandLineException {
// since this method is for plugins, make it bit more fool-proof than usual
- if(nc==null)
+ if (nc == null)
throw new IllegalArgumentException();
- if(nameConverter!=null) {
+ if (nameConverter != null) {
throw new BadCommandLineException(
Messages.format(Messages.NAME_CONVERTER_CONFLICT,
nameConverterOwner.getOptionName(),
- owner.getOptionName() ));
+ owner.getOptionName()));
}
this.nameConverterOwner = owner;
this.nameConverter = nc;
@@ -349,15 +357,16 @@
/**
* Gets all the {@link Plugin}s discovered so far.
- *
+ *
*
* A plugins are enumerated when this method is called for the first time,
* by taking {@link #classpaths} into account. That means
* "-cp plugin.jar" has to come before you specify options to enable it.
+ *
* @return
*/
public Listjavax.xml.soap package allows you to do the following:
*
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -129,12 +129,16 @@
/**
* Explicit value of the WS-Addressing {@code Action} message addressing property for the {@code input}
* message of the operation.
+ *
+ * @return {@code Action} message addressing property for the {@code input} message
*/
String input() default "";
/**
* Explicit value of the WS-Addressing {@code Action} message addressing property for the {@code output}
* message of the operation.
+ *
+ * @return {@code Action} message addressing property for the {@code output} message
*/
String output() default "";
@@ -143,6 +147,8 @@
* message(s) of the operation. Each exception that is mapped to a fault and requires an explicit WS-Addressing
* {@code Action} message addressing property, needs to be specified as a value in this property
* using {@link FaultAction} annotation.
+ *
+ * @return {@code Action} message addressing property for the {@code fault} message(s)
*/
FaultAction[] fault() default { };
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -29,6 +29,7 @@
* clients that wish to receive callback notification of the completion of
* service endpoint operations invoked asynchronously.
*
+ * @param
+ * See the {@link SOAPBinding} and {@link HTTPBinding}
* for the definition of the standard binding identifiers.
*
+ * @return A binding identifier (a URI)
* @see javax.xml.ws.Binding
* @see javax.xml.ws.soap.SOAPBinding#SOAP11HTTP_BINDING
* @see javax.xml.ws.soap.SOAPBinding#SOAP12HTTP_BINDING
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java Thu Aug 24 16:24:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,12 +27,14 @@
import java.util.concurrent.Future;
+
/** The {@code Dispatch} interface provides support
* for the dynamic invocation of a service endpoint operations. The
* {@code javax.xml.ws.Service}
* class acts as a factory for the creation of {@code Dispatch}
* instances.
*
+ * @param
using {@code int} arithmetic.
+ * The hash code for a module directive is computed as
+ *
- * 97 * Integer.hashCode(type_ordinal_value + 1) + name.hashCode()
- *
+ * using {@code int} arithmetic.
+ *
* @return a hash code value for this object.
*/
@Override
public int hashCode() {
- return 97 * (Integer.valueOf(getType().ordinal() + 1)).hashCode() + name.hashCode();
+ return 97 * (getType().ordinal() + 1) + name.hashCode();
}
/**
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties Thu Aug 24 16:24:44 2017 +0200
@@ -30,10 +30,10 @@
Non-existent directory: {0}
VERSION = \
- schemagen 2.3.0-b170215.1712
+ schemagen 2.3.0-b170531.0717
FULLVERSION = \
- schemagen full version "2.3.0-b170215.1712"
+ schemagen full version "2.3.0-b170531.0717"
USAGE = \
Usage: schemagen [-options ...]
+ * {@code 97 * (type_ordinal_value + 1) + name.hashCode()}
+ *
+freebxml: Copyright (c) 2001 freebxml.org. All rights reserved.
+
+The names "The freebXML Registry Project" and "freebxml Software Foundation" must not be
+used to endorse or promote products derived from this software or be used in a product
+name without prior written permission. For written permission,
+please contact ebxmlrr-team@lists.sourceforge.net.
+
+This software consists of voluntary contributions made by many individuals on behalf of
+the the freebxml Software Foundation. For more information on the freebxml Software
+Foundation, please see
\ No newline at end of file
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java Thu Aug 24 16:24:44 2017 +0200
@@ -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
@@ -27,9 +27,6 @@
import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
/**
* ProcessorException represents an exception that occurred while processing
* a web service.
@@ -55,9 +52,4 @@
public String getDefaultResourceBundleName() {
return "com.sun.tools.internal.ws.resources.processor";
}
-
- @Override
- public ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(getDefaultResourceBundleName(), locale);
- }
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,39 +25,45 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class ConfigurationMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.configuration";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ConfigurationMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ConfigurationMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableCONFIGURATION_NOT_BINDING_FILE(Object arg0) {
- return messageFactory.getMessage("configuration.notBindingFile", arg0);
+ return MESSAGE_FACTORY.getMessage("configuration.notBindingFile", arg0);
}
-
/**
* Ignoring: binding file "{0}". It is not a jaxws or a jaxb binding file.
*
*/
public static String CONFIGURATION_NOT_BINDING_FILE(Object arg0) {
- return localizer.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
+ return LOCALIZER.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,42 +25,74 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class GeneratorMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.generator";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, GeneratorMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new GeneratorMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ public static Localizable localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("generator.indentingwriter.charset.cantencode", arg0);
}
- public static Localizable localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
- return messageFactory.getMessage("generator.service.classAlreadyExist", arg0, arg1);
+ /**
+ * WSDL has some characters which native java encoder can''t encode: "{0}"
+ *
+ */
+ public static String GENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
+ return LOCALIZER.localize(localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(arg0));
+ }
+
+ public static Localizable localizableGENERATOR_CANNOT_CREATE_DIR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("generator.cannot.create.dir", arg0);
}
/**
- * Could not generate Service, class: {0} already exists. Rename wsdl:Service "{1}" using JAX-WS customization
+ * can''t create directory: {0}
+ *
+ */
+ public static String GENERATOR_CANNOT_CREATE_DIR(Object arg0) {
+ return LOCALIZER.localize(localizableGENERATOR_CANNOT_CREATE_DIR(arg0));
+ }
+
+ public static Localizable localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("generator.internal.error.should.not.happen", arg0);
+ }
+
+ /**
+ * internal error (should not happen): {0}
*
*/
- public static String GENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
- return localizer.localize(localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(arg0, arg1));
+ public static String GENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
+ return LOCALIZER.localize(localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(arg0));
+ }
+
+ public static Localizable localizableGENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("generator.nestedGeneratorError", arg0);
+ }
+
+ /**
+ * generator error: {0}
+ *
+ */
+ public static String GENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableGENERATOR_NESTED_GENERATOR_ERROR(arg0));
}
public static Localizable localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
- return messageFactory.getMessage("generator.sei.classAlreadyExist", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("generator.sei.classAlreadyExist", arg0, arg1);
}
/**
@@ -68,55 +100,30 @@
*
*/
public static String GENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
- return localizer.localize(localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(arg0, arg1));
- }
-
- public static Localizable localizableGENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
- return messageFactory.getMessage("generator.nestedGeneratorError", arg0);
+ return LOCALIZER.localize(localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(arg0, arg1));
}
- /**
- * generator error: {0}
- *
- */
- public static String GENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
- return localizer.localize(localizableGENERATOR_NESTED_GENERATOR_ERROR(arg0));
- }
-
- public static Localizable localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
- return messageFactory.getMessage("generator.internal.error.should.not.happen", arg0);
+ public static Localizable localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("generator.service.classAlreadyExist", arg0, arg1);
}
/**
- * internal error (should not happen): {0}
- *
- */
- public static String GENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
- return localizer.localize(localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(arg0));
- }
-
- public static Localizable localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
- return messageFactory.getMessage("generator.indentingwriter.charset.cantencode", arg0);
- }
-
- /**
- * WSDL has some characters which native java encoder can''t encode: "{0}"
+ * Could not generate Service, class: {0} already exists. Rename wsdl:Service "{1}" using JAX-WS customization
*
*/
- public static String GENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
- return localizer.localize(localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(arg0));
+ public static String GENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(arg0, arg1));
}
- public static Localizable localizableGENERATOR_CANNOT_CREATE_DIR(Object arg0) {
- return messageFactory.getMessage("generator.cannot.create.dir", arg0);
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- /**
- * can''t create directory: {0}
- *
- */
- public static String GENERATOR_CANNOT_CREATE_DIR(Object arg0) {
- return localizer.localize(localizableGENERATOR_CANNOT_CREATE_DIR(arg0));
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,26 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class JavacompilerMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.javacompiler";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, JavacompilerMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new JavacompilerMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
public static Localizable localizableNO_JAVACOMPILER_ERROR() {
- return messageFactory.getMessage("no.javacompiler.error");
+ return MESSAGE_FACTORY.getMessage("no.javacompiler.error");
}
/**
@@ -56,7 +52,18 @@
*
*/
public static String NO_JAVACOMPILER_ERROR() {
- return localizer.localize(localizableNO_JAVACOMPILER_ERROR());
+ return LOCALIZER.localize(localizableNO_JAVACOMPILER_ERROR());
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,122 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class ModelMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.model";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ModelMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ModelMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("model.importer.invalidMinorMinorOrPatchVersion", arg0, arg1, arg2);
+ }
+
+ /**
+ * model version "{1}" newer than runtime version "{2}" (line {0}): need to upgrade to a newer runtime
+ *
+ */
+ public static String MODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("model.schema.unsupportedType", arg0, arg1, arg2);
+ }
+
+ /**
+ * unsupported type ({0}): "{1}" (namespace: {2})
+ *
+ */
+ public static String MODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableMODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.importer.invalidClass", arg0, arg1);
+ }
+
+ /**
+ * invalid class name "{1}" in model document (line {0})
+ *
+ */
+ public static String MODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_CLASS(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES() {
+ return MESSAGE_FACTORY.getMessage("model.arraywrapper.no.subtypes");
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ /**
+ * LiteralArrayWrapper cannot have subtypes
+ *
+ */
+ public static String MODEL_ARRAYWRAPPER_NO_SUBTYPES() {
+ return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES());
+ }
+
+ public static Localizable localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.uniqueness.javastructuretype", arg0, arg1);
+ }
+
+ /**
+ * uniqueness constraint violation, duplicate member "{0}" added to JavaStructureType "{1}"
+ *
+ */
+ public static String MODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.schema.invalidSimpleType.invalidItemType", arg0, arg1);
+ }
+
+ /**
+ * in simpleType: "{0}", itemType "{1}" can not be derived by list
+ *
+ */
+ public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.importer.invalidVersion", arg0, arg1);
+ }
+
+ /**
+ * invalid version "{1}" in model document (line {0})
+ *
+ */
+ public static String MODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_VERSION(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.exporter.unsupportedClass", arg0);
+ }
+
+ /**
+ * model exporter: unsupported class: {0}
+ *
+ */
+ public static String MODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(arg0));
}
public static Localizable localizableMODEL_NESTED_MODEL_ERROR(Object arg0) {
- return messageFactory.getMessage("model.nestedModelError", arg0);
+ return MESSAGE_FACTORY.getMessage("model.nestedModelError", arg0);
}
/**
@@ -56,11 +148,11 @@
*
*/
public static String MODEL_NESTED_MODEL_ERROR(Object arg0) {
- return localizer.localize(localizableMODEL_NESTED_MODEL_ERROR(arg0));
+ return LOCALIZER.localize(localizableMODEL_NESTED_MODEL_ERROR(arg0));
}
public static Localizable localizableMODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.exception.notunique", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("model.exception.notunique", arg0, arg1);
}
/**
@@ -68,143 +160,23 @@
*
*/
public static String MODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_EXCEPTION_NOTUNIQUE(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
- return messageFactory.getMessage("model.schema.invalidWildcard.allCompositor", arg0);
- }
-
- /**
- * xsd:all compositor not supported for the wildcard in schema type: "{0}"
- *
- */
- public static String MODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(arg0));
- }
-
- public static Localizable localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
- return messageFactory.getMessage("model.schema.simpleTypeWithFacets", arg0);
- }
-
- /**
- * facet "{0}" not supported on simple type: "{0}"
- *
- */
- public static String MODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(arg0));
- }
-
- public static Localizable localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
- return messageFactory.getMessage("model.schema.unionNotSupported", arg0);
+ return LOCALIZER.localize(localizableMODEL_EXCEPTION_NOTUNIQUE(arg0, arg1));
}
- /**
- * simpleType: "{0}" derivation by xsd:union not supported
- *
- */
- public static String MODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(arg0));
- }
-
- public static Localizable localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
- return messageFactory.getMessage("model.complexType.simpleContent.reservedName", arg0);
- }
-
- /**
- * invalid attribute name: "_value" in complexType: "{0}", _value is JAXWS reserved name, this name is generated in the generated javabean class to hold content value in the generated javabean class for complexType/simpleContent.
- *
- */
- public static String MODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
- return localizer.localize(localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(arg0));
- }
-
- public static Localizable localizableMODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.importer.invalidId", arg0, arg1);
- }
-
- /**
- * invalid id "{1} in model document (line {0})
- *
- */
- public static String MODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_IMPORTER_INVALID_ID(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
- return messageFactory.getMessage("model.schema.jaxbException.message", arg0);
+ public static Localizable localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
+ return MESSAGE_FACTORY.getMessage("model.arraywrapper.only.one.member");
}
/**
- * "{0}"
- *
- */
- public static String MODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(arg0));
- }
-
- public static Localizable localizableMODEL_INVALID_MESSAGE_TYPE(Object arg0) {
- return messageFactory.getMessage("model.invalid.message.type", arg0);
- }
-
- /**
- * invalid message type: {0}
- *
- */
- public static String MODEL_INVALID_MESSAGE_TYPE(Object arg0) {
- return localizer.localize(localizableMODEL_INVALID_MESSAGE_TYPE(arg0));
- }
-
- public static Localizable localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
- return messageFactory.getMessage("ConsoleErrorReporter.UnknownLocation");
- }
-
- /**
- * unknown location
+ * LiteralArrayWrapper may only have one element member.
*
*/
- public static String CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
- return localizer.localize(localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION());
- }
-
- public static Localizable localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
- return messageFactory.getMessage("model.exporter.unsupportedClass", arg0);
- }
-
- /**
- * model exporter: unsupported class: {0}
- *
- */
- public static String MODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
- return localizer.localize(localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(arg0));
- }
-
- public static Localizable localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("model.schema.elementNotFound", arg0);
- }
-
- /**
- * Element "{0}" not found.
- *
- */
- public static String MODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.uniqueness.javastructuretype", arg0, arg1);
- }
-
- /**
- * uniqueness constraint violation, duplicate member "{0}" added to JavaStructureType "{1}"
- *
- */
- public static String MODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(arg0, arg1));
+ public static String MODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
+ return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER());
}
public static Localizable localizableMODEL_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.saxparser.exception", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("model.saxparser.exception", arg0, arg1);
}
/**
@@ -213,217 +185,23 @@
*
*/
public static String MODEL_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_SAXPARSER_EXCEPTION(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("model.schema.unsupportedType", arg0, arg1, arg2);
- }
-
- /**
- * unsupported type ({0}): "{1}" (namespace: {2})
- *
- */
- public static String MODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
- return messageFactory.getMessage("model.schema.listNotSupported", arg0);
- }
-
- /**
- * simpleType: "{0}" derivation by xsd:list not supported
- *
- */
- public static String MODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(arg0));
- }
-
- public static Localizable localizableMODEL_ARRAYWRAPPER_NO_PARENT() {
- return messageFactory.getMessage("model.arraywrapper.no.parent");
- }
-
- /**
- * LiteralArrayWrapper cannot have a parent type
- *
- */
- public static String MODEL_ARRAYWRAPPER_NO_PARENT() {
- return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_PARENT());
- }
-
- public static Localizable localizableMODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("model.parent.type.already.set", arg0, arg1, arg2);
- }
-
- /**
- * parent of type "{0}" already set to "{1}", new value = "{2}"
- *
- */
- public static String MODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableMODEL_PARENT_TYPE_ALREADY_SET(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableMODEL_SAXPARSER_EXCEPTION(arg0, arg1));
}
- public static Localizable localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES() {
- return messageFactory.getMessage("model.arraywrapper.no.subtypes");
- }
-
- /**
- * LiteralArrayWrapper cannot have subtypes
- *
- */
- public static String MODEL_ARRAYWRAPPER_NO_SUBTYPES() {
- return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES());
- }
-
- public static Localizable localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("model.importer.invalidMinorMinorOrPatchVersion", arg0, arg1, arg2);
- }
-
- /**
- * model version "{1}" newer than runtime version "{2}" (line {0}): need to upgrade to a newer runtime
- *
- */
- public static String MODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(arg0, arg1, arg2));
- }
-
- public static Localizable localizableMODEL_SCHEMA_CIRCULARITY(Object arg0) {
- return messageFactory.getMessage("model.schema.circularity", arg0);
- }
-
- /**
- * circularity detected in schema: "{0}"
- *
- */
- public static String MODEL_SCHEMA_CIRCULARITY(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_CIRCULARITY(arg0));
- }
-
- public static Localizable localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
- return messageFactory.getMessage("model.arraywrapper.member.already.set");
- }
-
- /**
- * LiteralArrayWrapper element member already set.
- *
- */
- public static String MODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
- return localizer.localize(localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET());
- }
-
- public static Localizable localizableMODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.importer.invalidClass", arg0, arg1);
+ public static Localizable localizableMODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.importer.invalidId", arg0, arg1);
}
/**
- * invalid class name "{1}" in model document (line {0})
- *
- */
- public static String MODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_IMPORTER_INVALID_CLASS(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.importer.invalidVersion", arg0, arg1);
- }
-
- /**
- * invalid version "{1}" in model document (line {0})
- *
- */
- public static String MODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_IMPORTER_INVALID_VERSION(arg0, arg1));
- }
-
- public static Localizable localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
- return messageFactory.getMessage("ConsoleErrorReporter.LineXOfY", arg0, arg1);
- }
-
- /**
- * line {0} of {1}
- *
- */
- public static String CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
- return localizer.localize(localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.parameter.notunique", arg0, arg1);
- }
-
- /**
- * Failed to generate Java signature: duplicate parameter name "{0}". Try one of these
- * 1. Use JAXWS binding customization to rename the wsdl:part "{1}"
- * 2. Run wsimport with -extension switch.
+ * invalid id "{1} in model document (line {0})
*
*/
- public static String MODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_PARAMETER_NOTUNIQUE(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.schema.invalidSimpleType.invalidItemType", arg0, arg1);
- }
-
- /**
- * in simpleType: "{0}", itemType "{1}" can not be derived by list
- *
- */
- public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_UNIQUENESS() {
- return messageFactory.getMessage("model.uniqueness");
- }
-
- /**
- * uniqueness constraint violation
- *
- */
- public static String MODEL_UNIQUENESS() {
- return localizer.localize(localizableMODEL_UNIQUENESS());
- }
-
- public static Localizable localizable_002F_002F_REPLACEMENT() {
- return messageFactory.getMessage("//replacement");
- }
-
- /**
- * for Uxxx codes
- *
- */
- public static String _002F_002F_REPLACEMENT() {
- return localizer.localize(localizable_002F_002F_REPLACEMENT());
- }
-
- public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.schema.invalidSimpleType.noItemLiteralType", arg0, arg1);
- }
-
- /**
- * in simpleType: "{0}", xsd:list itemType "{1}" is invalid
- *
- */
- public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(arg0, arg1));
- }
-
- public static Localizable localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
- return messageFactory.getMessage("model.arraywrapper.only.one.member");
- }
-
- /**
- * LiteralArrayWrapper may only have one element member.
- *
- */
- public static String MODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
- return localizer.localize(localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER());
+ public static String MODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_ID(arg0, arg1));
}
public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.parameter.notunique.wrapper", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("model.parameter.notunique.wrapper", arg0, arg1);
}
/**
@@ -434,23 +212,47 @@
*
*/
public static String MODEL_PARAMETER_NOTUNIQUE_WRAPPER(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(arg0, arg1));
+ return LOCALIZER.localize(localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.elementNotFound", arg0);
}
- public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
- return messageFactory.getMessage("model.schema.notImplemented", arg0);
+ /**
+ * Element "{0}" not found.
+ *
+ */
+ public static String MODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(arg0));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.unionNotSupported", arg0);
}
/**
- * unsupported XML Schema feature ({0})
+ * simpleType: "{0}" derivation by xsd:union not supported
*
*/
- public static String MODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_NOT_IMPLEMENTED(arg0));
+ public static String MODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(arg0));
+ }
+
+ public static Localizable localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
+ return MESSAGE_FACTORY.getMessage("ConsoleErrorReporter.UnknownLocation");
+ }
+
+ /**
+ * unknown location
+ *
+ */
+ public static String CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
+ return LOCALIZER.localize(localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION());
}
public static Localizable localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(Object arg0) {
- return messageFactory.getMessage("model.schema.invalidLiteralInEnumeration.anonymous", arg0);
+ return MESSAGE_FACTORY.getMessage("model.schema.invalidLiteralInEnumeration.anonymous", arg0);
}
/**
@@ -458,11 +260,95 @@
*
*/
public static String MODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(Object arg0) {
- return localizer.localize(localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(arg0));
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(arg0));
+ }
+
+ public static Localizable localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
+ return MESSAGE_FACTORY.getMessage("model.arraywrapper.no.content.member");
+ }
+
+ /**
+ * LiteralArrayWrapper cannot have a content member
+ *
+ */
+ public static String MODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
+ return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER());
+ }
+
+ public static Localizable localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
+ return MESSAGE_FACTORY.getMessage("model.arraywrapper.member.already.set");
+ }
+
+ /**
+ * LiteralArrayWrapper element member already set.
+ *
+ */
+ public static String MODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
+ return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET());
+ }
+
+ public static Localizable localizableMODEL_INVALID_MESSAGE_TYPE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.invalid.message.type", arg0);
+ }
+
+ /**
+ * invalid message type: {0}
+ *
+ */
+ public static String MODEL_INVALID_MESSAGE_TYPE(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_INVALID_MESSAGE_TYPE(arg0));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_CIRCULARITY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.circularity", arg0);
+ }
+
+ /**
+ * circularity detected in schema: "{0}"
+ *
+ */
+ public static String MODEL_SCHEMA_CIRCULARITY(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_CIRCULARITY(arg0));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.schema.invalidSimpleType.noItemLiteralType", arg0, arg1);
+ }
+
+ /**
+ * in simpleType: "{0}", xsd:list itemType "{1}" is invalid
+ *
+ */
+ public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.listNotSupported", arg0);
+ }
+
+ /**
+ * simpleType: "{0}" derivation by xsd:list not supported
+ *
+ */
+ public static String MODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(arg0));
+ }
+
+ public static Localizable localizable_002F_002F_REPLACEMENT() {
+ return MESSAGE_FACTORY.getMessage("//replacement");
+ }
+
+ /**
+ * for Uxxx codes
+ *
+ */
+ public static String _002F_002F_REPLACEMENT() {
+ return LOCALIZER.localize(localizable_002F_002F_REPLACEMENT());
}
public static Localizable localizableMODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("model.part.notUnique", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("model.part.notUnique", arg0, arg1);
}
/**
@@ -470,19 +356,140 @@
*
*/
public static String MODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
- return localizer.localize(localizableMODEL_PART_NOT_UNIQUE(arg0, arg1));
+ return LOCALIZER.localize(localizableMODEL_PART_NOT_UNIQUE(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_ARRAYWRAPPER_NO_PARENT() {
+ return MESSAGE_FACTORY.getMessage("model.arraywrapper.no.parent");
+ }
+
+ /**
+ * LiteralArrayWrapper cannot have a parent type
+ *
+ */
+ public static String MODEL_ARRAYWRAPPER_NO_PARENT() {
+ return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_NO_PARENT());
+ }
+
+ public static Localizable localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.complexType.simpleContent.reservedName", arg0);
+ }
+
+ /**
+ * invalid attribute name: "_value" in complexType: "{0}", _value is JAXWS reserved name, this name is generated in the generated javabean class to hold content value in the generated javabean class for complexType/simpleContent.
+ *
+ */
+ public static String MODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(arg0));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.simpleTypeWithFacets", arg0);
}
- public static Localizable localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
- return messageFactory.getMessage("model.arraywrapper.no.content.member");
+ /**
+ * facet "{0}" not supported on simple type: "{0}"
+ *
+ */
+ public static String MODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(arg0));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.notImplemented", arg0);
+ }
+
+ /**
+ * unsupported XML Schema feature ({0})
+ *
+ */
+ public static String MODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_NOT_IMPLEMENTED(arg0));
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.jaxbException.message", arg0);
+ }
+
+ /**
+ * "{0}"
+ *
+ */
+ public static String MODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(arg0));
+ }
+
+ public static Localizable localizableMODEL_UNIQUENESS() {
+ return MESSAGE_FACTORY.getMessage("model.uniqueness");
}
/**
- * LiteralArrayWrapper cannot have a content member
+ * uniqueness constraint violation
+ *
+ */
+ public static String MODEL_UNIQUENESS() {
+ return LOCALIZER.localize(localizableMODEL_UNIQUENESS());
+ }
+
+ public static Localizable localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("model.schema.invalidWildcard.allCompositor", arg0);
+ }
+
+ /**
+ * xsd:all compositor not supported for the wildcard in schema type: "{0}"
+ *
+ */
+ public static String MODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
+ return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(arg0));
+ }
+
+ public static Localizable localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("ConsoleErrorReporter.LineXOfY", arg0, arg1);
+ }
+
+ /**
+ * line {0} of {1}
*
*/
- public static String MODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
- return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER());
+ public static String CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(arg0, arg1));
+ }
+
+ public static Localizable localizableMODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("model.parent.type.already.set", arg0, arg1, arg2);
+ }
+
+ /**
+ * parent of type "{0}" already set to "{1}", new value = "{2}"
+ *
+ */
+ public static String MODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableMODEL_PARENT_TYPE_ALREADY_SET(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("model.parameter.notunique", arg0, arg1);
+ }
+
+ /**
+ * Failed to generate Java signature: duplicate parameter name "{0}". Try one of these
+ * 1. Use JAXWS binding customization to rename the wsdl:part "{1}"
+ * 2. Run wsimport with -extension switch.
+ *
+ */
+ public static String MODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMODEL_PARAMETER_NOTUNIQUE(arg0, arg1));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,138 +25,158 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class ModelerMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.modeler";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ModelerMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ModelerMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.notLiteral", arg0, arg1);
}
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.invalidSchemaType", arg0, arg1);
+ /**
+ * ignoring encoded fault "{0}" of binding operation "{1}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.multiplePartBinding", arg0, arg1);
+ }
+
+ /**
+ * abstract operation "{0}" binding, part "{1}" has multiple binding.
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notLiteral", arg0, arg1, arg2);
}
/**
- * Ignoring the mime:part. mime part: {0} can not be mapped to schema type: {1}
+ * ignoring header fault part="{0}" message="{1}" of operation {2}, use attribute must be "literal"
*
*/
- public static String MIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(arg0, arg1));
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(arg0, arg1, arg2));
}
- public static Localizable localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.parameterorder.parameter", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.notLiteral", arg0, arg1);
}
/**
- * "{0}" specified in the parameterOrder attribute of operation "{1}" is not a valid part of the message.
+ * Invalid header "{0}" of binding operation "{1}": not literal
*
*/
- public static String WSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(arg0, arg1));
+ public static String WSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.noSoapFaultName", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notSupportedStyle", arg0);
}
/**
- * soap:fault name not specified, wsdl:fault "{0}" in operation "{1}"
+ * ignoring operation "{0}": not request-response or one-way
*
*/
- public static String WSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(arg0, arg1));
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(arg0));
}
- public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
- return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.import");
+ public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameterOrder.tooManyUnmentionedParts", arg0);
}
/**
- * Non conforming WS-I WSDL used for wsdl:import
+ * more than one part left out in the parameterOrder attribute of operation "{0}"
*
*/
- public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
- return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT());
+ public static String WSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(arg0));
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputSoapBody.missingNamespace", arg0);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
}
/**
- * output message of binding operation "{0}" must specify a value for the "namespace" attribute
+ * Ignoring operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
*
*/
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.fault.notLiteral", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.notSupportedStyle", arg0, arg1);
}
/**
- * ignoring encoded fault "{0}" in literal binding operation "{1}"
+ * Invalid WSDL, wsdl:operation "{0}" in wsdl:portType "{1}": not request-response or one-way
*
*/
- public static String WSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(arg0, arg1));
+ public static String WSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody", arg0);
+ public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonconforming.wsdl.types");
}
/**
- * input message of binding operation "{0}" does not have a SOAP body extension
+ * Non conforming WS-I WSDL used for wsdl:types
*
*/
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(arg0));
+ public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES());
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport", arg0);
+ public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.notFound", arg0, arg1);
}
/**
- * ignoring SOAP port "{0}": unrecognized transport. try running wsimport with -extension switch.
+ * header "{0}" of binding operation "{1}": not found
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(arg0));
+ public static String WSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.notFound", arg0, arg1);
+ public static Localizable localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart", arg0);
}
/**
- * in binding "{1}", operation "{0}" does not match any operation in the corresponding port type
+ * Headers not in root mime:part with soap:body, ignoring headers in operation "{0}"
*
*/
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(arg0, arg1));
+ public static String MIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
+ return LOCALIZER.localize(localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(arg0));
}
public static Localizable localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME() {
- return messageFactory.getMessage("wsdlmodeler.unsupportedBinding.mime");
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.unsupportedBinding.mime");
}
/**
@@ -164,119 +184,35 @@
*
*/
public static String WSDLMODELER_UNSUPPORTED_BINDING_MIME() {
- return localizer.localize(localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME());
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.noElementAttribute", arg0, arg1, arg2);
- }
-
- /**
- * ignoring header fault part="{0}" message="{1}" of operation {2}
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
- }
-
- /**
- * Invalid operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME());
}
- public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.headerfault.notLiteral", arg0, arg1);
- }
-
- /**
- * Invalid headerfault "{0}" of binding operation "{1}": not literal
- *
- */
- public static String WSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(arg0, arg1));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.differentPart");
- }
-
- /**
- * Ignoring the mime:part. Invalid mime:part, the mime:content has different part attribute.
- *
- */
- public static String MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
- }
-
- public static Localizable localizableWSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.error.partNotFound", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.nonUnique.body.error", arg0, arg1, arg2, arg3);
}
/**
- * part "{1}" of operation "{0}" could not be resolved!
+ * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Try running wsimport with -extension switch, runtime will try to dispatch using SOAPAction
*
*/
- public static String WSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_ERROR_PART_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.header.message.partMustHaveElementDescriptor", arg0, arg1);
+ public static String WSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
+ return LOCALIZER.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(arg0, arg1, arg2, arg3));
}
- /**
- * Invalid header "{0}" in operation {1}: part must specify a "element" attribute
- *
- */
- public static String WSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName", arg0);
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.missingNamespace", arg0, arg1);
}
/**
- * Invalid operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.outputMissingSoapFault", arg0, arg1);
- }
-
- /**
- * fault "{0}" in operation "{1}" does not have a SOAP fault extension
+ * fault "{0}" in operation "{1}" must specify a value for the "namespace" attribute
*
*/
- public static String WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleElementMessagePart", arg0);
- }
-
- /**
- * ignoring operation "{0}": message part does not refer to a schema type declaration
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(arg0));
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(arg0, arg1));
}
public static Localizable localizableWSDLMODLER_WARNING_OPERATION_USE() {
- return messageFactory.getMessage("wsdlmodler.warning.operation.use");
+ return MESSAGE_FACTORY.getMessage("wsdlmodler.warning.operation.use");
}
/**
@@ -284,479 +220,11 @@
*
*/
public static String WSDLMODLER_WARNING_OPERATION_USE() {
- return localizer.localize(localizableWSDLMODLER_WARNING_OPERATION_USE());
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort", arg0);
- }
-
- /**
- * ignoring port "{0}": not a standard SOAP port. try running wsimport with -extension switch.
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.messageHasMoreThanOnePart", arg0, arg1);
- }
-
- /**
- * fault "{0}" refers to message "{1}", but the message has more than one parts
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
- return messageFactory.getMessage("wsdlmodeler.warning.noServiceDefinitionsFound");
- }
-
- /**
- * WSDL document does not define any services
- *
- */
- public static String WSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
- return localizer.localize(localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND());
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.cant.resolve.message", arg0, arg1);
- }
-
- /**
- * ignoring fault "{0}" of binding operation "{1}": cannot resolve message
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.jaxb.javatype.notfound", arg0, arg1);
- }
-
- /**
- * Schema descriptor {0} in message part "{1}" is not defined and could not be bound to Java. Perhaps the schema descriptor {0} is not defined in the schema imported/included in the WSDL. You can either add such imports/includes or run wsimport and provide the schema location using -b switch.
- *
- */
- public static String WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.port.SOAPBinding.mixedStyle", arg0);
- }
-
- /**
- * not a WS-I BP1.1 compliant SOAP port "{0}": the WSDL binding has mixed style, it must be rpc-literal or document-literal operation!
- *
- */
- public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.doclitoperation", arg0);
- }
-
- /**
- * Invalid wsdl:operation "{0}": its a document-literal operation, message part must refer to a schema element declaration
- *
- */
- public static String WSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_DOCLITOPERATION(arg0));
- }
-
- public static Localizable localizableMODELER_NESTED_MODEL_ERROR(Object arg0) {
- return messageFactory.getMessage("modeler.nestedModelError", arg0);
- }
-
- /**
- * modeler error: {0}
- *
- */
- public static String MODELER_NESTED_MODEL_ERROR(Object arg0) {
- return localizer.localize(localizableMODELER_NESTED_MODEL_ERROR(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.duplicate.fault.soap.name", arg0, arg1, arg2);
- }
-
- /**
- * ignoring fault "{0}" of operation "{1}", soap:fault name "{2}" is not unique
- *
- */
- public static String WSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.wrongSoapFaultName", arg0, arg1, arg2);
- }
-
- /**
- * name of soap:fault "{0}" doesn''t match the name of wsdl:fault "{1}" in operation "{2}"
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notLiteral", arg0);
- }
-
- /**
- * ignoring document-style operation "{0}": parameters are not literal
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleDocumentStyle", arg0);
- }
-
- /**
- * ignoring operation "{0}": cannot handle document-style operations
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.notLiteral", arg0, arg1);
- }
-
- /**
- * ignoring encoded fault "{0}" of binding operation "{1}"
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.rpclitoperation", arg0);
- }
-
- /**
- * Invalid wsdl:operation "{0}": its a rpc-literal operation, message part must refer to a schema type declaration
- *
- */
- public static String WSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_RPCLITOPERATION(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName", arg0, arg1);
- }
-
- /**
- * Invalid operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.memberSubmissionAddressingUsed", arg0, arg1);
- }
-
- /**
- * obsolete addressing version 08-2004:"{0}" used; version "{1}" should be used instead.
- *
- */
- public static String WSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.bindingOperation.multiplePartBinding", arg0, arg1);
- }
-
- /**
- * Check the abstract operation "{0}" binding, part "{1}" has multiple binding. Will try to generated artifacts anyway...
- *
- */
- public static String WSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.port.SOAPBinding12", arg0);
- }
-
- /**
- * SOAP port "{0}": uses a non-standard SOAP 1.2 binding.
- *
- */
- public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.portTypeFault.notFound", arg0, arg1);
- }
-
- /**
- * fault "{0}" in portType operation "{1}" does not match any fault in the corresponding binding operation
- *
- */
- public static String WSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
- return messageFactory.getMessage("mimemodeler.invalidMimePart.nameNotAllowed", arg0);
- }
-
- /**
- * name attribute on wsdl:part in Operation "{0}" is ignored. Its not allowed as per WS-I AP 1.0.
- *
- */
- public static String MIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringMimePart.notFound", arg0, arg1);
- }
-
- /**
- * ignoring mime:part, cannot find part "{0}" referenced by the mime:content in the wsdl:operation "{1}"
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.operation.MoreThanOnePartInMessage", arg0);
- }
-
- /**
- * Ignoring operation "{0}": more than one part bound to body
- *
- */
- public static String WSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
- }
-
- /**
- * Ignoring operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.fault.cant.resolve.message", arg0, arg1);
- }
-
- /**
- * fault message "{0}" in binding operation "{1}" could not be resolved
- *
- */
- public static String WSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.emptyMessage", arg0, arg1);
- }
-
- /**
- * fault "{0}" refers to message "{1}", but the message has no parts
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.rpclit.unkownschematype", arg0, arg1, arg2);
- }
-
- /**
- * XML type "{0}" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part "{1}" in the wsdl:message "{2}".
- *
- */
- public static String WSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleBodyPartsAttribute", arg0);
- }
-
- /**
- * ignoring operation "{0}": cannot handle "parts" attribute of "soap:body" element
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("wsdlmodeler.nonUnique.body.error", arg0, arg1, arg2, arg3);
- }
-
- /**
- * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Try running wsimport with -extension switch, runtime will try to dispatch using SOAPAction
- *
- */
- public static String WSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(arg0, arg1, arg2, arg3));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle", arg0);
- }
-
- /**
- * ignoring port "{0}", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation. try running wsimport with -extension switch.
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(arg0));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.missingTypeAttribute", arg0);
- }
-
- /**
- * Missing type attribute in mime:content in operation "{0}". part attribute must be present in mime:content declaration.
- *
- */
- public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyInputMessage", arg0);
- }
-
- /**
- * ignoring operation "{0}": input message is empty
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.noPortsInService", arg0);
- }
-
- /**
- * Service "{0}" does not contain any usable ports. try running wsimport with -extension switch.
- *
- */
- public static String WSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.parameterOrder.tooManyUnmentionedParts", arg0);
- }
-
- /**
- * more than one part left out in the parameterOrder attribute of operation "{0}"
- *
- */
- public static String WSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputSoapBody.missingNamespace", arg0);
- }
-
- /**
- * input message of binding operation "{0}" must specify a value for the "namespace" attribute
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader", arg0, arg1);
- }
-
- /**
- * ignoring header "{0}" of binding operation "{1}"
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.responsebean.notfound", arg0);
- }
-
- /**
- * wsimport failed to generate async response bean for operation: {0}
- *
- */
- public static String WSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
- return messageFactory.getMessage("wsdlmodeler20.rpcenc.not.supported");
- }
-
- /**
- * rpc/encoded wsdl's are not supported in JAXWS 2.0.
- *
- */
- public static String WSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
- return localizer.localize(localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED());
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.partNotFound", arg0, arg1);
- }
-
- /**
- * ignoring operation "{0}": part "{1}" not found
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.message.partMustHaveElementDescriptor", arg0, arg1);
- }
-
- /**
- * in message "{0}", part "{1}" must specify a "element" attribute
- *
- */
- public static String WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+ return LOCALIZER.localize(localizableWSDLMODLER_WARNING_OPERATION_USE());
}
public static Localizable localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.error.partsNotFound", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.error.partsNotFound", arg0, arg1);
}
/**
@@ -764,107 +232,131 @@
*
*/
public static String WSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(arg0, arg1));
+ return LOCALIZER.localize(localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.notEncoded", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.jaxb.javatype.notfound", arg0, arg1);
}
/**
- * ignoring literal fault "{0}" of binding operation "{1}"
+ * Schema descriptor {0} in message part "{1}" is not defined and could not be bound to Java. Perhaps the schema descriptor {0} is not defined in the schema imported/included in the WSDL. You can either add such imports/includes or run wsimport and provide the schema location using -b switch.
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(arg0, arg1));
+ public static String WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notSupportedStyle", arg0);
+ public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.headerfault.notLiteral", arg0, arg1);
}
/**
- * ignoring operation "{0}": not request-response or one-way
+ * Invalid headerfault "{0}" of binding operation "{1}": not literal
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(arg0));
+ public static String WSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.multiplePartBinding", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler20.rpcenc.not.supported");
}
/**
- * abstract operation "{0}" binding, part "{1}" has multiple binding.
+ * rpc/encoded wsdl's are not supported in JAXWS 2.0.
*
*/
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+ public static String WSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
+ return LOCALIZER.localize(localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED());
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.notFound", arg0, arg1);
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.multipleMatchingOperations", arg0, arg1);
+ /**
+ * fault "{0}" in operation "{1}" does not match any fault in the corresponding port type operation
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.doclitoperation", arg0);
}
/**
- * in binding "{1}", operation "{0}" does not reference a unique operation in the corresponding port type
+ * Invalid wsdl:operation "{0}": its a document-literal operation, message part must refer to a schema element declaration
*
*/
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(arg0, arg1));
+ public static String WSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_DOCLITOPERATION(arg0));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.cant.resolve.message", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notNCName", arg0, arg1);
}
/**
- * ignoring header "{0}" of binding operation "{1}": cannot resolve message
+ * Ignoring operation "{0}", it has illegal character ''{1}'' in its name. Its rpc-literal operation - jaxws won't be able to serialize it!
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimePart.nameNotAllowed", arg0);
}
/**
- * Ignoring operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
+ * name attribute on wsdl:part in Operation "{0}" is ignored. Its not allowed as per WS-I AP 1.0.
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
+ public static String MIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(arg0));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notLiteral", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notLiteral", arg0);
}
/**
- * ignoring header "{0}" of binding operation "{1}": not literal
+ * ignoring document-style operation "{0}": parameters are not literal
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(arg0, arg1));
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(arg0));
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputHeader.missingNamespace", arg0, arg1);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.documentOperation", arg0, arg1);
}
/**
- * input header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+ * ignoring fault "{0}" of document-style operation "{1}"
*
*/
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+ public static String WSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.notUnique", arg0, arg1);
+ }
+
+ /**
+ * fault "{0}" in operation "{1}" matches more than one fault in the corresponding port type operation
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(arg0, arg1));
}
public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.missingInputName", arg0);
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.missingInputName", arg0);
}
/**
@@ -872,383 +364,11 @@
*
*/
public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort.noAddress", arg0);
- }
-
- /**
- * ignoring port "{0}": no SOAP address specified. try running wsimport with -extension switch.
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.resultIsInOutParameter", arg0);
- }
-
- /**
- * result is "inout" parameter in operation: {0}
- *
- */
- public static String WSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.header.notFound", arg0, arg1);
- }
-
- /**
- * header "{0}" of binding operation "{1}": not found
- *
- */
- public static String WSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("mimemodeler.elementPart.invalidElementMimeType", arg0, arg1);
- }
-
- /**
- * The mime:content part refers to wsdl:part "{0}", defined using element attribute. Please make sure the mime type: "{1}" is appropriate to serialize XML.
- *
- */
- public static String MIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.header.notLiteral", arg0, arg1);
- }
-
- /**
- * Invalid header "{0}" of binding operation "{1}": not literal
- *
- */
- public static String WSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(arg0, arg1));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.mesagePartElementKind", arg0);
- }
-
- /**
- * wsdl:part element referenced by mime:content part attribute: {0} must be defined using type attribute!
- *
- */
- public static String MIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notEncoded", arg0);
- }
-
- /**
- * ignoring RPC-style operation "{0}": parameters are not encoded
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
- return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.types");
- }
-
- /**
- * Non conforming WS-I WSDL used for wsdl:types
- *
- */
- public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
- return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES());
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInInputMessage", arg0);
- }
-
- /**
- * ignoring operation "{0}": more than one part in input message
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyOutputMessage", arg0);
- }
-
- /**
- * ignoring operation "{0}": output message is empty
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.r2716r2726", arg0, arg1);
- }
-
- /**
- * R2716/R2726 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit or rpc/lit for {0}: "{1}"
- *
- */
- public static String WSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_R_2716_R_2726(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.ignoringMemberSubmissionAddressing", arg0, arg1);
- }
-
- /**
- * ignoring wsa:Action attribute since obsolete addressing version 08-2004:"{0}" used; expecting addressing version "{1}". To use version 08-2004 anyway run wsimport with -extension switch.
- *
- */
- public static String WSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.noSOAPAddress", arg0);
- }
-
- /**
- * Port "{0}" is not a SOAP port, it has no soap:address
- *
- */
- public static String WSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringFaults", arg0);
- }
-
- /**
- * ignoring faults declared by operation "{0}"
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULTS(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.missingName", arg0, arg1);
- }
-
- /**
- * fault "{0}" in operation "{1}" must specify a value for the "name" attribute
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(arg0, arg1));
- }
-
- public static Localizable localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
- return messageFactory.getMessage("mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart", arg0);
- }
-
- /**
- * Headers not in root mime:part with soap:body, ignoring headers in operation "{0}"
- *
- */
- public static String MIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
- return localizer.localize(localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(arg0));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.errorLoadingJavaClass");
- }
-
- /**
- * Couldn't find class "{0}" for mime type "{1}"
- *
- */
- public static String MIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS());
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.notInPortType", arg0, arg1);
- }
-
- /**
- * in binding "{1}", operation "{0}" does not appear in the corresponding port type
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.conflictStyleInWSIMode", arg0);
- }
-
- /**
- * ignoring operation "{0}": binding style and operation style are conflicting
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(arg0));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.missingPartAttribute", arg0);
- }
-
- /**
- * Ignoring operation "{0}", missing part attribute in mime:content. part attribute must be present in mime:content declaration.
- *
- */
- public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.searchSchema.unrecognizedTypes", arg0);
- }
-
- /**
- * encountered {0} unrecognized type(s)
- *
- */
- public static String WSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
- }
-
- /**
- * Invalid operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.header.cant.resolve.message", arg0, arg1);
- }
-
- /**
- * header "{0}" of binding operation "{1}": cannot resolve message
- *
- */
- public static String WSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.missingNamespace", arg0, arg1);
- }
-
- /**
- * fault "{0}" in operation "{1}" must specify a value for the "namespace" attribute
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(arg0, arg1));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
- return messageFactory.getMessage("mimemodeler.invalidMimePart.moreThanOneSOAPBody", arg0);
- }
-
- /**
- * Ignoring operation "{0}". The Multipart/Related structure has invalid root part: more than one soap:body parts found
- *
- */
- public static String MIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.inconsistentDefinition", arg0, arg1);
- }
-
- /**
- * ignoring header "{0}" of operation "{1}": part not found
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.notFound", arg0, arg1);
- }
-
- /**
- * fault "{0}" in operation "{1}" does not match any fault in the corresponding port type operation
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName", arg0, arg1);
- }
-
- /**
- * Ignoring operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension", arg0);
- }
-
- /**
- * ignoring schema element (unsupported version): {0}
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notFound", arg0, arg1, arg2);
- }
-
- /**
- * ignoring header fault "{0}", cannot find part "{1}" in binding "{2}"
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("wsdlmodeler.nonUnique.body.warning", arg0, arg1, arg2, arg3);
- }
-
- /**
- * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Method dispatching may fail, runtime will try to dispatch using SOAPAction
- *
- */
- public static String WSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(arg0, arg1, arg2, arg3));
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(arg0));
}
public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
}
/**
@@ -1256,263 +376,11 @@
*
*/
public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("mimemodeler.invalidMimeContent.unknownSchemaType", arg0, arg1);
- }
-
- /**
- * Unknown schema type: {1} for mime:content part: {0}
- *
- */
- public static String MIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.r2716", arg0, arg1);
- }
-
- /**
- * R2716 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit for {0}: "{1}"
- *
- */
- public static String WSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_R_2716(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notFound", arg0, arg1);
- }
-
- /**
- * ignoring header "{0}" of binding operation "{1}": not found
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleTypeMessagePart", arg0);
- }
-
- /**
- * ignoring operation "{0}": message part does not refer to a schema element declaration
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.parameterOrder.invalidParameterOrder", arg0);
- }
-
- /**
- * parameterOrder attribute on operation "{0}" is invalid, ignoring parameterOrder hint
- *
- */
- public static String WSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.missingOutputName", arg0);
- }
-
- /**
- * binding operation "{0}" must specify a name for its output message
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalidOperation", arg0);
- }
-
- /**
- * invalid operation: {0}
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputHeader.missingNamespace", arg0, arg1);
- }
-
- /**
- * output header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
- *
- */
- public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.partFromBody", arg0);
- }
-
- /**
- * header part: "{0}" already bound by soapbind:body, illegal to bind the part twice
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.notSupportedStyle", arg0, arg1);
- }
-
- /**
- * Invalid WSDL, wsdl:operation "{0}" in wsdl:portType "{1}": not request-response or one-way
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notNCName", arg0, arg1);
- }
-
- /**
- * Ignoring operation "{0}", it has illegal character ''{1}'' in its name. Its rpc-literal operation - jaxws won't be able to serialize it!
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.parameter.differentTypes", arg0, arg1);
- }
-
- /**
- * parameter "{0}" of operation "{1}" appears with different types in the input and output messages
- *
- */
- public static String WSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.documentOperation", arg0, arg1);
- }
-
- /**
- * ignoring fault "{0}" of document-style operation "{1}"
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.use", arg0);
- }
-
- /**
- * Processing WS-I non conforming operation "{0}" with RPC-Style and SOAP-encoded
- *
- */
- public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.nonSOAPPort", arg0);
- }
-
- /**
- * port "{0}": not a standard SOAP port. The generated artifacts may not work with JAX-WS runtime.
- *
- */
- public static String WSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_NON_SOAP_PORT(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.invalid.headerfault.message.partMustHaveElementDescriptor", arg0, arg1, arg2);
- }
-
- /**
- * Invalid headerfault "{0}" for header {1} in operation {2}: part must specify an "element" attribute
- *
- */
- public static String WSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalidState.modelingOperation", arg0);
- }
-
- /**
- * invalid state while modeling operation: {0}
- *
- */
- public static String WSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.operationName", arg0);
- }
-
- /**
- * Ignoring operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
- }
-
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notEncoded", arg0, arg1);
- }
-
- /**
- * ignoring header "{0}" of binding operation "{1}": not SOAP-encoded
- *
- */
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(arg0, arg1));
- }
-
- public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.duplicate.fault.part.name", arg0, arg1, arg2);
- }
-
- /**
- * ignoring fault "{0}" of operation "{1}", part name "{2}" is not unique
- *
- */
- public static String WSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.operation.MoreThanOnePartInMessage", arg0);
- }
-
- /**
- * operation "{0}": more than one part bound to body
- *
- */
- public static String WSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
}
public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding12", arg0);
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringSOAPBinding12", arg0);
}
/**
@@ -1521,23 +389,1067 @@
*
*/
public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(arg0));
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(arg0));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.mesagePartElementKind", arg0);
+ }
+
+ /**
+ * wsdl:part element referenced by mime:content part attribute: {0} must be defined using type attribute!
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport", arg0);
+ }
+
+ /**
+ * ignoring SOAP port "{0}": unrecognized transport. try running wsimport with -extension switch.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.duplicate.fault.soap.name", arg0, arg1, arg2);
+ }
+
+ /**
+ * ignoring fault "{0}" of operation "{1}", soap:fault name "{2}" is not unique
+ *
+ */
+ public static String WSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyOutputMessage", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": output message is empty
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(arg0));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimePart.moreThanOneSOAPBody", arg0);
+ }
+
+ /**
+ * Ignoring operation "{0}". The Multipart/Related structure has invalid root part: more than one soap:body parts found
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.messageHasMoreThanOnePart", arg0, arg1);
+ }
+
+ /**
+ * fault "{0}" refers to message "{1}", but the message has more than one parts
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleTypeMessagePart", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": message part does not refer to a schema element declaration
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFaults", arg0);
+ }
+
+ /**
+ * ignoring faults declared by operation "{0}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULTS(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.inputSoapBody.missingNamespace", arg0);
+ }
+
+ /**
+ * input message of binding operation "{0}" must specify a value for the "namespace" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleElementMessagePart", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": message part does not refer to a schema type declaration
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(arg0));
+ }
+
+ public static Localizable localizableMODELER_NESTED_MODEL_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("modeler.nestedModelError", arg0);
+ }
+
+ /**
+ * modeler error: {0}
+ *
+ */
+ public static String MODELER_NESTED_MODEL_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableMODELER_NESTED_MODEL_ERROR(arg0));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.differentPart");
+ }
+
+ /**
+ * Ignoring the mime:part. Invalid mime:part, the mime:content has different part attribute.
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.ignoringMemberSubmissionAddressing", arg0, arg1);
+ }
+
+ /**
+ * ignoring wsa:Action attribute since obsolete addressing version 08-2004:"{0}" used; expecting addressing version "{1}". To use version 08-2004 anyway run wsimport with -extension switch.
+ *
+ */
+ public static String WSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.bindingOperation.multiplePartBinding", arg0, arg1);
+ }
+
+ /**
+ * Check the abstract operation "{0}" binding, part "{1}" has multiple binding. Will try to generated artifacts anyway...
+ *
+ */
+ public static String WSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort.noAddress", arg0);
+ }
+
+ /**
+ * ignoring port "{0}": no SOAP address specified. try running wsimport with -extension switch.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.port.SOAPBinding12", arg0);
+ }
+
+ /**
+ * SOAP port "{0}": uses a non-standard SOAP 1.2 binding.
+ *
+ */
+ public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(arg0));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.invalidSchemaType", arg0, arg1);
+ }
+
+ /**
+ * Ignoring the mime:part. mime part: {0} can not be mapped to schema type: {1}
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notEncoded", arg0);
+ }
+
+ /**
+ * ignoring RPC-style operation "{0}": parameters are not encoded
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.message.partMustHaveElementDescriptor", arg0, arg1);
+ }
+
+ /**
+ * Invalid header "{0}" in operation {1}: part must specify a "element" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.message.partMustHaveElementDescriptor", arg0, arg1);
+ }
+
+ /**
+ * in message "{0}", part "{1}" must specify a "element" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.error.partNotFound", arg0, arg1);
+ }
+
+ /**
+ * part "{1}" of operation "{0}" could not be resolved!
+ *
+ */
+ public static String WSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_ERROR_PART_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName", arg0);
}
- public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.notUnique", arg0, arg1);
+ /**
+ * Invalid operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.notInPortType", arg0, arg1);
+ }
+
+ /**
+ * in binding "{1}", operation "{0}" does not appear in the corresponding port type
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalidOperation", arg0);
+ }
+
+ /**
+ * invalid operation: {0}
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.outputHeader.missingNamespace", arg0, arg1);
+ }
+
+ /**
+ * output header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInInputMessage", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": more than one part in input message
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.missingOutputName", arg0);
+ }
+
+ /**
+ * binding operation "{0}" must specify a name for its output message
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.missingName", arg0, arg1);
+ }
+
+ /**
+ * fault "{0}" in operation "{1}" must specify a value for the "name" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.notFound", arg0, arg1);
+ }
+
+ /**
+ * in binding "{1}", operation "{0}" does not match any operation in the corresponding port type
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleBodyPartsAttribute", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": cannot handle "parts" attribute of "soap:body" element
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
+ }
+
+ /**
+ * Ignoring operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.conflictStyleInWSIMode", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": binding style and operation style are conflicting
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.notFound", arg0, arg1);
+ }
+
+ /**
+ * ignoring header "{0}" of binding operation "{1}": not found
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.memberSubmissionAddressingUsed", arg0, arg1);
+ }
+
+ /**
+ * obsolete addressing version 08-2004:"{0}" used; version "{1}" should be used instead.
+ *
+ */
+ public static String WSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noSOAPAddress", arg0);
+ }
+
+ /**
+ * Port "{0}" is not a SOAP port, it has no soap:address
+ *
+ */
+ public static String WSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.operationName", arg0);
+ }
+
+ /**
+ * Ignoring operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.notLiteral", arg0, arg1);
+ }
+
+ /**
+ * ignoring header "{0}" of binding operation "{1}": not literal
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.outputMissingSoapFault", arg0, arg1);
+ }
+
+ /**
+ * fault "{0}" in operation "{1}" does not have a SOAP fault extension
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.nonUnique.body.warning", arg0, arg1, arg2, arg3);
+ }
+
+ /**
+ * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Method dispatching may fail, runtime will try to dispatch using SOAPAction
+ *
+ */
+ public static String WSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
+ return LOCALIZER.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(arg0, arg1, arg2, arg3));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.port.SOAPBinding.mixedStyle", arg0);
+ }
+
+ /**
+ * not a WS-I BP1.1 compliant SOAP port "{0}": the WSDL binding has mixed style, it must be rpc-literal or document-literal operation!
+ *
+ */
+ public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.noSoapFaultName", arg0, arg1);
+ }
+
+ /**
+ * soap:fault name not specified, wsdl:fault "{0}" in operation "{1}"
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.headerfault.message.partMustHaveElementDescriptor", arg0, arg1, arg2);
+ }
+
+ /**
+ * Invalid headerfault "{0}" for header {1} in operation {2}: part must specify an "element" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.rpclit.unkownschematype", arg0, arg1, arg2);
+ }
+
+ /**
+ * XML type "{0}" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part "{1}" in the wsdl:message "{2}".
+ *
+ */
+ public static String WSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.r2716", arg0, arg1);
}
/**
- * fault "{0}" in operation "{1}" matches more than one fault in the corresponding port type operation
+ * R2716 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit for {0}: "{1}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_R_2716(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
+ }
+
+ /**
+ * Ignoring operation "{0}", can''t generate java method parameter. Local name of the wrapper child "{1}" in the global element "{2}" is a java keyword. Use customization to change the parameter name.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.fault.notLiteral", arg0, arg1);
+ }
+
+ /**
+ * ignoring encoded fault "{0}" in literal binding operation "{1}"
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.outputSoapBody.missingNamespace", arg0);
+ }
+
+ /**
+ * output message of binding operation "{0}" must specify a value for the "namespace" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.cant.resolve.message", arg0, arg1);
+ }
+
+ /**
+ * header "{0}" of binding operation "{1}": cannot resolve message
+ *
+ */
+ public static String WSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.searchSchema.unrecognizedTypes", arg0);
+ }
+
+ /**
+ * encountered {0} unrecognized type(s)
+ *
+ */
+ public static String WSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.responsebean.notfound", arg0);
+ }
+
+ /**
+ * wsimport failed to generate async response bean for operation: {0}
+ *
+ */
+ public static String WSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.unsolvableNamingConflicts", arg0);
+ }
+
+ /**
+ * the following naming conflicts occurred: {0}
+ *
+ */
+ public static String WSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noPortsInService", arg0);
+ }
+
+ /**
+ * Service "{0}" does not contain any usable ports. try running wsimport with -extension switch.
+ *
+ */
+ public static String WSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.cant.resolve.message", arg0, arg1);
+ }
+
+ /**
+ * ignoring fault "{0}" of binding operation "{1}": cannot resolve message
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.partNotFound", arg0, arg1);
+ }
+
+ /**
+ * ignoring operation "{0}": part "{1}" not found
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeaderFault.noElementAttribute", arg0, arg1, arg2);
+ }
+
+ /**
+ * ignoring header fault part="{0}" message="{1}" of operation {2}
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.r2716r2726", arg0, arg1);
+ }
+
+ /**
+ * R2716/R2726 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit or rpc/lit for {0}: "{1}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_R_2716_R_2726(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.multipleMatchingOperations", arg0, arg1);
+ }
+
+ /**
+ * in binding "{1}", operation "{0}" does not reference a unique operation in the corresponding port type
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.notEncoded", arg0, arg1);
+ }
+
+ /**
+ * ignoring header "{0}" of binding operation "{1}": not SOAP-encoded
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(arg0, arg1));
+ }
+
+ public static Localizable localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.elementPart.invalidElementMimeType", arg0, arg1);
+ }
+
+ /**
+ * The mime:content part refers to wsdl:part "{0}", defined using element attribute. Please make sure the mime type: "{1}" is appropriate to serialize XML.
+ *
+ */
+ public static String MIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.portTypeFault.notFound", arg0, arg1);
+ }
+
+ /**
+ * fault "{0}" in portType operation "{1}" does not match any fault in the corresponding binding operation
+ *
+ */
+ public static String WSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.resultIsInOutParameter", arg0);
+ }
+
+ /**
+ * result is "inout" parameter in operation: {0}
+ *
+ */
+ public static String WSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.operation.MoreThanOnePartInMessage", arg0);
+ }
+
+ /**
+ * Ignoring operation "{0}": more than one part bound to body
+ *
+ */
+ public static String WSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.errorLoadingJavaClass");
+ }
+
+ /**
+ * Couldn't find class "{0}" for mime type "{1}"
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS());
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.rpclitoperation", arg0);
+ }
+
+ /**
+ * Invalid wsdl:operation "{0}": its a rpc-literal operation, message part must refer to a schema type declaration
+ *
+ */
+ public static String WSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_RPCLITOPERATION(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.partFromBody", arg0);
+ }
+
+ /**
+ * header part: "{0}" already bound by soapbind:body, illegal to bind the part twice
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noServiceDefinitionsFound");
+ }
+
+ /**
+ * WSDL document does not define any services
*
*/
- public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(arg0, arg1));
+ public static String WSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND());
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.emptyMessage", arg0, arg1);
+ }
+
+ /**
+ * fault "{0}" refers to message "{1}", but the message has no parts
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameterorder.parameter", arg0, arg1);
+ }
+
+ /**
+ * "{0}" specified in the parameterOrder attribute of operation "{1}" is not a valid part of the message.
+ *
+ */
+ public static String WSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.duplicate.fault.part.name", arg0, arg1, arg2);
+ }
+
+ /**
+ * ignoring fault "{0}" of operation "{1}", part name "{2}" is not unique
+ *
+ */
+ public static String WSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort", arg0);
+ }
+
+ /**
+ * ignoring port "{0}": not a standard SOAP port. try running wsimport with -extension switch.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
+ }
+
+ /**
+ * Invalid operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
+ }
+
+ /**
+ * Invalid operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.cant.resolve.message", arg0, arg1);
+ }
+
+ /**
+ * ignoring header "{0}" of binding operation "{1}": cannot resolve message
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody", arg0);
+ }
+
+ /**
+ * input message of binding operation "{0}" does not have a SOAP body extension
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameterOrder.invalidParameterOrder", arg0);
+ }
+
+ /**
+ * parameterOrder attribute on operation "{0}" is invalid, ignoring parameterOrder hint
+ *
+ */
+ public static String WSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noOperationsInPort", arg0);
+ }
+
+ /**
+ * Port "{0}" does not contain any usable operations
+ *
+ */
+ public static String WSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonconforming.wsdl.import");
+ }
+
+ /**
+ * Non conforming WS-I WSDL used for wsdl:import
+ *
+ */
+ public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT());
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.missingTypeAttribute", arg0);
+ }
+
+ /**
+ * Missing type attribute in mime:content in operation "{0}". part attribute must be present in mime:content declaration.
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.inputHeader.missingNamespace", arg0, arg1);
+ }
+
+ /**
+ * input header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameter.differentTypes", arg0, arg1);
+ }
+
+ /**
+ * parameter "{0}" of operation "{1}" appears with different types in the input and output messages
+ *
+ */
+ public static String WSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInOutputMessage", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": more than one part in output message
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonconforming.wsdl.use", arg0);
+ }
+
+ /**
+ * Processing WS-I non conforming operation "{0}" with RPC-Style and SOAP-encoded
+ *
+ */
+ public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleDocumentStyle", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": cannot handle document-style operations
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.wrongSoapFaultName", arg0, arg1, arg2);
+ }
+
+ /**
+ * name of soap:fault "{0}" doesn''t match the name of wsdl:fault "{1}" in operation "{2}"
+ *
+ */
+ public static String WSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.MoreThanOnePartInMessage", arg0);
+ }
+
+ /**
+ * operation "{0}": more than one part bound to body
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonSOAPPort", arg0);
+ }
+
+ /**
+ * port "{0}": not a standard SOAP port. The generated artifacts may not work with JAX-WS runtime.
+ *
+ */
+ public static String WSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NON_SOAP_PORT(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalidState.modelingOperation", arg0);
+ }
+
+ /**
+ * invalid state while modeling operation: {0}
+ *
+ */
+ public static String WSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyInputMessage", arg0);
+ }
+
+ /**
+ * ignoring operation "{0}": input message is empty
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(arg0));
}
public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputMissingSoapBody", arg0);
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.outputMissingSoapBody", arg0);
}
/**
@@ -1545,67 +1457,162 @@
*
*/
public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(arg0));
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notFound", arg0, arg1, arg2);
+ }
+
+ /**
+ * ignoring header fault "{0}", cannot find part "{1}" in binding "{2}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(arg0, arg1, arg2));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notLiteral", arg0, arg1, arg2);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader", arg0, arg1);
+ }
+
+ /**
+ * ignoring header "{0}" of binding operation "{1}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.fault.cant.resolve.message", arg0, arg1);
}
/**
- * ignoring header fault part="{0}" message="{1}" of operation {2}, use attribute must be "literal"
+ * fault message "{0}" in binding operation "{1}" could not be resolved
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(arg0, arg1, arg2));
+ public static String WSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInOutputMessage", arg0);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringMimePart.notFound", arg0, arg1);
}
/**
- * ignoring operation "{0}": more than one part in output message
+ * ignoring mime:part, cannot find part "{0}" referenced by the mime:content in the wsdl:operation "{1}"
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension", arg0);
+ }
+
+ /**
+ * ignoring schema element (unsupported version): {0}
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(arg0));
+ public static String WSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(arg0));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle", arg0);
}
- public static Localizable localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.warning.noOperationsInPort", arg0);
+ /**
+ * ignoring port "{0}", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation. try running wsimport with -extension switch.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(arg0));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.unknownSchemaType", arg0, arg1);
}
/**
- * Port "{0}" does not contain any usable operations
+ * Unknown schema type: {1} for mime:content part: {0}
+ *
+ */
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.notEncoded", arg0, arg1);
+ }
+
+ /**
+ * ignoring literal fault "{0}" of binding operation "{1}"
*
*/
- public static String WSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(arg0));
+ public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName", arg0, arg1);
}
- public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
+ /**
+ * Ignoring operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
+ *
+ */
+ public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
+ }
+
+ public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.missingPartAttribute", arg0);
}
/**
- * Ignoring operation "{0}", can''t generate java method parameter. Local name of the wrapper child "{1}" in the global element "{2}" is a java keyword. Use customization to change the parameter name.
+ * Ignoring operation "{0}", missing part attribute in mime:content. part attribute must be present in mime:content declaration.
*
*/
- public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
+ public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
+ return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(arg0));
}
- public static Localizable localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
- return messageFactory.getMessage("wsdlmodeler.unsolvableNamingConflicts", arg0);
+ public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.inconsistentDefinition", arg0, arg1);
}
/**
- * the following naming conflicts occurred: {0}
+ * ignoring header "{0}" of operation "{1}": part not found
*
*/
- public static String WSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
- return localizer.localize(localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(arg0));
+ public static String WSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(arg0, arg1));
+ }
+
+ public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName", arg0, arg1);
+ }
+
+ /**
+ * Invalid operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
+ *
+ */
+ public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
+ }
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,11 +25,11 @@
package com.sun.tools.internal.ws.resources;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
import java.util.Locale;
import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
/**
@@ -37,12 +37,20 @@
*
*/
public final class ProcessorMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.processor";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, ProcessorMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ProcessorMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
+
}
+
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,30 +25,50 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class UtilMessages {
+
private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.util";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, UtilMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new UtilMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
+
+ public static Localizable localizableNULL_NAMESPACE_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("null.namespace.found", arg0);
+ }
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ /**
+ * Encountered error in wsdl. Check namespace of element <{0}>
+ *
+ */
+ public static String NULL_NAMESPACE_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableNULL_NAMESPACE_FOUND(arg0));
+ }
+
+ public static Localizable localizableHOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("holder.valuefield.not.found", arg0);
+ }
+
+ /**
+ * Could not find the field in the Holder that contains the Holder''s value: {0}
+ *
+ */
+ public static String HOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
}
public static Localizable localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
- return messageFactory.getMessage("sax2dom.notsupported.createelement", arg0);
+ return MESSAGE_FACTORY.getMessage("sax2dom.notsupported.createelement", arg0);
}
/**
@@ -56,31 +76,18 @@
*
*/
public static String SAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
- return localizer.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
- }
-
- public static Localizable localizableNULL_NAMESPACE_FOUND(Object arg0) {
- return messageFactory.getMessage("null.namespace.found", arg0);
+ return LOCALIZER.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
}
- /**
- * Encountered error in wsdl. Check namespace of element <{0}>
- *
- */
- public static String NULL_NAMESPACE_FOUND(Object arg0) {
- return localizer.localize(localizableNULL_NAMESPACE_FOUND(arg0));
- }
+ private static class BundleSupplier
+ implements ResourceBundleSupplier
+ {
+
- public static Localizable localizableHOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("holder.valuefield.not.found", arg0);
- }
+ public ResourceBundle getResourceBundle(Locale locale) {
+ return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+ }
- /**
- * Could not find the field in the Holder that contains the Holder''s value: {0}
- *
- */
- public static String HOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
}
}
diff -r 3532c702cd17 -r ee4958177e69 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java Thu Aug 24 16:24:37 2017 +0200
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java Thu Aug 24 16:24:44 2017 +0200
@@ -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,102 +25,38 @@
package com.sun.tools.internal.ws.resources;
+import java.util.Locale;
+import java.util.ResourceBundle;
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
*
*/
public final class WebserviceapMessages {
- private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.webserviceap";
- private final static LocalizableMessageFactory messageFactory =
- new LocalizableMessageFactory(BUNDLE_NAME, WebserviceapMessages::getResourceBundle);
- private final static Localizer localizer = new Localizer();
-
- private static ResourceBundle getResourceBundle(Locale locale) {
- return ResourceBundle.getBundle(BUNDLE_NAME, locale);
- }
-
- public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.endpointinterfaces.do.not.match", arg0, arg1);
- }
- /**
- * The endpoint interface {0} does not match the interface {1}.
- *
- */
- public static String WEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(arg0, arg1));
- }
+ private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.webserviceap";
+ private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WebserviceapMessages.BundleSupplier());
+ private final static Localizer LOCALIZER = new Localizer();
- public static Localizable localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.invalid.webmethod.element.with.exclude", arg0, arg1, arg2);
- }
-
- /**
- * The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class: {1} method: {2}
- *
- */
- public static String WEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.sei.cannot.contain.constant.values", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
}
/**
- * A service endpoint interface cannot contain constant declaration: Interface: {0} field: {1}.
- *
- */
- public static String WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.invalid.soapbinding.parameterstyle", arg0, arg1);
- }
-
- /**
- * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
+ * Classes annotated with @javax.jws.WebService must not have abstract methods. Class: {0} Method: {1}
*
*/
- public static String WEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.rpc.literal.parameters.must.have.webparam", arg0, arg1, arg2);
- }
-
- /**
- * All RPC literal parameters must have a WebParam annotation. Class: {0} method: {1} parameter {2}
- *
- */
- public static String WEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
- }
-
- /**
- * Exception bean names must be unique and must not clash with other generated classes. Class: {0} exception {1}
- *
- */
- public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+ public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
}
public static Localizable localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
- return messageFactory.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
+ return MESSAGE_FACTORY.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
}
/**
@@ -128,119 +64,83 @@
*
*/
public static String WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
- return messageFactory.getMessage("webserviceap.webservice.no.default.constructor", arg0);
+ return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
}
- /**
- * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
- *
- */
- public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
}
/**
- * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
+ * Document literal bare methods must have one non-header, IN/INOUT parameter. Class: {0} Method: {1}
*
*/
- public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
+ public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
}
- public static Localizable localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.failed.to.parse.handlerchain.file", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
}
/**
- * Failed to parse HandlerChain file. Class: {0}, file: {1}
+ * Document literal bare methods must have no more than 1 non-header in parameter. Class: {0} method: {1} number of non-header parameters: {2}
*
*/
- public static String WEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("webserviceap.java.typeNotFound", arg0);
+ public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
}
- /**
- * The type: {0} was not found in the mapping
- *
- */
- public static String WEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.oneway.operation.cannot.declare.exceptions", arg0, arg1, arg2);
+ public static Localizable localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.document.bare.holder.parameters.must.not.be.inout", arg0, arg1, arg2);
}
/**
- * The method {1} of class {0} is annotated @Oneway but declares the exception {2}
+ * javax.xml.ws.Holder parameters in document bare operations must be WebParam.Mode.INOUT; Class: {0} method: {1} parameter: {2}
*
*/
- public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.webservice.method.is.static.or.final", arg0, arg1);
+ public static String WEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(arg0, arg1, arg2));
}
- /**
- * Method annotated with @javax.jws.WebMethod must not be static or final. Class: {0} Method: {1}
- *
- */
- public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.return.type", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
}
/**
- * The method {1} of class {0} is annotated @Oneway but has a return type.
+ * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
*
*/
- public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(arg0, arg1));
+ public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
}
- public static Localizable localizableWEBSERVICEAP_WARNING(Object arg0) {
- return messageFactory.getMessage("webserviceap.warning", arg0);
+ public static Localizable localizableWEBSERVICEAP_COMPILATION_FAILED() {
+ return MESSAGE_FACTORY.getMessage("webserviceap.compilationFailed");
}
/**
- * warning: {0}
+ * compilation failed, errors should have been reported
*
*/
- public static String WEBSERVICEAP_WARNING(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_WARNING(arg0));
+ public static String WEBSERVICEAP_COMPILATION_FAILED() {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_COMPILATION_FAILED());
}
- public static Localizable localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.method.response.wrapper.bean.name.not.unique", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.mixed.binding.style", arg0);
}
/**
- * Response wrapper bean names must be unique and must not clash with other generated classes. Class: {0} method {1}
+ * Class: {0} contains mixed bindings. SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
*
*/
- public static String WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+ public static String WEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_MIXED_BINDING_STYLE(arg0));
}
public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.endpointinterface.on.interface", arg0, arg1);
+ return MESSAGE_FACTORY.getMessage("webserviceap.endpointinterface.on.interface", arg0, arg1);
}
/**
@@ -248,119 +148,23 @@
*
*/
public static String WEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.oneway.and.out", arg0, arg1);
- }
-
- /**
- * @Oneway methods cannot have out parameters. Class: {0} method {1}
- *
- */
- public static String WEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_OUT(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.rpc.literal.webparams.must.specify.name", arg0, arg1, arg2);
- }
-
- /**
- * All RPC literal WebParams must specify a name. Class: {0} method {1} parameter {2}
- *
- */
- public static String WEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(arg0, arg1));
}
- public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element.exclude", arg0, arg1, arg2);
- }
-
- /**
- * The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class: {1} method: {2}
- *
- */
- public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("webserviceap.class.not.found", arg0);
- }
-
- /**
- * Class Not Found: {0}
- *
- */
- public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
- return messageFactory.getMessage("webserviceap.endpointinteface.plus.element", arg0);
+ public static Localizable localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.no.package.class.must.have.targetnamespace", arg0);
}
/**
- * The @javax.jws.WebService.{0} element cannot be used in with @javax.jws.WebService.endpointInterface element.
- *
- */
- public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
- return messageFactory.getMessage("webserviceap.cannot.combine.handlerchain.soapmessagehandlers");
- }
-
- /**
- * You cannot specify both HanlderChain and SOAPMessageHandlers annotations
- *
- */
- public static String WEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
- return localizer.localize(localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS());
- }
-
- public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
- return messageFactory.getMessage("webserviceap.webservice.class.is.innerclass.not.static", arg0);
- }
-
- /**
- * Inner classes annotated with @javax.jws.WebService must be static. Class: {0}
+ * @javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element. Class: {0}
*
*/
- public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
- }
-
- /**
- * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
- *
- */
- public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
- }
-
- public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element", arg0, arg1);
- }
-
- /**
- * The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class: {1}
- *
- */
- public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(arg0, arg1));
+ public static String WEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(arg0));
}
public static Localizable localizableWEBSERVICEAP_SUCCEEDED() {
- return messageFactory.getMessage("webserviceap.succeeded");
+ return MESSAGE_FACTORY.getMessage("webserviceap.succeeded");
}
/**
@@ -368,95 +172,47 @@
*
*/
public static String WEBSERVICEAP_SUCCEEDED() {
- return localizer.localize(localizableWEBSERVICEAP_SUCCEEDED());
- }
-
- public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
+ return LOCALIZER.localize(localizableWEBSERVICEAP_SUCCEEDED());
}
- /**
- * Document literal bare methods must have one non-header, IN/INOUT parameter. Class: {0} Method: {1}
- *
- */
- public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_ERROR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.error", arg0);
}
/**
- * Classes annotated with @javax.jws.WebService must not have abstract methods. Class: {0} Method: {1}
+ * error: {0}
*
*/
- public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
- }
-
- public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("webserviceap.document.literal.bare.method.return.not.unique", arg0, arg1, arg2, arg3);
+ public static String WEBSERVICEAP_ERROR(Object arg0) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_ERROR(arg0));
}
- /**
- * Document literal bare methods must have a unique result name return type combination. Class {0} method: {1}, result name: {2} return type: {3}
- *
- */
- public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(arg0, arg1, arg2, arg3));
- }
-
- public static Localizable localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
- return messageFactory.getMessage("webserviceap.no.webservice.endpoint.found");
+ public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.could.not.find.handlerchain", arg0, arg1);
}
/**
- * A web service endpoint could not be found
+ * Could not find the handlerchain {0} in the handler file {1}
*
*/
- public static String WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
- return localizer.localize(localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
+ public static String WEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(arg0, arg1));
}
- public static Localizable localizableWEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
- return messageFactory.getMessage("webserviceap.fileNotFound", arg0);
+ public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.endpointinterface.class.not.found", arg0);
}
/**
- * error: file not found: {0}
- *
- */
- public static String WEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_FILE_NOT_FOUND(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
- return messageFactory.getMessage("webserviceap.invalid.handlerchain.file.nohandler-config", arg0);
- }
-
- /**
- * The handlerchain file {0} is invalid, it does not contain a handler-config element
+ * The endpointInterface class {0} could not be found
*
*/
- public static String WEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(arg0));
- }
-
- public static Localizable localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.header.parameters.must.have.webparam.name", arg0, arg1, arg2);
- }
-
- /**
- * All WebParam annotations on header parameters must specify a name. Class: {0} method {1} parameter {2}
- *
- */
- public static String WEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(arg0, arg1, arg2));
+ public static String WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(arg0));
}
public static Localizable localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.method.return.type.cannot.implement.remote", arg0, arg1, arg2);
+ return MESSAGE_FACTORY.getMessage("webserviceap.method.return.type.cannot.implement.remote", arg0, arg1, arg2);
}
/**
@@ -464,59 +220,119 @@
*
*/
public static String WEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2));
+ return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.webservice.method.is.static.or.final", arg0, arg1);
}
- public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
- return messageFactory.getMessage("webserviceap.endpointinteface.plus.annotation", arg0);
+ /**
+ * Method annotated with @javax.jws.WebMethod must not be static or final. Class: {0} Method: {1}
+ *
+ */
+ public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(arg0, arg1));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.invalid.sei.annotation", arg0, arg1);
}
/**
- * The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
+ * The @{0} annotation cannot be used on a service endpoint interface. Class: {1}
+ *
+ */
+ public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(arg0, arg1));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.webservice.no.default.constructor", arg0);
+ }
+
+ /**
+ * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
*
*/
- public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
- return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(arg0));
+ public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.no.return.and.no.out", arg0, arg1);
}
- public static Localizable localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.holder.parameters.must.not.be.in.only", arg0, arg1, arg2);
+ /**
+ * Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter. Class: {0} Method: {1}
+ *
+ */
+ public static String WEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(arg0, arg1));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
}
/**
- * javax.xml.ws.Holder parameters must not be annotated with the WebParam.Mode.IN property. Class: {0} method: {1} parameter: {2}
+ * Exception bean names must be unique and must not clash with other generated classes. Class: {0} exception {1}
*
*/
- public static String WEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(arg0, arg1, arg2));
+ public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
}
- public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
- return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
+ /**
+ * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
+ *
+ */
+ public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.failed.to.find.handlerchain.file", arg0, arg1);
}
/**
- * Document literal bare methods must have no more than 1 non-header in parameter. Class: {0} method: {1} number of non-header parameters: {2}
+ * Cannot find HandlerChain file. class: {0}, file: {1}
*
*/
- public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
- return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
+ public static String WEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
}
- public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
- return messageFactory.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
+ public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.oneway.and.not.one.in", arg0, arg1);
}
/**
- * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
+ * Document literal bare methods annotated with @javax.jws.Oneway must have one non-header IN parameter. Class: {0} Method: {1}
*
*/
- public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
- return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
+ public static String WEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(arg0, arg1));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.class.not.found", arg0);
+ }
+
+ /**
+ * Class Not Found: {0}
+ *
+ */
+ public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
}
public static Localizable localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
- return messageFactory.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
+ return MESSAGE_FACTORY.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
}
/**
@@ -524,35 +340,287 @@
*
*/
public static String WEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
- return localizer.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
+ return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+ return MESSAGE_FACTORY.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
+ }
+
+ /**
+ * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
+ *
+ */
+ public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+ return LOCALIZER.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
+ }
+
+ public static Localizable localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
+ return MESSAGE_FACTORY.getMessage("webserviceap.init_param.format.error");
+ }
+
+ /**
+ * a