# HG changeset patch # User mkos # Date 1417529029 -3600 # Node ID 86d4f46e622a1e70a4d3125d13ed00f025655256 # Parent 9fffb959eb4197ff806e4ac12244761815b4deee 8065870: Update JAX-WS RI integration to latest version (2.2.11-b141124.1933) Reviewed-by: smarks diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java Tue Dec 02 15:03:49 2014 +0100 @@ -27,7 +27,6 @@ import com.sun.istack.internal.FinalArrayList; import com.sun.istack.internal.SAXException2; - import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -69,14 +68,14 @@ private boolean containsPrefixMapping(String prefix, String uri) { for( int i=0; i getCheckedExceptions(); } diff -r 9fffb959eb41 -r 86d4f46e622a 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 Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java Tue Dec 02 15:03:49 2014 +0100 @@ -482,6 +482,7 @@ private static final java.lang.String P_MAX_ELEMENT_DEPTH = "com.ctc.wstx.maxElementDepth"; private static final java.lang.String P_MAX_CHARACTERS = "com.ctc.wstx.maxCharacters"; private static final java.lang.String P_INTERN_NSURIS = "org.codehaus.stax2.internNsUris"; + private static final java.lang.String P_RETURN_NULL_FOR_DEFAULT_NAMESPACE = "com.ctc.wstx.returnNullForDefaultNamespace"; public Woodstox(XMLInputFactory xif) { super(xif); @@ -552,6 +553,19 @@ LOGGER.log(Level.FINE, P_MAX_CHARACTERS + " is {0}", maxCharacters); } } + //Using try/catch instead of isPropertySupported because Woodstox + //isPropertySupported is not always reliable + try { + //this is needed to make sure Woodstox behavior is spec compliant for + //calls to XMLStreamReader.getNamespacePrefix + xif.setProperty(P_RETURN_NULL_FOR_DEFAULT_NAMESPACE, Boolean.TRUE); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, P_RETURN_NULL_FOR_DEFAULT_NAMESPACE + " is {0}", xif.getProperty(P_RETURN_NULL_FOR_DEFAULT_NAMESPACE)); + } + } catch (Throwable t) { + //ignore - this should not happen Woodstox 4.1.2 or later (maybe older version of Woodstox). + LOGGER.log(Level.WARNING, "Expected property not found in Woodstox input factory: '{0}'", P_RETURN_NULL_FOR_DEFAULT_NAMESPACE); + } } @Override diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java Tue Dec 02 15:03:49 2014 +0100 @@ -37,6 +37,7 @@ import com.sun.xml.internal.ws.message.FaultMessage; import com.sun.xml.internal.ws.model.CheckedExceptionImpl; import com.sun.xml.internal.ws.model.JavaMethodImpl; +import com.sun.xml.internal.ws.spi.db.WrapperComposite; import com.sun.xml.internal.ws.spi.db.XMLBridge; import com.sun.xml.internal.ws.util.DOMUtil; import com.sun.xml.internal.ws.util.StringUtils; @@ -306,6 +307,7 @@ try{ Node detailNode = getDetail().getDetails().get(0); Object jaxbDetail = getJAXBObject(detailNode, ce); + if (jaxbDetail instanceof Exception) return (Exception)jaxbDetail; Constructor exConstructor; try{ exConstructor = exceptionClass.getConstructor(String.class, detailBean); @@ -330,8 +332,7 @@ return createDetailFromUserDefinedException(ce, exception); } try { - Method m = exception.getClass().getMethod("getFaultInfo"); - return m.invoke(exception); + return ce.getFaultInfoGetter().invoke(exception); } catch (Exception e) { throw new SerializationException(e); } @@ -339,6 +340,7 @@ private static Object createDetailFromUserDefinedException(CheckedExceptionImpl ce, Object exception) { Class detailBean = ce.getDetailBean(); + if (ce.getExceptionClass().equals(detailBean)) return exception; Field[] fields = detailBean.getDeclaredFields(); try { Object detail = detailBean.newInstance(); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -95,6 +95,10 @@ createJAXBContext(); } + public BindingInfo databindingInfo() { + return databindingInfo; + } + /** * Link {@link SEIModel} to {@link WSDLModel}. * Merge it with {@link #postProcess()}. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,6 +25,8 @@ package com.sun.xml.internal.ws.model; +import java.lang.reflect.Method; + import com.sun.xml.internal.bind.api.Bridge; import com.sun.xml.internal.ws.api.model.CheckedException; import com.sun.xml.internal.ws.api.model.ExceptionType; @@ -52,6 +54,7 @@ private final JavaMethodImpl javaMethod; private String messageName; private String faultAction = ""; + private Method faultInfoGetter; /** * @param jm {@link JavaMethodImpl} that throws this exception @@ -127,5 +130,11 @@ return WsaActionUtil.getDefaultFaultAction(javaMethod,this); } + public Method getFaultInfoGetter() { + return faultInfoGetter; + } + public void setFaultInfoGetter(Method faultInfoGetter) { + this.faultInfoGetter = faultInfoGetter; + } } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -101,7 +101,7 @@ public XMLBridge getInlinedRepeatedElementBridge() { TypeInfo itemType = getItemType(); - if (itemType != null) { + if (itemType != null && itemType.getWrapperType() == null) { XMLBridge xb = getOwner().getXMLBridge(itemType); if (xb != null) return new RepeatedElementBridge(typeInfo, xb); } @@ -255,6 +255,11 @@ void fillTypes(List types) { TypeInfo itemType = getItemType(); - types.add((itemType != null) ? itemType : getTypeInfo()); + if (itemType != null) { + types.add(itemType); + if (itemType.getWrapperType() != null) types.add(getTypeInfo()); + } else { + types.add(getTypeInfo()); + } } } diff -r 9fffb959eb41 -r 86d4f46e622a 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 Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ import com.sun.xml.internal.ws.spi.db.WrapperComposite; import static com.sun.xml.internal.ws.binding.WebServiceFeatureList.getSoapVersion; +import static com.sun.xml.internal.ws.model.Utils.REFLECTION_NAVIGATOR; import javax.jws.*; import javax.jws.WebParam.Mode; @@ -381,6 +382,7 @@ try { return loader.loadClass(className); } catch (ClassNotFoundException e) { + if (noWrapperGen()) return exception; logger.fine("Dynamically creating exception bean Class " + className); return WrapperBeanGenerator.createExceptionBean(className, exception, targetNamespace, name, namespace, loader, decapitalizeExceptionBeanProperties); } @@ -885,7 +887,7 @@ //set the actual type argument of Holder in the TypeReference if (isHolder) { if(clazzType==Holder.class){ - clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]); + clazzType = erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]); } } Mode paramMode = isHolder ? Mode.INOUT : Mode.IN; @@ -1100,7 +1102,7 @@ //set the actual type argument of Holder in the TypeReference if (isHolder) { if (clazzType==Holder.class) - clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]); + clazzType = erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]); } Mode paramMode = isHolder ? Mode.INOUT : Mode.IN; for (Annotation annotation : pannotations[pos]) { @@ -1210,7 +1212,8 @@ continue; if (RUNTIME_EXCEPTION_CLASS.isAssignableFrom(exception) || REMOTE_EXCEPTION_CLASS.isAssignableFrom(exception)) continue; - + if (getAnnotation(exception, javax.xml.bind.annotation.XmlTransient.class) != null) + continue; Class exceptionBean; Annotation[] anns; WebFault webFault = getAnnotation(exception, WebFault.class); @@ -1246,6 +1249,7 @@ CheckedExceptionImpl checkedException = new CheckedExceptionImpl(javaMethod, exception, typeRef, exceptionType); checkedException.setMessageName(messageName); + checkedException.setFaultInfoGetter(faultInfoMethod); for(FaultAction fa: faultActions) { if(fa.className().equals(exception) && !fa.value().equals("")) { checkedException.setFaultAction(fa.value()); @@ -1346,7 +1350,7 @@ //set the actual type argument of Holder in the TypeReference if (isHolder) { if (clazzType==Holder.class) - clazzType = (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]); + clazzType = erasure(((ParameterizedType)genericParameterTypes[pos]).getActualTypeArguments()[0]); } Mode paramMode = isHolder ? Mode.INOUT : Mode.IN; @@ -1434,14 +1438,14 @@ private Class getAsyncReturnType(Method method, Class returnType) { if(Response.class.isAssignableFrom(returnType)){ Type ret = method.getGenericReturnType(); - return (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)ret).getActualTypeArguments()[0]); + return erasure(((ParameterizedType)ret).getActualTypeArguments()[0]); }else{ Type[] types = method.getGenericParameterTypes(); Class[] params = method.getParameterTypes(); int i = 0; for(Class cls : params){ if(AsyncHandler.class.isAssignableFrom(cls)){ - return (Class) Utils.REFLECTION_NAVIGATOR.erasure(((ParameterizedType)types[i]).getActualTypeArguments()[0]); + return erasure(((ParameterizedType)types[i]).getActualTypeArguments()[0]); } i++; } @@ -1733,5 +1737,7 @@ return new QName(ns, localPart); } - + static public Class erasure(Type type) { + return (Class)REFLECTION_NAVIGATOR.erasure(type); + } } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/ServiceArtifactSchemaGenerator.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/ServiceArtifactSchemaGenerator.java Tue Dec 02 15:03:49 2014 +0100 @@ -0,0 +1,226 @@ +/* + * Copyright (c) 2014, 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.spi.db; + +import static com.sun.xml.internal.ws.model.RuntimeModeler.DocWrappeeNamespapceQualified; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Map.Entry; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static com.sun.xml.internal.ws.wsdl.writer.WSDLGenerator.XsdNs; + +import javax.xml.bind.JAXBException; +import javax.xml.bind.SchemaOutputResolver; +import javax.xml.namespace.QName; +import javax.xml.transform.Result; +import javax.xml.ws.WebServiceException; + +import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ComplexType; +import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Element; +import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ExplicitGroup; +import com.sun.xml.internal.bind.v2.schemagen.xmlschema.LocalElement; +import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Occurs; +import com.sun.xml.internal.txw2.TXW; +import com.sun.xml.internal.txw2.output.ResultFactory; +import com.sun.xml.internal.ws.api.model.SEIModel; +import com.sun.xml.internal.ws.model.AbstractSEIModelImpl; +import com.sun.xml.internal.ws.model.JavaMethodImpl; +import com.sun.xml.internal.ws.model.ParameterImpl; +import com.sun.xml.internal.ws.model.WrapperParameter; +import com.sun.xml.internal.ws.wsdl.writer.document.xsd.Schema; + +/** + * ServiceArtifactSchemaGenerator generates XML schema for service artifacts including the wrapper types of + * document-literal stype operation and exceptions. + * + * @author shih-chang.chen@oracle.com + */ +public class ServiceArtifactSchemaGenerator { + + protected AbstractSEIModelImpl model; + protected SchemaOutputResolver xsdResolver; + + public ServiceArtifactSchemaGenerator(SEIModel model) { + this.model = (AbstractSEIModelImpl)model; + } + + static final String FilePrefix = "jaxwsGen"; + protected int fileIndex = 0; + protected Schema create(String tns) { + try { + Result res = xsdResolver.createOutput(tns, FilePrefix + (fileIndex++) + ".xsd"); + return TXW.create(Schema.class, ResultFactory.createSerializer(res)); + } catch (IOException e) { + // TODO Auto-generated catch block + throw new WebServiceException(e); + } + } + + public void generate(SchemaOutputResolver resolver) { + xsdResolver = resolver; + List wrappers = new ArrayList(); + for (JavaMethodImpl method : model.getJavaMethods()) { + if(method.getBinding().isRpcLit()) continue; + for (ParameterImpl p : method.getRequestParameters()) { + if (p instanceof WrapperParameter) { + if (WrapperComposite.class.equals((((WrapperParameter)p).getTypeInfo().type))) { + wrappers.add((WrapperParameter)p); + } + } + } + for (ParameterImpl p : method.getResponseParameters()) { + if (p instanceof WrapperParameter) { + if (WrapperComposite.class.equals((((WrapperParameter)p).getTypeInfo().type))) { + wrappers.add((WrapperParameter)p); + } + } + } + } + if (wrappers.isEmpty()) return; + HashMap xsds = initWrappersSchemaWithImports(wrappers); + postInit(xsds); + for(WrapperParameter wp : wrappers) { + String tns = wp.getName().getNamespaceURI(); + Schema xsd = xsds.get(tns); + Element e = xsd._element(Element.class); + e._attribute("name", wp.getName().getLocalPart()); + e.type(wp.getName()); + ComplexType ct = xsd._element(ComplexType.class); + ct._attribute("name", wp.getName().getLocalPart()); + ExplicitGroup sq = ct.sequence(); + for (ParameterImpl p : wp.getWrapperChildren() ) if (p.getBinding().isBody()) addChild(sq, p); + } + for(Schema xsd: xsds.values()) xsd.commit(); + } + + protected void postInit(HashMap xsds) { + } + + protected void addChild(ExplicitGroup sq, ParameterImpl param) { + TypeInfo typeInfo = param.getItemType(); + boolean repeatedElement = false; + if (typeInfo == null) { + typeInfo = param.getTypeInfo(); + } else { + if (typeInfo.getWrapperType() != null) typeInfo = param.getTypeInfo(); + else repeatedElement = true; + } + Occurs child = addChild(sq, param.getName(), typeInfo); + if (repeatedElement && child != null) { + child.maxOccurs("unbounded"); + } + } + + protected Occurs addChild(ExplicitGroup sq, QName name, TypeInfo typeInfo) { + LocalElement le = null;; + QName type = model.getBindingContext().getTypeName(typeInfo); + if (type != null) { + le = sq.element(); + le._attribute("name", name.getLocalPart()); + le.type(type); + } else { + if (typeInfo.type instanceof Class) { + try { + QName elemName = model.getBindingContext().getElementName((Class)typeInfo.type); + if (elemName.getLocalPart().equals("any") && elemName.getNamespaceURI().equals(XsdNs)) { + return sq.any(); + } else { + le = sq.element(); + le.ref(elemName); + } + } catch (JAXBException je) { + throw new WebServiceException(je.getMessage(), je); + } + } + } + return le; + } + + //All the imports have to go first ... + private HashMap initWrappersSchemaWithImports(List wrappers) { + Object o = model.databindingInfo().properties().get(DocWrappeeNamespapceQualified); + boolean wrappeeQualified = (o!= null && o instanceof Boolean) ? ((Boolean) o) : false; + HashMap xsds = new HashMap(); + HashMap> imports = new HashMap>(); + for(WrapperParameter wp : wrappers) { + String tns = wp.getName().getNamespaceURI(); + Schema xsd = xsds.get(tns); + if (xsd == null) { + xsd = create(tns); + xsd.targetNamespace(tns); + if (wrappeeQualified) xsd._attribute("elementFormDefault", "qualified"); + xsds.put(tns, xsd); + } + for (ParameterImpl p : wp.getWrapperChildren() ) { + String nsToImport = (p.getBinding().isBody())? bodyParamNS(p): null; + if (nsToImport != null && !nsToImport.equals(tns) && !nsToImport.equals("http://www.w3.org/2001/XMLSchema")) { + Set importSet = imports.get(tns); + if (importSet == null) { + importSet = new HashSet(); + imports.put(tns, importSet); + } + importSet.add(nsToImport); + } + } + } + for(Entry> entry: imports.entrySet()) { + String tns = entry.getKey(); + Set importSet = entry.getValue(); + Schema xsd = xsds.get(tns); + for(String nsToImport : importSet) xsd._namespace(nsToImport, true); + for(String nsToImport : importSet) { + com.sun.xml.internal.ws.wsdl.writer.document.xsd.Import imp = xsd._import(); + imp.namespace(nsToImport); + } + } + return xsds; + } + + protected String bodyParamNS(ParameterImpl p) { + String nsToImport = null; + TypeInfo typeInfo = p.getItemType(); + if (typeInfo == null) typeInfo = p.getTypeInfo(); + QName type = model.getBindingContext().getTypeName(typeInfo); + if (type != null) { + nsToImport = type.getNamespaceURI(); + } else { + if (typeInfo.type instanceof Class) { + try { + QName elemRef = model.getBindingContext().getElementName((Class)typeInfo.type); + if (elemRef != null) nsToImport = elemRef.getNamespaceURI(); + } catch (JAXBException je) { + throw new WebServiceException(je.getMessage(), je); + } + } + } + return nsToImport; + } +} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -33,8 +33,7 @@ import java.util.Map; import javax.xml.namespace.QName; - -import com.sun.xml.internal.bind.v2.model.nav.Navigator; +import javax.xml.bind.annotation.XmlElementWrapper; /** * A reference to a JAXB-bound type. @@ -75,6 +74,8 @@ private TypeInfo parentCollectionType; + private TypeInfo wrapperType; + private Type genericType; private boolean nillable = true; @@ -172,7 +173,6 @@ } public TypeInfo getItemType() { -// System.out.println("????? TypeInfo " + type); if (type instanceof Class && ((Class)type).isArray() && !byte[].class.equals(type)) { Type componentType = ((Class)type).getComponentType(); Type genericComponentType = null; @@ -183,6 +183,7 @@ } TypeInfo ti =new TypeInfo(tagName, componentType, annotations); if (genericComponentType != null) ti.setGenericType(genericComponentType); + for(Annotation anno : annotations) if (anno instanceof XmlElementWrapper) ti.wrapperType = this; return ti; } // if (type instanceof Class && java.util.Collection.class.isAssignableFrom((Class)type)) { @@ -193,4 +194,8 @@ } return null; } + + public TypeInfo getWrapperType() { + return wrapperType; + } } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -483,7 +483,7 @@ assert docs.size() > 1; final StringBuilder sb = new StringBuilder("\n"); @@ -521,7 +521,7 @@ String systemId = e.getValue(); String ns = e.getKey(); sb.append("\n"); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2014, 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 @@ -274,7 +274,7 @@ V-030 = Attribute value "{0}" does not name a notation V-031 = Attribute value "{0}" does not name an unparsed entity V-032 = NMTOKENS attributes must have at least one value -# Empty content model is a special type of XML element. I�d leave the message in English as is (also libraries from outside of Oracle use this exact message) but the word EMPTY can be translated. +# Empty content model is a special type of XML element. I'd leave the message in English as is (also libraries from outside of Oracle use this exact message) but the word EMPTY can be translated. V-033 = Empty content models must have no content # Usage not found. TODO Remove #V-034 = Element "{0}" does not allow "{1}" -- {2} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties Tue Dec 02 15:03:49 2014 +0100 @@ -23,7 +23,7 @@ # questions. # -build-id=2.2.11-b140602.1731 -build-version=JAX-WS RI 2.2.11-b140602.1731 +build-id=2.2.11-b141124.1933 +build-version=JAX-WS RI 2.2.11-b141124.1933 major-version=2.2.11 -svn-revision=a684014c13b34abb8b9613e106f44f59abea206f +svn-revision=312b19a2e0e312b55e1ea6f531bd595955cd581f diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java --- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,18 +71,11 @@ import com.sun.xml.internal.ws.wsdl.writer.document.soap.Header; import com.sun.xml.internal.ws.wsdl.writer.document.soap.SOAPAddress; import com.sun.xml.internal.ws.wsdl.writer.document.soap.SOAPFault; -import com.sun.xml.internal.ws.wsdl.writer.document.xsd.Schema; import com.sun.xml.internal.ws.spi.db.BindingContext; import com.sun.xml.internal.ws.spi.db.BindingHelper; -import com.sun.xml.internal.ws.spi.db.TypeInfo; -import com.sun.xml.internal.ws.spi.db.WrapperComposite; import com.sun.xml.internal.ws.util.RuntimeVersion; import com.sun.xml.internal.ws.policy.jaxws.PolicyWSDLGeneratorExtension; import com.sun.xml.internal.ws.encoding.soap.streaming.SOAPNamespaceConstants; -import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Element; -import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ComplexType; -import com.sun.xml.internal.bind.v2.schemagen.xmlschema.ExplicitGroup; -import com.sun.xml.internal.bind.v2.schemagen.xmlschema.LocalElement; import javax.jws.soap.SOAPBinding.Style; import javax.jws.soap.SOAPBinding.Use; @@ -100,12 +93,12 @@ import javax.xml.ws.WebServiceException; import org.w3c.dom.Document; +import org.w3c.dom.NodeList; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -129,22 +122,6 @@ */ private static final String DOT_WSDL = ".wsdl"; /** - * Constant String appended to response message names - */ - private static final String RESPONSE = "Response"; - /** - * constant String used for part name for wrapped request messages - */ - private static final String PARAMETERS = "parameters"; - /** - * the part name for unwrappable response messages - */ - private static final String RESULT = "parameters"; - /** - * the part name for response messages that are not unwrappable - */ - private static final String UNWRAPPABLE_RESULT = "result"; - /** * The WSDL namespace */ private static final String WSDL_NAMESPACE = WSDLConstants.NS_WSDL; @@ -196,6 +173,9 @@ * Constant String to flag the URL to replace at runtime for the endpoint */ private static final String REPLACE_WITH_ACTUAL_URL = "REPLACE_WITH_ACTUAL_URL"; + + static public final String XsdNs = "http://www.w3.org/2001/XMLSchema"; + private Set processedExceptions = new HashSet(); private WSBinding binding; private String wsdlLocation; @@ -468,6 +448,13 @@ Transformer t = tf.newTransformer(); for (DOMResult xsd : resolver.nonGlassfishSchemas) { Document doc = (Document) xsd.getNode(); + if (inlineSchemas) { + NodeList importList = doc.getDocumentElement().getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "import"); + for(int i = 0; i < importList.getLength(); i++) { + org.w3c.dom.Element impElem = (org.w3c.dom.Element)importList.item(i); + impElem.removeAttribute("schemaLocation"); + } + } SAXResult sax = new SAXResult(new TXWContentHandler(types)); t.transform(new DOMSource(doc.getDocumentElement()), sax); } @@ -477,64 +464,6 @@ throw new WebServiceException(e.getMessage(), e); } } - generateWrappers(); - } - - void generateWrappers() { - List wrappers = new ArrayList(); - for (JavaMethodImpl method : model.getJavaMethods()) { - if(method.getBinding().isRpcLit()) continue; - for (ParameterImpl p : method.getRequestParameters()) { - if (p instanceof WrapperParameter) { - if (WrapperComposite.class.equals((((WrapperParameter)p).getTypeInfo().type))) { - wrappers.add((WrapperParameter)p); - } - } - } - for (ParameterImpl p : method.getResponseParameters()) { - if (p instanceof WrapperParameter) { - if (WrapperComposite.class.equals((((WrapperParameter)p).getTypeInfo().type))) { - wrappers.add((WrapperParameter)p); - } - } - } - } - if (wrappers.isEmpty()) return; - HashMap xsds = new HashMap(); - for(WrapperParameter wp : wrappers) { - String tns = wp.getName().getNamespaceURI(); - Schema xsd = xsds.get(tns); - if (xsd == null) { - xsd = types.schema(); - xsd.targetNamespace(tns); - xsds.put(tns, xsd); - } - Element e = xsd._element(Element.class); - e._attribute("name", wp.getName().getLocalPart()); - e.type(wp.getName()); - ComplexType ct = xsd._element(ComplexType.class); - ct._attribute("name", wp.getName().getLocalPart()); - ExplicitGroup sq = ct.sequence(); - for (ParameterImpl p : wp.getWrapperChildren() ) { - if (p.getBinding().isBody()) { - LocalElement le = sq.element(); - le._attribute("name", p.getName().getLocalPart()); - TypeInfo typeInfo = p.getItemType(); - boolean repeatedElement = false; - if (typeInfo == null) { - typeInfo = p.getTypeInfo(); - } else { - repeatedElement = true; - } - QName type = model.getBindingContext().getTypeName(typeInfo); - le.type(type); - if (repeatedElement) { - le.minOccurs(0); - le.maxOccurs("unbounded"); - } - } - } - } } /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotatable.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,6 +50,14 @@ JAnnotationUse annotate(Class clazz); /** + * Removes annotation from this program element. + * + * @param annotation + * The annotation to be removed from the program element + */ + boolean removeAnnotation(JAnnotationUse annotation); + + /** * Adds an annotation to this program element * and returns a type-safe writer to fill in the values of such annotations. */ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -252,6 +252,11 @@ return a; } + + public boolean removeAnnotation(JAnnotationUse annotation) { + return this.values.remove(annotation); + } + public W annotate2(Class clazz) { return TypedAnnotationWriter.create(clazz,this); } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JDefinedClass.java Tue Dec 02 15:03:49 2014 +0100 @@ -895,6 +895,10 @@ return TypedAnnotationWriter.create(clazz,this); } + public boolean removeAnnotation(JAnnotationUse annotation) { + return this.annotations.remove(annotation); + } + /** * {@link JAnnotatable#annotations()} */ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JEnumConstant.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -132,6 +132,9 @@ return TypedAnnotationWriter.create(clazz,this); } + public boolean removeAnnotation(JAnnotationUse annotation) { + return this.annotations.remove(annotation); + } /** * {@link JAnnotatable#annotations()} */ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JMethod.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -267,6 +267,10 @@ return TypedAnnotationWriter.create(clazz,this); } + public boolean removeAnnotation(JAnnotationUse annotation) { + return this.annotations.remove(annotation); + } + public Collection annotations() { if (annotations == null) annotations = new ArrayList(); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPackage.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -388,6 +388,10 @@ return TypedAnnotationWriter.create(clazz,this); } + public boolean removeAnnotation(JAnnotationUse annotation) { + return this.annotations.remove(annotation); + } + public Collection annotations() { if (annotations == null) annotations = new ArrayList(); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JVar.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -177,6 +177,10 @@ return TypedAnnotationWriter.create(clazz,this); } + public boolean removeAnnotation(JAnnotationUse annotation) { + return this.annotations.remove(annotation); + } + public Collection annotations() { if (annotations == null) annotations = new ArrayList(); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -62,6 +62,9 @@ if(ch=='&') out.write("&"); else + if(ch=='>') + out.write(">"); + else out.write(ch); } diff -r 9fffb959eb41 -r 86d4f46e622a 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 Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties Tue Dec 02 15:03:49 2014 +0100 @@ -30,10 +30,10 @@ Non-existent directory: {0} VERSION = \ - schemagen 2.2.11-b140528.1207 + schemagen 2.2.12-b141016.1821 FULLVERSION = \ - schemagen full version "2.2.11-b140528.1207" + schemagen full version "2.2.12-b141016.1821" USAGE = \ Usage: schemagen [-options ...] \n\ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.11-b140528.1207" +FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.12-b141016.1821" USAGE = Verwendung: schemagen [-options ...] \nOptionen: \n\\ \\ \\ \\ -d : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = Directorio no existente: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = versi\u00F3n completa de schemagen "2.2.11-b140528.1207" +FULLVERSION = versi\u00F3n completa de schemagen "2.2.12-b141016.1821" USAGE = Sintaxis: schemagen [-options ...] \nOpciones: \n\\ \\ \\ \\ -d : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = version compl\u00E8te de schemagen "2.2.11-b140528.1207" +FULLVERSION = version compl\u00E8te de schemagen "2.2.12-b141016.1821" USAGE = Syntaxe : schemagen [-options ...] \nOptions : \n\ \ \ \ -d : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = Directory non esistente: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = versione completa schemagen "2.2.11-b140528.1207" +FULLVERSION = versione completa schemagen "2.2.12-b141016.1821" USAGE = Uso: schemagen [-options ...] \nOpzioni: \n\ \ \ \ -d : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.11-b140528.1207" +FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b141016.1821" USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059 diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.11-b140528.1207" +FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.12-b141016.1821" USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] \n\uC635\uC158: \n\ \ \ \ -d : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0} -VERSION = gera\u00E7\u00E3o do esquema 2.2.11-b140528.1207 +VERSION = gera\u00E7\u00E3o do esquema 2.2.12-b141016.1821 -FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.11-b140528.1207" +FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.12-b141016.1821" USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.11-b140528.1207" +FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821" USAGE = \u7528\u6CD5: schemagen [-options ...] \n\u9009\u9879: \n\ \ \ \ -d : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties Tue Dec 02 15:03:49 2014 +0100 @@ -27,8 +27,8 @@ BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0} -VERSION = schemagen 2.2.11-b140528.1207 +VERSION = schemagen 2.2.12-b141016.1821 -FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.11-b140528.1207" +FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821" USAGE = \u7528\u6CD5: schemagen [-options ...] \n\u9078\u9805: \n\\ \\ \\ \\ -d : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -57,6 +57,9 @@ * @author Bhakti Mehta */ public class SchemaGenerator { + + private static final Logger LOGGER = Logger.getLogger(SchemaGenerator.class.getName()); + /** * Runs the schema generator. */ @@ -72,7 +75,7 @@ } return run(args, cl); } catch(Exception e) { - System.err.println(e.getMessage()); + LOGGER.log(Level.SEVERE, e.getMessage(), e); return -1; } } @@ -206,9 +209,9 @@ return f.getPath(); } } catch (URISyntaxException ex) { - Logger.getLogger(SchemaGenerator.class.getName()).log(Level.SEVERE, null, ex); + LOGGER.log(Level.SEVERE, ex.getMessage(), ex); } catch (MalformedURLException ex) { - Logger.getLogger(SchemaGenerator.class.getName()).log(Level.SEVERE, null, ex); + LOGGER.log(Level.SEVERE, ex.getMessage(), ex); } return null; } @@ -225,8 +228,9 @@ StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null); JavacOptions options = JavacOptions.parse(compiler, fileManager, args); List unrecognizedOptions = options.getUnrecognizedOptions(); - if (!unrecognizedOptions.isEmpty()) - Logger.getLogger(SchemaGenerator.class.getName()).log(Level.WARNING, "Unrecognized options found: {0}", unrecognizedOptions); + if (!unrecognizedOptions.isEmpty()) { + LOGGER.log(Level.WARNING, "Unrecognized options found: {0}", unrecognizedOptions); + } Iterable compilationUnits = fileManager.getJavaFileObjectsFromFiles(options.getFiles()); JavaCompiler.CompilationTask task = compiler.getTask( null, diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/ap/Options.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,11 +58,7 @@ public void parseArguments(String[] args) throws BadCommandLineException { for (int i = 0 ; i +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn Driver.FilePrologComment = \ - This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11-b140528.1207 \n\ + This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b141016.1821 \n\ See http://java.sun.com/xml/jaxb \n\ Any modifications to this file will be lost upon recompilation of the source schema. \n\ Generated on: {0} \n Driver.Version = \ - xjc 2.2.11-b140528.1207 + xjc 2.2.12-b141016.1821 Driver.FullVersion = \ - xjc full version "2.2.11-b140528.1207" + xjc full version "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11-b140528.1207 generiert \nSiehe http://java.sun.com/xml/jaxb \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b141016.1821 generiert \nSiehe http://java.sun.com/xml/jaxb \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.11-b140528.1207" +Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.11-b140528.1207 \nVisite http://java.sun.com/xml/jaxb \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.12-b141016.1821 \nVisite http://java.sun.com/xml/jaxb \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = versi\u00F3n completa de xjc "2.2.11-b140528.1207" +Driver.FullVersion = versi\u00F3n completa de xjc "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = Echec de la production du code. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.11-b140528.1207 \nVoir http://java.sun.com/xml/jaxb \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.12-b141016.1821 \nVoir http://java.sun.com/xml/jaxb \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = version compl\u00E8te xjc "2.2.11-b140528.1207" +Driver.FullVersion = version compl\u00E8te xjc "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = Produzione del codice non riuscita. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.11-b140528.1207 \nVedere http://java.sun.com/xml/jaxb \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.12-b141016.1821 \nVedere http://java.sun.com/xml/jaxb \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = versione completa xjc "2.2.11-b140528.1207" +Driver.FullVersion = versione completa xjc "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = \u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.11-b140528.1207\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \nhttp://java.sun.com/xml/jaxb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.12-b141016.1821\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \nhttp://java.sun.com/xml/jaxb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.11-b140528.1207" +Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.11-b140528.1207 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \nhttp://java.sun.com/xml/jaxb\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.12-b141016.1821 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \nhttp://java.sun.com/xml/jaxb\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n -Driver.Version = XJC 2.2.11-b140528.1207 +Driver.Version = XJC 2.2.12-b141016.1821 -Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.11-b140528.1207" +Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.11-b140528.1207 \nConsulte http://java.sun.com/xml/jaxb \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.12-b141016.1821 \nConsulte http://java.sun.com/xml/jaxb \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = vers\u00E3o completa de xjc "2.2.11-b140528.1207" +Driver.FullVersion = vers\u00E3o completa de xjc "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002 -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.11-b140528.1207 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee http://java.sun.com/xml/jaxb \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.12-b141016.1821 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee http://java.sun.com/xml/jaxb \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.11-b140528.1207" +Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties Tue Dec 02 15:03:49 2014 +0100 @@ -96,14 +96,14 @@ Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc. -# DO NOT localize the 2.2.11-b140528.1207 string - it is a token for an mvn -Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11-b140528.1207 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 http://java.sun.com/xml/jaxb \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n +# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn +Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b141016.1821 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 http://java.sun.com/xml/jaxb \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n -Driver.Version = xjc 2.2.11-b140528.1207 +Driver.Version = xjc 2.2.12-b141016.1821 -Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.11-b140528.1207" +Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821" -Driver.BuildID = 2.2.11-b140528.1207 +Driver.BuildID = 2.2.12-b141016.1821 # for JDK integration - include version in source zip jaxb.jdk.version=@@JAXB_JDK_VERSION@@ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,24 +25,15 @@ package com.sun.tools.internal.xjc.addon.episode; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.sun.tools.internal.xjc.BadCommandLineException; import com.sun.tools.internal.xjc.Options; import com.sun.tools.internal.xjc.Plugin; import com.sun.tools.internal.xjc.outline.ClassOutline; +import com.sun.tools.internal.xjc.outline.EnumOutline; import com.sun.tools.internal.xjc.outline.Outline; -import com.sun.tools.internal.xjc.outline.EnumOutline; import com.sun.tools.internal.xjc.reader.Const; +import com.sun.xml.internal.bind.v2.schemagen.episode.Bindings; +import com.sun.xml.internal.bind.v2.schemagen.episode.SchemaBindings; import com.sun.xml.internal.txw2.TXW; import com.sun.xml.internal.txw2.output.StreamSerializer; import com.sun.xml.internal.xsom.XSAnnotation; @@ -65,13 +56,21 @@ import com.sun.xml.internal.xsom.XSWildcard; import com.sun.xml.internal.xsom.XSXPath; import com.sun.xml.internal.xsom.visitor.XSFunction; -import com.sun.xml.internal.bind.v2.schemagen.episode.Bindings; -import com.sun.xml.internal.bind.v2.schemagen.episode.SchemaBindings; - import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Creates the episode file, * @@ -106,7 +105,7 @@ try { // reorganize qualifying components by their namespaces to // generate the list nicely - Map perSchema = new HashMap(); + Map perSchema = new LinkedHashMap(); boolean hasComponentInNoNamespace = false; // Combine classes and enums into a single list @@ -172,10 +171,9 @@ group.scd("x-schema::"+(tns.equals("")?"":"tns")); SchemaBindings schemaBindings = group.schemaBindings(); schemaBindings.map(false); - if (ps.packageNames.size() == 1) - { - final String packageName = ps.packageNames.iterator().next(); - if (packageName != null && packageName.length() > 0) { + if (ps.packageNames.size() == 1) { + final String packageName = ps.packageNames.iterator().next(); + if (packageName != null && packageName.length() > 0) { schemaBindings._package().name(packageName); } } @@ -285,7 +283,6 @@ CLASS(new BindingsBuilder() { public void build(OutlineAdaptor adaptor, Bindings bindings) { bindings.klass().ref(adaptor.implName); - } }), ENUM(new BindingsBuilder() { @@ -304,7 +301,7 @@ void build(OutlineAdaptor adaptor, Bindings bindings); } - }; + } private final XSComponent schemaComponent; private final OutlineType outlineType; @@ -331,10 +328,9 @@ private final Set packageNames = new HashSet(); - private void add(OutlineAdaptor outlineAdaptor) - { - this.outlineAdaptors.add(outlineAdaptor); - this.packageNames.add(outlineAdaptor.packageName); + private void add(OutlineAdaptor outlineAdaptor) { + this.outlineAdaptors.add(outlineAdaptor); + this.packageNames.add(outlineAdaptor.packageName); } } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -31,16 +31,12 @@ import com.sun.tools.internal.xjc.outline.FieldOutline; import com.sun.tools.internal.xjc.outline.ClassOutline; import com.sun.tools.internal.xjc.outline.FieldAccessor; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.model.CPropertyInfo; import com.sun.tools.internal.xjc.model.CElementInfo; import com.sun.tools.internal.xjc.model.CReferencePropertyInfo; -import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JExpression; import com.sun.codemodel.internal.JBlock; -import com.sun.codemodel.internal.JVar; -import com.sun.codemodel.internal.JConditional; import com.sun.codemodel.internal.JExpr; import com.sun.codemodel.internal.JCodeModel; import com.sun.codemodel.internal.JInvocation; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +40,7 @@ import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JVar; import com.sun.tools.internal.xjc.model.CElementInfo; -import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED; +import static com.sun.tools.internal.xjc.model.Aspect.EXPOSED; import com.sun.tools.internal.xjc.outline.FieldAccessor; import com.sun.tools.internal.xjc.outline.FieldOutline; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +26,6 @@ package com.sun.tools.internal.xjc.api.impl.s2j; import javax.xml.bind.JAXBElement; -import javax.xml.namespace.QName; import com.sun.codemodel.internal.JType; import com.sun.codemodel.internal.JBlock; @@ -34,9 +33,7 @@ import com.sun.codemodel.internal.JConditional; import com.sun.codemodel.internal.JExpr; import com.sun.codemodel.internal.JExpression; -import com.sun.codemodel.internal.JCodeModel; -import com.sun.codemodel.internal.JInvocation; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.FieldOutline; import com.sun.tools.internal.xjc.outline.FieldAccessor; import com.sun.tools.internal.xjc.model.CElementInfo; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +36,7 @@ import com.sun.tools.internal.xjc.model.CAdapter; import com.sun.tools.internal.xjc.model.TypeUse; import com.sun.tools.internal.xjc.model.nav.NType; -import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED; +import static com.sun.tools.internal.xjc.model.Aspect.EXPOSED; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapterMarker; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +25,7 @@ package com.sun.tools.internal.xjc.generator.bean; -import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED; +import static com.sun.tools.internal.xjc.model.Aspect.EXPOSED; import java.io.Serializable; import java.net.URL; @@ -90,7 +90,7 @@ import com.sun.tools.internal.xjc.model.CTypeRef; import com.sun.tools.internal.xjc.model.Model; import com.sun.tools.internal.xjc.model.CClassRef; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.ClassOutline; import com.sun.tools.internal.xjc.outline.EnumConstantOutline; import com.sun.tools.internal.xjc.outline.EnumOutline; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +39,7 @@ import com.sun.codemodel.internal.JMod; import com.sun.codemodel.internal.JType; import com.sun.tools.internal.xjc.model.CElementInfo; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.ElementOutline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +42,7 @@ import com.sun.codemodel.internal.JVar; import com.sun.tools.internal.xjc.generator.annotation.spec.XmlAccessorTypeWriter; import com.sun.tools.internal.xjc.model.CClassInfo; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2014, 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,7 +26,7 @@ METHOD_COLLISION = \ The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision. -# {0} - enumeration constant value (but something that couldn�t be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name. +# {0} - enumeration constant value (but something that couldn't be translated to a valid java identifier e.g. starting special character, number, ..) e.g. Cannot derive a valid Java identifier from "5.6.0". Specify a customization to change the name. ERR_UNUSABLE_NAME = \ Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -51,7 +51,7 @@ import com.sun.tools.internal.xjc.model.CPropertyInfo; import com.sun.tools.internal.xjc.model.Constructor; import com.sun.tools.internal.xjc.model.Model; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.FieldAccessor; import com.sun.tools.internal.xjc.outline.FieldOutline; import com.sun.xml.internal.bind.v2.TODO; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +49,7 @@ import com.sun.tools.internal.xjc.model.CValuePropertyInfo; import com.sun.tools.internal.xjc.model.Model; import com.sun.tools.internal.xjc.outline.PackageOutline; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; /** * {@link PackageOutline} enhanced with schema2java specific diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -32,7 +32,7 @@ import com.sun.codemodel.internal.fmt.JPropertyFile; import com.sun.tools.internal.xjc.model.CElementInfo; import com.sun.tools.internal.xjc.model.Model; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.runtime.JAXBContextFactory; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +28,7 @@ import com.sun.codemodel.internal.JPackage; import com.sun.tools.internal.xjc.model.CElementInfo; import com.sun.tools.internal.xjc.model.Model; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; /** * Generates public ObjectFactory. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,8 +63,8 @@ import com.sun.tools.internal.xjc.model.CTypeRef; import com.sun.tools.internal.xjc.model.CValuePropertyInfo; import com.sun.tools.internal.xjc.model.nav.NClass; -import com.sun.tools.internal.xjc.outline.Aspect; -import static com.sun.tools.internal.xjc.outline.Aspect.IMPLEMENTATION; +import com.sun.tools.internal.xjc.model.Aspect; +import static com.sun.tools.internal.xjc.model.Aspect.IMPLEMENTATION; import com.sun.tools.internal.xjc.outline.ClassOutline; import com.sun.tools.internal.xjc.outline.FieldAccessor; import com.sun.tools.internal.xjc.outline.FieldOutline; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +38,7 @@ import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl; import com.sun.tools.internal.xjc.generator.bean.MethodWriter; import com.sun.tools.internal.xjc.model.CPropertyInfo; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.xml.internal.bind.api.impl.NameConverter; import java.io.Serializable; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +40,7 @@ import com.sun.tools.internal.xjc.model.CElement; import com.sun.tools.internal.xjc.model.CPropertyInfo; import com.sun.tools.internal.xjc.model.CReferencePropertyInfo; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.xml.internal.bind.api.impl.NameConverter; import java.io.Serializable; import java.util.Set; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +35,7 @@ import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl; import com.sun.tools.internal.xjc.generator.bean.MethodWriter; import com.sun.tools.internal.xjc.model.CPropertyInfo; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.FieldAccessor; import com.sun.xml.internal.bind.api.impl.NameConverter; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Aspect.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Aspect.java Tue Dec 02 15:03:49 2014 +0100 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 1997, 2014, 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.tools.internal.xjc.model; + +import com.sun.tools.internal.xjc.generator.bean.ImplStructureStrategy; + +/** + * Sometimes a single JAXB-generated bean spans across multiple Java classes/interfaces. + * We call them "aspects of a bean". + * + *

+ * This is an enumeration of all possible aspects. + * + * @author Kohsuke Kawaguchi + */ +public enum Aspect { + /** + * The exposed part of the bean. + *

+ * This corresponds to the content interface when we are geneting one. + * This would be the same as the {@link #IMPLEMENTATION} when we are + * just generating beans. + * + *

+ * This could be an interface, or it could be a class. + * + * We don't have any other {@link ImplStructureStrategy} at this point, + * but generally you can't assume anything about where this could be + * or whether that's equal to {@link #IMPLEMENTATION}. + */ + EXPOSED, + /** + * The part of the bean that holds all the implementations. + * + *

+ * This is always a class, never an interface. + */ + IMPLEMENTATION +} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +34,6 @@ import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; import com.sun.tools.internal.xjc.model.nav.NavigatorImpl; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.xml.internal.bind.v2.model.core.Adapter; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -31,7 +31,6 @@ import com.sun.xml.internal.bind.v2.model.util.ArrayInfoUtil; import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.xml.internal.bind.v2.model.core.ArrayInfo; import com.sun.xml.internal.xsom.XSComponent; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -85,6 +85,10 @@ public V accept(CPropertyVisitor visitor) { return visitor.onAttribute(this); } + @Override + public R accept(CPropertyVisitor2 visitor, P p) { + return visitor.visit(this, p); + } public final PropertyKind kind() { return PropertyKind.ATTRIBUTE; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -56,7 +56,6 @@ import com.sun.xml.internal.bind.v2.runtime.Location; import com.sun.tools.internal.xjc.model.nav.NType; import com.sun.tools.internal.xjc.model.nav.NavigatorImpl; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.runtime.ZeroOneBooleanAdapter; import com.sun.tools.internal.xjc.util.NamespaceContextAdapter; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -45,7 +45,6 @@ import com.sun.tools.internal.xjc.Language; import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.reader.Ring; import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder; @@ -57,7 +56,7 @@ import org.xml.sax.Locator; /** - * Mutable {@link ClassInfo} represenatation. + * Mutable {@link ClassInfo} representation. * *

* Schema parsers build these objects. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,14 +30,13 @@ import com.sun.codemodel.internal.JClass; import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIClass; import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIEnum; import com.sun.xml.internal.xsom.XSComponent; /** - * Refernece to an existing class. + * Reference to an existing class. * * @author Kohsuke Kawaguchi */ @@ -46,6 +45,11 @@ private final String fullyQualifiedClassName; /** + * Cached for both performance and single identity. + */ + private JClass clazz; + + /** * * @param decl * The {@link BIClass} declaration that has {@link BIClass#getExistingClassRef()} @@ -80,11 +84,6 @@ return this; } - /** - * Cached for both performance and single identity. - */ - private JClass clazz; - public JClass toType(Outline o, Aspect aspect) { if(clazz==null) clazz = o.getCodeModel().ref(fullyQualifiedClassName); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -43,7 +43,6 @@ import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; import com.sun.tools.internal.xjc.model.nav.NavigatorImpl; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIInlineBinaryData; import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIFactoryMethod; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -169,6 +169,11 @@ return visitor.onElement(this); } + @Override + public R accept(CPropertyVisitor2 visitor, P p) { + return visitor.visit(this, p); + } + public CAdapter getAdapter() { return adapter; } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +34,6 @@ import com.sun.codemodel.internal.JExpression; import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.xml.internal.bind.v2.model.annotation.Locatable; import com.sun.xml.internal.bind.v2.model.core.EnumLeafInfo; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +42,6 @@ import com.sun.tools.internal.xjc.model.nav.NType; import com.sun.tools.internal.xjc.reader.Ring; import com.sun.xml.internal.bind.api.impl.NameConverter; -import com.sun.xml.internal.bind.v2.WellKnownNamespace; import com.sun.xml.internal.bind.v2.model.core.PropertyInfo; import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil; import com.sun.xml.internal.xsom.XSComponent; @@ -290,6 +289,8 @@ public abstract V accept( CPropertyVisitor visitor ); + public abstract R accept( CPropertyVisitor2 visitor, P p ); + /** * Checks if the given {@link TypeUse} would need an explicit {@link XmlSchemaType} * annotation with the given type name. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor2.java Tue Dec 02 15:03:49 2014 +0100 @@ -0,0 +1,76 @@ +/* + * Copyright (c) 1997, 2014, 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.tools.internal.xjc.model; + +/** + * Visitor for {@link CPropertyInfo}. + * + * The number 2 signals number of arguments. + * + * @param the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param

the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see CPropertyInfo#accept(CPropertyVisitor2, Object) + * + * @author Marcel Valovy + */ +public interface CPropertyVisitor2 { + + /** + * Visits a CElementPropertyInfo type. + * @param t the type to visit + * @param p a visitor-specified parameter + * @return a visitor-specified result + */ + R visit(CElementPropertyInfo t, P p); + + /** + * Visits a CAttributePropertyInfo type. + * @param t the type to visit + * @param p a visitor-specified parameter + * @return a visitor-specified result + */ + R visit(CAttributePropertyInfo t, P p); + + /** + * Visits a CValuePropertyInfo type. + * @param t the type to visit + * @param p a visitor-specified parameter + * @return a visitor-specified result + */ + R visit(CValuePropertyInfo t, P p); + + /** + * Visits a CReferencePropertyInfo type. + * @param t the type to visit + * @param p a visitor-specified parameter + * @return a visitor-specified result + */ + R visit(CReferencePropertyInfo t, P p); +} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -171,6 +171,11 @@ return visitor.onReference(this); } + @Override + public R accept(CPropertyVisitor2 visitor, P p) { + return visitor.visit(this, p); + } + public CAdapter getAdapter() { return null; } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +29,6 @@ import com.sun.codemodel.internal.JType; import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.xml.internal.bind.v2.model.core.TypeInfo; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -52,4 +52,9 @@ public V accept(CPropertyVisitor visitor) { return visitor.onValue(this); } + + @Override + public R accept(CPropertyVisitor2 visitor, P p) { + return visitor.visit(this, p); + } } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +29,6 @@ import com.sun.tools.internal.xjc.model.nav.NClass; import com.sun.tools.internal.xjc.model.nav.NType; import com.sun.tools.internal.xjc.model.nav.NavigatorImpl; -import com.sun.tools.internal.xjc.outline.Aspect; import com.sun.tools.internal.xjc.outline.Outline; import com.sun.xml.internal.bind.v2.model.core.WildcardTypeInfo; diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/Model.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,20 +25,6 @@ package com.sun.tools.internal.xjc.model; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; - import com.sun.codemodel.internal.JClass; import com.sun.codemodel.internal.JCodeModel; import com.sun.codemodel.internal.JPackage; @@ -61,11 +47,23 @@ import com.sun.xml.internal.bind.v2.util.FlattenIterator; import com.sun.xml.internal.xsom.XSComponent; import com.sun.xml.internal.xsom.XSSchemaSet; - import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.helpers.LocatorImpl; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.namespace.QName; +import javax.xml.transform.Result; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + /** * Root of the object model that represents the code that needs to be generated. * @@ -92,7 +90,7 @@ * The element mappings. */ private final Map> elementMappings = - new HashMap>(); + new LinkedHashMap>(); private final Iterable allElements = new Iterable() { @@ -132,11 +130,11 @@ * stores the root object of the parse schema model. * Otherwise null. * - * @sine 2.1.1 + * @since 2.1.1 */ public final XSSchemaSet schemaComponent; - private CCustomizations gloablCustomizations = new CCustomizations(); + private CCustomizations globalCustomizations = new CCustomizations(); /** * @param nc @@ -152,13 +150,13 @@ this.defaultSymbolSpace = new SymbolSpace(codeModel); defaultSymbolSpace.setType(codeModel.ref(Object.class)); - elementMappings.put(null,new HashMap()); + elementMappings.put(null, new LinkedHashMap()); if(opts.automaticNameConflictResolution) allocator = new AutoClassNameAllocator(allocator); this.allocator = new ClassNameAllocatorWrapper(allocator); this.schemaComponent = schemaComponent; - this.gloablCustomizations.setParent(this,this); + this.globalCustomizations.setParent(this, this); } public void setNameConverter(NameConverter nameConverter) { @@ -320,7 +318,7 @@ * global element declarations to its representation class. * *

- * For other schema languages, it should follow the appendicies in + * For other schema languages, it should follow the appendices in * WSDL (but in practice no one would use WSDL with a schema language * other than XML Schema, so it doesn't really matter.) * @@ -424,7 +422,7 @@ * Gets the global customizations. */ public CCustomizations getCustomizations() { - return gloablCustomizations; + return globalCustomizations; } /** @@ -466,7 +464,7 @@ Map m = elementMappings.get(clazz); if(m==null) - elementMappings.put(clazz,m=new HashMap()); + elementMappings.put(clazz, m = new LinkedHashMap()); m.put(ei.getElementName(),ei); } diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +30,7 @@ import java.util.Set; import com.sun.codemodel.internal.JClass; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +28,7 @@ import java.lang.reflect.Type; import com.sun.codemodel.internal.JType; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +26,7 @@ package com.sun.tools.internal.xjc.model.nav; import com.sun.codemodel.internal.JClass; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +26,7 @@ package com.sun.tools.internal.xjc.model.nav; import com.sun.codemodel.internal.JClass; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +26,7 @@ package com.sun.tools.internal.xjc.model.nav; import com.sun.codemodel.internal.JClass; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,13 +26,13 @@ package com.sun.tools.internal.xjc.model.nav; import com.sun.codemodel.internal.JType; -import com.sun.tools.internal.xjc.outline.Aspect; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.outline.Outline; /** * A type. * - * See the package documentaion for details. + * See the package documentation for details. * * @author Kohsuke Kawaguchi */ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java Wed Jul 05 20:08:43 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* - * Copyright (c) 1997, 2012, 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.tools.internal.xjc.outline; - -import com.sun.tools.internal.xjc.generator.bean.ImplStructureStrategy; - -/** - * Sometimes a single JAXB-generated bean spans across multiple Java classes/interfaces. - * We call them "aspects of a bean". - * - *

- * This is an enumeration of all possible aspects. - * - * @author Kohsuke Kawaguchi - * - * TODO: move this to the model package - */ -public enum Aspect { - /** - * The exposed part of the bean. - *

- * This corresponds to the content interface when we are geneting one. - * This would be the same as the {@link #IMPLEMENTATION} when we are - * just generating beans. - * - *

- * This could be an interface, or it could be a class. - * - * We don't have any other {@link ImplStructureStrategy} at this point, - * but generally you can't assume anything about where this could be - * or whether that's equal to {@link #IMPLEMENTATION}. - */ - EXPOSED, - /** - * The part of the bean that holds all the implementations. - * - *

- * This is always a class, never an interface. - */ - IMPLEMENTATION -} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/Outline.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -33,6 +33,7 @@ import com.sun.codemodel.internal.JPackage; import com.sun.codemodel.internal.JType; import com.sun.tools.internal.xjc.ErrorReceiver; +import com.sun.tools.internal.xjc.model.Aspect; import com.sun.tools.internal.xjc.model.CClassInfo; import com.sun.tools.internal.xjc.model.CClassInfoParent; import com.sun.tools.internal.xjc.model.CElementInfo; @@ -46,13 +47,12 @@ * Root of the outline. Captures which code is generated for which model component. * *

- * This object also provides access to varioues utilities, such as + * This object also provides access to various utilities, such as * error reporting etc, for the convenience of code that builds the outline. * * @author Kohsuke Kawaguchi */ -public interface Outline -{ +public interface Outline { /** * This outline is for this model. */ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -95,7 +95,7 @@ *

* Set of system ids as strings. */ - private final Set rootDocuments = new HashSet(); + private final Set rootDocuments = new LinkedHashSet(); /** Stores location information for all the trees in this forest. */ public final LocatorTable locatorTable = new LocatorTable(); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java --- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -51,6 +51,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -125,7 +126,7 @@ return atts.values().iterator(); } - private final Map elems = new HashMap(); + private final Map elems = new LinkedHashMap(); private final Map elemsView = Collections.unmodifiableMap(elems); public void addElementDecl(XSElementDecl newDecl) { elems.put(newDecl.getName(), newDecl); @@ -204,7 +205,7 @@ return idConstraints.get(localName); } - private final Map allTypes = new HashMap(); + private final Map allTypes = new LinkedHashMap(); private final Map allTypesView = Collections.unmodifiableMap(allTypes); private final Map simpleTypes = new HashMap(); diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java Tue Dec 02 15:03:49 2014 +0100 @@ -41,7 +41,7 @@ import java.io.ByteArrayInputStream; import java.io.StringReader; import java.io.StringWriter; -import java.nio.charset.StandardCharsets; +import java.io.UnsupportedEncodingException; import java.text.MessageFormat; import java.util.*; @@ -108,7 +108,7 @@ } //add w3c EPR binding if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){ - InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes(StandardCharsets.UTF_8))); + InputSource is = new InputSource(new ByteArrayInputStream(getUTF8Bytes(w3ceprSchemaBinding))); is.setSystemId(sysId+(++i +1)); b.schemas.add(is); } @@ -123,6 +123,15 @@ return b.schemas; } + private static byte[] getUTF8Bytes(String w3ceprSchemaBinding1) { + try { + return w3ceprSchemaBinding1.getBytes("UTF-8"); + } catch (UnsupportedEncodingException unexpected) { + // should never happen + throw new IllegalStateException(unexpected); + } + } + private PseudoSchemaBuilder(WSDLDocument _wsdl) { this.wsdlDocument = _wsdl; diff -r 9fffb959eb41 -r 86d4f46e622a 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 Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 @@ } /** - * Ignoring: binding file ""{0}". It is not a jaxws or a jaxb binding file. + * Ignoring: binding file "{0}". It is not a jaxws or a jaxb binding file. * */ public static String CONFIGURATION_NOT_BINDING_FILE(Object arg0) { diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -283,20 +283,6 @@ return localizer.localize(localizableWSGEN_USAGE_EXTENSIONS()); } - public static Localizable localizablePLEASE() { - return messageFactory.getMessage("Please"); - } - - /** - * specify "-extension" and "-wsdl:protocol XSoap1.2" switches. For example: - * - * - * - */ - public static String PLEASE() { - return localizer.localize(localizablePLEASE()); - } - public static Localizable localizableWSCOMPILE_EXISTING_OPTION(Object arg0) { return messageFactory.getMessage("wscompile.existingOption", arg0); } @@ -385,6 +371,19 @@ return localizer.localize(localizableWSIMPORT_HELP(arg0)); } + public static Localizable localizableWSCOMPILE_CANT_GET_COMPILER(Object arg0, Object arg1, Object arg2) { + return messageFactory.getMessage("wscompile.cant.get.compiler", arg0, arg1, arg2); + } + + /** + * No Java compiler found. Perhaps environment/JDK problem? + * Used JVM: {0}, {1}/{2} + * + */ + public static String WSCOMPILE_CANT_GET_COMPILER(Object arg0, Object arg1, Object arg2) { + return localizer.localize(localizableWSCOMPILE_CANT_GET_COMPILER(arg0, arg1, arg2)); + } + public static Localizable localizableWSCOMPILE_ERROR(Object arg0) { return messageFactory.getMessage("wscompile.error", arg0); } @@ -557,18 +556,6 @@ return localizer.localize(localizableWSIMPORT_GENERATING_CODE()); } - public static Localizable localizableWSGEN() { - return messageFactory.getMessage("wsgen"); - } - - /** - * -wsdl:protocol XSoap1.2 -extenson {1} - * - */ - public static String WSGEN() { - return localizer.localize(localizableWSGEN()); - } - public static Localizable localizableWSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) { return messageFactory.getMessage("wsimport.NotAFileNorURL", arg0); } @@ -658,7 +645,7 @@ } /** - * "Could not create file: "{0}" + * Could not create file: "{0}" * */ public static String WSGEN_COULD_NOT_CREATE_FILE(Object arg0) { @@ -848,7 +835,7 @@ } /** - * Failed to read the WSDL document: {0}, because 1) could not find the document; /2) the document could not be read; 3) the root element of the document is not . + * Failed to read the WSDL document: {0}, because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not . * */ public static String WSIMPORT_NO_WSDL(Object arg0) { @@ -860,7 +847,7 @@ } /** - * "line {0} of {1} + * line {0} of {1} * */ public static String WSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) { @@ -922,8 +909,7 @@ } /** - * wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}. - * + * wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.Please specify "-extension" and "-wsdl:protocol XSoap1.2" switches. For example:wsgen -wsdl:protocol XSoap1.2 -extenson {1} * */ public static String WSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) { diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=Ignoring: binding file "\"{0}\". It is not a jaxws or a jaxb binding file. +configuration.notBindingFile=Ignoring: binding file \"{0}\". It is not a jaxws or a jaxb binding file. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_fr.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=Non-prise en compte : fichier de binding "\"{0}\". Il ne s''agit pas d''un fichier de binding jaxws ou jaxb. +configuration.notBindingFile=Non-prise en compte : fichier de binding \"{0}\". Il ne s''agit pas d''un fichier de binding jaxws ou jaxb. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_it.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=Il file di associazione "\"{0}\" verr\u00E0 ignorato. Non si tratta di un file di associazione jaxws o jaxb. +configuration.notBindingFile=Il file di associazione \"{0}\" verr\u00E0 ignorato. Non si tratta di un file di associazione jaxws o jaxb. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ja.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=\u7121\u8996\u3057\u307E\u3059: \u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u30FB\u30D5\u30A1\u30A4\u30EB"\"{0}\"\u3002\u3053\u308C\u306FJAXWS\u307E\u305F\u306FJAXB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 +configuration.notBindingFile=\u7121\u8996\u3057\u307E\u3059: \u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u30FB\u30D5\u30A1\u30A4\u30EB\"{0}\"\u3002\u3053\u308C\u306FJAXWS\u307E\u305F\u306FJAXB\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u30FB\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_ko.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=\uBC14\uC778\uB529 \uD30C\uC77C "\"{0}\"\uC744(\uB97C) \uBB34\uC2DC\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. JAXWS \uB610\uB294 JAXB \uBC14\uC778\uB529 \uD30C\uC77C\uC774 \uC544\uB2D9\uB2C8\uB2E4. +configuration.notBindingFile=\uBC14\uC778\uB529 \uD30C\uC77C \"{0}\"\uC744(\uB97C) \uBB34\uC2DC\uD558\uB294 \uC911\uC785\uB2C8\uB2E4. JAXWS \uB610\uB294 JAXB \uBC14\uC778\uB529 \uD30C\uC77C\uC774 \uC544\uB2D9\uB2C8\uB2E4. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_pt_BR.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=Ignorando: arquivo de bind "\"{0}\". N\u00E3o \u00E9 um arquivo bind jaxws ou jaxb. +configuration.notBindingFile=Ignorando: arquivo de bind \"{0}\". N\u00E3o \u00E9 um arquivo bind jaxws ou jaxb. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_CN.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=\u5FFD\u7565: \u7ED1\u5B9A\u6587\u4EF6 "\"{0}\"\u3002\u8BE5\u6587\u4EF6\u4E0D\u662F jaxws \u6216 jaxb \u7ED1\u5B9A\u6587\u4EF6\u3002 +configuration.notBindingFile=\u5FFD\u7565: \u7ED1\u5B9A\u6587\u4EF6 \"{0}\"\u3002\u8BE5\u6587\u4EF6\u4E0D\u662F jaxws \u6216 jaxb \u7ED1\u5B9A\u6587\u4EF6\u3002 diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/configuration_zh_TW.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,4 +25,4 @@ # Usage not found. TODO Remove #configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1}) -configuration.notBindingFile=\u5FFD\u7565: \u9023\u7D50\u6A94 "\"{0}\". \u8A72\u6A94\u6848\u4E0D\u662F jaxws \u6216 jaxb \u9023\u7D50\u6A94. +configuration.notBindingFile=\u5FFD\u7565: \u9023\u7D50\u6A94 \"{0}\". \u8A72\u6A94\u6848\u4E0D\u662F jaxws \u6216 jaxb \u9023\u7D50\u6A94. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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 @@ -162,6 +162,8 @@ wscompile.existingOption=Ignoring already defined option {0}\n wsimport.noSuchJaxbOption=no such JAXB option: {0} +wscompile.cant.get.compiler=No Java compiler found. Perhaps environment/JDK problem? \n Used JVM: {0}, {1}/{2} + wscompile.error=error: {0} wscompile.warning=warning: {0} wscompile.info=info: {0} @@ -177,7 +179,7 @@ wsgen.invalid.protocol=\"{0}\" is not a supported protocol. Supported protocols include: {1}. wsgen.invalid.transport=\"{0}\" is not a supported transport. Supported transport includes: {1}. wsgen.class.not.found=Class not found: \"{0}\" -wsgen.could.not.create.file="Could not create file: "\{0}\" +wsgen.could.not.create.file=Could not create file: \"{0}\" wsgen.missingFile=Missing SEI wsgen.soap12.without.extension=The optional protocol \"Xsoap1.2\" must be used in conjunction with the \"-extension\" option. wsgen.protocol.without.extension=The optional protocol \"{0}\" must be used in conjunction with the \"-extension\" option. @@ -192,14 +194,14 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen can not generate WSDL for non-SOAP binding: {0} on Class {1} -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.\n -Please specify \"-extension\" and \"-wsdl:protocol XSoap1.2\" switches. For example:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.\ +Please specify \"-extension\" and \"-wsdl:protocol XSoap1.2\" switches. For example:\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" must be used in conjunction with the \"-wsdl\" option wsgen.no.webservices.class=wsgen did not find any class with @WebService annotation. Please specify @WebService annotation on {0}. -wsimport.no.wsdl=Failed to read the WSDL document: {0}, because 1) could not find the document; /\ +wsimport.no.wsdl=Failed to read the WSDL document: {0}, because 1) could not find the document; \ 2) the document could not be read; \ 3) the root element of the document is not . @@ -230,7 +232,7 @@ {0}, "{1}" needs authorization, please provide authorization file with read access at {2} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.AUTH_INFO_LINENO = \ - "line {0} of {1} + line {0} of {1} wsimport.ErrorMessage = \ diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,8 +81,8 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen kann WSDL f\u00fcr Nicht-SOAP-Binding nicht generieren: {0} in Klasse {1} -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen kann WSDL f\u00fcr SOAP 1.2-Binding nicht generieren: {0} in Klasse {1} -Please geben Sie die Switches \\"-extension\\" und \\"-wsdl:protocol XSoap1.2\\" an. Beispiel:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen kann WSDL f\u00fcr SOAP 1.2-Binding nicht generieren: {0} in Klasse {1}\ +Please geben Sie die Switches \\"-extension\\" und \\"-wsdl:protocol XSoap1.2\\" an. Beispiel:\ wsgen -wsdl:protocol XSoap1.2 -extension {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" muss in Verbindung mit der Option \"-wsdl\" verwendet werden @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" erfordert Autorisierung. Geben Sie eine Autorisierungsdatei mit Lesezugriff in {2} an, oder verwenden Sie -Xauthfile, um die Autorisierungsdatei anzugeben. Geben Sie auf jeder Zeile Autorisierungsinformationen mit folgendem Format an: http[s]://user:password@host:port// -wsimport.AUTH_INFO_LINENO = "Zeile {0} von {1} +wsimport.AUTH_INFO_LINENO = Zeile {0} von {1} wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,7 +67,7 @@ wsgen.invalid.protocol=\"{0}\" no es un protocolo soportado. Los protocolos soportados son: {1}. wsgen.invalid.transport=\"{0}\" no es un transporte soportado. El transporte soportado es: {1}. wsgen.class.not.found=No se ha encontrado la clase: \"{0}\" -wsgen.could.not.create.file="No se ha podido crear el archivo: "\\{0}\" +wsgen.could.not.create.file="No se ha podido crear el archivo: \"{0}\" wsgen.missingFile=Falta la interfaz de punto final de servicio wsgen.soap12.without.extension=El protocolo opcional \\"Xsoap1.2\\" se debe utilizar junto con la opci\u00f3n \\"-extension\\". wsgen.protocol.without.extension=El protocolo opcional \"{0}\" se debe utilizar junto con la opci\u00f3n \"-extension\". @@ -81,14 +81,14 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen no puede generar WSDL para enlaces no SOAP: {0} en la clase {1} -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen no puede generar WSDL para enlaces SOAP 1.2: {0} en la clase {1}.\n -Please especifique los conmutadores \\"-extension\\" y \\"-wsdl:protocol XSoap1.2\\". Por ejemplo:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen no puede generar WSDL para enlaces SOAP 1.2: {0} en la clase {1}.\ +Please especifique los conmutadores \\"-extension\\" y \\"-wsdl:protocol XSoap1.2\\". Por ejemplo:\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\\"-inlineSchemas\\" se debe utilizar junto con la opci\u00f3n \\"-wsdl\\" wsgen.no.webservices.class=wsgen no ha encontrado ninguna clase con la anotaci\u00f3n @WebService. Especifique la anotaci\u00f3n @WebService en {0}. -wsimport.no.wsdl=Fallo al leer el documento WSDL: {0}, porque 1) no se ha encontrado el documento, /2) el documento no se ha podido leer; 3) el elemento ra\u00edz del documento no es . +wsimport.no.wsdl=Fallo al leer el documento WSDL: {0}, porque 1) no se ha encontrado el documento, 2) el documento no se ha podido leer; 3) el elemento ra\u00edz del documento no es . wsimport.FailedToParse = Fallo al analizar "{0}": {1} @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" necesita autorizaci\u00f3n. Proporcione un archivo de autorizaci\u00f3n con acceso de lectura en {2} o utilice -Xauthfile para proporcionar el archivo de autorizaci\u00f3n y, en cada l\u00ednea, proporcione la informaci\u00f3n de autorizaci\u00f3n utilizando este formato: http[s]://usuario:contrase\u00f1a@host:puerto// -wsimport.AUTH_INFO_LINENO = "l\u00ednea {0} de {1} +wsimport.AUTH_INFO_LINENO = l\u00ednea {0} de {1} wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,7 +67,7 @@ wsgen.invalid.protocol=\"{0}\" n''est pas un protocole pris en charge. Les protocoles pris en charge incluent : {1}. wsgen.invalid.transport=\"{0}\" n''est pas un transport pris en charge. Les transports pris en charge incluent : {1}. wsgen.class.not.found=Classe introuvable : \"{0}\" -wsgen.could.not.create.file="Impossible de cr\u00e9er le fichier : "\\{0}\" +wsgen.could.not.create.file=Impossible de cr\u00e9er le fichier : \"{0}\" wsgen.missingFile=interface d'adresse de service manquante wsgen.soap12.without.extension=Le protocole facultatif \"Xsoap1.2\" doit \u00eatre utilis\u00e9 avec l'option \"-extension\". wsgen.protocol.without.extension=Le protocole facultatif \"{0}\" doit \u00eatre utilis\u00e9 avec l''option \"-extension\". @@ -81,8 +81,8 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen ne peut pas g\u00e9n\u00e9rer le WSDL pour le binding non-SOAP {0} sur la classe {1} -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen ne peut pas g\u00e9n\u00e9rer le WSDL pour le binding SOAP 1.2 {0} sur la classe {1}.\n -Please indiquez les commutateurs \"-extension\" et \"-wsdl:protocol XSoap1.2\". Par exemple :\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen ne peut pas g\u00e9n\u00e9rer le WSDL pour le binding SOAP 1.2 {0} sur la classe {1}.\ +Please indiquez les commutateurs \"-extension\" et \"-wsdl:protocol XSoap1.2\". Par exemple :\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" doit \u00eatre utilis\u00e9 avec l'option \"-wsdl\" @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" n\u00e9cessite une autorisation, fournissez un fichier d''autorisation avec un acc\u00e8s en lecture \u00e0 {2} ou utilisez -Xauthfile pour donner le fichier d''autorisation et fournir sur chaque ligne les informations d''autorisation \u00e0 l''aide du format suivant : http[s]://user:password@host:port// -wsimport.AUTH_INFO_LINENO = "ligne {0} sur {1} +wsimport.AUTH_INFO_LINENO = ligne {0} sur {1} wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,8 +81,8 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen non pu\u00f2 generare WSDL per un''associazione non SOAP: {0} sulla classe {1} -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen non pu\u00f2 generare WSDL per un''associazione SOAP 1.2: {0} sulla classe {1}.\n -Please specificare i parametri \"-extension\" e \"-wsdl:protocol XSoap1.2\". Ad esempio:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen non pu\u00f2 generare WSDL per un''associazione SOAP 1.2: {0} sulla classe {1}.\ +Please specificare i parametri \"-extension\" e \"-wsdl:protocol XSoap1.2\". Ad esempio:\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" deve essere usato insieme all''opzione \"-wsdl\" @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" richiede autorizzazione. Fornire il file di autorizzazione con accesso in lettura a {2} oppure usare -Xauthfile per fornire il file di autorizzazione e su ogni riga fornire le informazioni di autorizzazione usando il formato: http[s]://user:password@host:porta// -wsimport.AUTH_INFO_LINENO = "riga {0} di {1} +wsimport.AUTH_INFO_LINENO = riga {0} di {1} wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,7 +67,7 @@ wsgen.invalid.protocol=\"{0}\"\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d7\u30ed\u30c8\u30b3\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d7\u30ed\u30c8\u30b3\u30eb\u306f\u6b21\u306e\u3068\u304a\u308a\u3067\u3059: {1}\u3002 wsgen.invalid.transport=\"{0}\"\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8\u306f\u6b21\u306e\u3068\u304a\u308a\u3067\u3059: {1}\u3002 wsgen.class.not.found=\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: \"{0}\" -wsgen.could.not.create.file="\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: "\\{0}\" +wsgen.could.not.create.file="\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: \"{0}\" wsgen.missingFile=SEI\u304c\u3042\u308a\u307e\u305b\u3093 wsgen.soap12.without.extension=\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb\"Xsoap1.2\"\u306f\u3001\"-extension\"\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u7d44\u307f\u5408\u305b\u3066\u4f7f\u7528\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 wsgen.protocol.without.extension=\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb\"{0}\"\u306f\u3001\"-extension\"\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u7d44\u307f\u5408\u305b\u3066\u4f7f\u7528\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}\u3002"{1}"\u306b\u306f\u8a8d\u8a3c\u304c\u5fc5\u8981\u3067\u3059\u3002{2}\u306b\u3042\u308b\u8a8d\u8a3c\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u53d6\u308a\u30a2\u30af\u30bb\u30b9\u306b\u3088\u308a\u6307\u5b9a\u3059\u308b\u304b\u3001-Xauthfile\u3092\u4f7f\u7528\u3057\u3066\u8a8d\u8a3c\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u3001\u5404\u884c\u3067\u6b21\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3057\u3066\u8a8d\u8a3c\u60c5\u5831\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044: http[s]://user:password@host:port// -wsimport.AUTH_INFO_LINENO = "\u884c{0}/{1} +wsimport.AUTH_INFO_LINENO = \u884c{0}/{1} wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,8 +81,8 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen\uc740 {1} \ud074\ub798\uc2a4\uc758 \ube44SOAP \ubc14\uc778\ub529 {0}\uc5d0 \ub300\ud574 WSDL\uc744 \uc0dd\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen\uc740 {1} \ud074\ub798\uc2a4\uc758 SOAP 1.2 \ubc14\uc778\ub529 {0}\uc5d0 \ub300\ud574 WSDL\uc744 \uc0dd\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.\n -Please \"-extension\" \ubc0f \"-wsdl:protocol XSoap1.2\" \uc2a4\uc704\uce58\ub97c \uc9c0\uc815\ud558\uc2ed\uc2dc\uc624. \uc608:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen\uc740 {1} \ud074\ub798\uc2a4\uc758 SOAP 1.2 \ubc14\uc778\ub529 {0}\uc5d0 \ub300\ud574 WSDL\uc744 \uc0dd\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.\ +Please \"-extension\" \ubc0f \"-wsdl:protocol XSoap1.2\" \uc2a4\uc704\uce58\ub97c \uc9c0\uc815\ud558\uc2ed\uc2dc\uc624. \uc608:\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\"\ub294 \"-wsdl\" \uc635\uc158\uacfc \ud568\uaed8 \uc0ac\uc6a9\ud574\uc57c \ud569\ub2c8\ub2e4. diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,7 +67,7 @@ wsgen.invalid.protocol=\"{0}\" n\u00e3o \u00e9 um protocolo suportado. Os protocolos suportados s\u00e3o: {1}. wsgen.invalid.transport=\"{0}\" n\u00e3o \u00e9 um transporte suportado. Os transportes suportados s\u00e3o: {1}. wsgen.class.not.found=Classe n\u00e3o encontrada: \"{0}\" -wsgen.could.not.create.file=N\u00e3o foi poss\u00edvel criar o arquivo: "\\{0}\" +wsgen.could.not.create.file=N\u00e3o foi poss\u00edvel criar o arquivo: \"{0}\" wsgen.missingFile=SEI N\u00e3o Encontrado wsgen.soap12.without.extension=O protocolo \"Xsoap1.2\" opcional deve ser usado junto com a op\u00e7\u00e3o \"-extension\". wsgen.protocol.without.extension=O protocolo \"{0}\" opcional deve ser usado junto com a op\u00e7\u00e3o \"-extension\". @@ -81,14 +81,14 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen n\u00e3o pode gerar WSDL para bind n\u00e3o-SOAP: {0} na Classe {1} -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen n\u00e3o pode gerar WSDL para bind de SOAP 1.2: {0} na classe: {1}.\n -Please especifique as chaves \"-extension\" e \"-wsdl:protocol XSoap1.2\". Por exemplo:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen n\u00e3o pode gerar WSDL para bind de SOAP 1.2: {0} na classe: {1}.\ +Please especifique as chaves \"-extension\" e \"-wsdl:protocol XSoap1.2\". Por exemplo:\ wsgen -wsdl:protocol XSoap1.2 -extension {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" deve ser usado junto com a op\u00e7\u00e3o \"-wsdl\" wsgen.no.webservices.class=wsgen n\u00e3o encontrou nenhuma classe com a anota\u00e7\u00e3o @WebService. Especifique a anota\u00e7\u00e3o @WebService em {0}. -wsimport.no.wsdl=Falha ao ler o documento WSDL: {0}, porque 1) n\u00e3o p\u00f4de localizar o documento; /2) o documento n\u00e3o p\u00f4de ser lido; 3) o elemento-raiz do documento n\u00e3o \u00e9 . +wsimport.no.wsdl=Falha ao ler o documento WSDL: {0}, porque 1) n\u00e3o p\u00f4de localizar o documento; 2) o documento n\u00e3o p\u00f4de ser lido; 3) o elemento-raiz do documento n\u00e3o \u00e9 . wsimport.FailedToParse = Falha ao fazer parse "{0}": {1} @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" precisa de autoriza\u00e7\u00e3o; forne\u00e7a o arquivo de autoriza\u00e7\u00e3o com o acesso de leitura em {2} ou use -Xauthfile para fornecer o arquivo de autoriza\u00e7\u00e3o em cada linha para fornecer informa\u00e7\u00f5es de autoriza\u00e7\u00e3o usando este formato : http[s]://user:password@host:port// -wsimport.AUTH_INFO_LINENO = "linha {0} de {1} +wsimport.AUTH_INFO_LINENO = linha {0} de {1} wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,8 +81,8 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen \u65e0\u6cd5\u5728\u7c7b{1}\u4e0a\u4e3a\u975e SOAP \u7ed1\u5b9a{0}\u751f\u6210 WSDL -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen \u65e0\u6cd5\u5728\u7c7b{1}\u4e0a\u4e3a SOAP 1.2 \u7ed1\u5b9a{0}\u751f\u6210 WSDL\u3002\n -Please \u6307\u5b9a \"-extension\" \u548c \"-wsdl:protocol XSoap1.2\" \u5f00\u5173\u3002\u4f8b\u5982:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen \u65e0\u6cd5\u5728\u7c7b{1}\u4e0a\u4e3a SOAP 1.2 \u7ed1\u5b9a{0}\u751f\u6210 WSDL\u3002\ +Please \u6307\u5b9a \"-extension\" \u548c \"-wsdl:protocol XSoap1.2\" \u5f00\u5173\u3002\u4f8b\u5982:\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" \u5fc5\u987b\u4e0e \"-wsdl\" \u9009\u9879\u7ed3\u5408\u4f7f\u7528 @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" \u9700\u8981\u6388\u6743, \u8bf7\u5728{2}\u4e2d\u63d0\u4f9b\u5177\u6709\u8bfb\u53d6\u8bbf\u95ee\u6743\u9650\u7684\u6388\u6743\u6587\u4ef6, \u6216\u8005\u4f7f\u7528 -Xauthfile \u6307\u5b9a\u6388\u6743\u6587\u4ef6\u5e76\u5728\u6bcf\u4e00\u884c\u4e0a\u4f7f\u7528\u4ee5\u4e0b\u683c\u5f0f\u63d0\u4f9b\u6388\u6743\u4fe1\u606f: http[s]://user:password@host:port// -wsimport.AUTH_INFO_LINENO = "{1}\u7684\u7b2c {0} \u884c +wsimport.AUTH_INFO_LINENO = {1}\u7684\u7b2c {0} \u884c wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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,7 +67,7 @@ wsgen.invalid.protocol=\u4e0d\u652f\u63f4 \"{0}\" \u5354\u5b9a. \u652f\u63f4\u7684\u5354\u5b9a\u5305\u62ec: {1}. wsgen.invalid.transport=\u4e0d\u652f\u63f4 \"{0}\" \u50b3\u8f38. \u652f\u63f4\u7684\u50b3\u8f38\u5305\u62ec: {1}. wsgen.class.not.found=\u627e\u4e0d\u5230\u985e\u5225: \"{0}\" -wsgen.could.not.create.file="\u7121\u6cd5\u5efa\u7acb\u6a94\u6848: "\\{0}\" +wsgen.could.not.create.file="\u7121\u6cd5\u5efa\u7acb\u6a94\u6848: \"{0}\" wsgen.missingFile=\u907a\u6f0f SEI wsgen.soap12.without.extension=\u9078\u64c7\u6027\u5354\u5b9a \"Xsoap1.2\" \u5fc5\u9808\u642d\u914d \"-extension\" \u9078\u9805\u4e00\u8d77\u4f7f\u7528. wsgen.protocol.without.extension=\u9078\u64c7\u6027\u5354\u5b9a \"{0}\" \u5fc5\u9808\u642d\u914d \"-extension\" \u9078\u9805\u4e00\u8d77\u4f7f\u7528. @@ -81,14 +81,14 @@ wsgen.cannot.gen.wsdl.for.non.soap.binding=wsgen \u7121\u6cd5\u7522\u751f\u985e\u5225 {1} \u4e4b\u975e SOAP \u9023\u7d50 {0} \u7684 WSDL -wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen \u7121\u6cd5\u7522\u751f\u985e\u5225 {1} \u4e4b SOAP 1.2 \u9023\u7d50 {0} \u7684 WSDL.\n -Please \u6307\u5b9a \"-extension\" \u548c \"-wsdl:protocol XSoap1.2\" \u53c3\u6578. \u4f8b\u5982:\n\n +wsgen.cannot.gen.wsdl.for.soap12.binding=wsgen \u7121\u6cd5\u7522\u751f\u985e\u5225 {1} \u4e4b SOAP 1.2 \u9023\u7d50 {0} \u7684 WSDL.\ +Please \u6307\u5b9a \"-extension\" \u548c \"-wsdl:protocol XSoap1.2\" \u53c3\u6578. \u4f8b\u5982:\ wsgen -wsdl:protocol XSoap1.2 -extenson {1} wsgen.inlineSchemas.only.with.wsdl=\"-inlineSchemas\" \u5fc5\u9808\u642d\u914d \"-wsdl\" \u9078\u9805\u4e00\u8d77\u4f7f\u7528 wsgen.no.webservices.class=wsgen \u627e\u4e0d\u5230\u4efb\u4f55\u542b @WebService \u8a3b\u89e3\u7684\u985e\u5225. \u8acb\u5728 {0} \u6307\u5b9a @WebService \u8a3b\u89e3. -wsimport.no.wsdl=\u7121\u6cd5\u8b80\u53d6 WSDL \u6587\u4ef6: {0}, \u56e0\u70ba 1) \u627e\u4e0d\u5230\u6587\u4ef6; /2) \u7121\u6cd5\u8b80\u53d6\u6587\u4ef6; 3) \u6587\u4ef6\u7684\u6839\u5143\u7d20\u4e0d\u662f . +wsimport.no.wsdl=\u7121\u6cd5\u8b80\u53d6 WSDL \u6587\u4ef6: {0}, \u56e0\u70ba 1) \u627e\u4e0d\u5230\u6587\u4ef6; 2) \u7121\u6cd5\u8b80\u53d6\u6587\u4ef6; 3) \u6587\u4ef6\u7684\u6839\u5143\u7d20\u4e0d\u662f . wsimport.FailedToParse = \u7121\u6cd5\u5256\u6790 "{0}": {1} @@ -107,7 +107,7 @@ # {0} - exception message, {1} - systemId (e.g. location of WSDL file) , {2} - path to metro authentication file e.g.: Server returned HTTP response code: 401 for URL: http://localhost:8080/myServer/mywebService?WSDL, "http://localhost:8080/myServer/mywebService?WSDL" needs authorization, please provide authorization file with read access at C:\Documents and Settings\user\.metro\auth or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port// wsimport.authInfoNeeded = {0}, "{1}" \u9700\u8981\u6388\u6b0a, \u8acb\u5728 {2} \u63d0\u4f9b\u5177\u6709\u8b80\u53d6\u5b58\u53d6\u6b0a\u7684\u6388\u6b0a\u6a94\u6848, \u6216\u8005\u4f7f\u7528 -Xauthfile \u6307\u5b9a\u6388\u6b0a\u6a94\u6848, \u4e26\u4e14\u5728\u6bcf\u4e00\u884c\u63d0\u4f9b\u6388\u6b0a\u8cc7\u8a0a (\u4f7f\u7528\u4ee5\u4e0b\u683c\u5f0f) : http[s]://user:password@host:port// -wsimport.AUTH_INFO_LINENO = "{1} \u7684\u7b2c {0} \u884c +wsimport.AUTH_INFO_LINENO = {1} \u7684\u7b2c {0} \u884c wsimport.ErrorMessage = [ERROR] {0} diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties Tue Dec 02 15:03:49 2014 +0100 @@ -23,7 +23,7 @@ # questions. # -build-id=2.2.11-b140602.1731 -build-version=JAX-WS RI 2.2.11-b140602.1731 +build-id=2.2.11-b141124.1933 +build-version=JAX-WS RI 2.2.11-b141124.1933 major-version=2.2.11 -svn-revision=a684014c13b34abb8b9613e106f44f59abea206f +svn-revision=312b19a2e0e312b55e1ea6f531bd595955cd581f diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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,7 +69,6 @@ import java.io.PrintStream; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -187,7 +186,11 @@ args.addAll(options.getJavacOptions(args, listener)); } - JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();// compiler = JavacTool.create(); + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + if (compiler == null) { + out.println(WscompileMessages.WSCOMPILE_CANT_GET_COMPILER(property("java.home"), property("java.version"), property("java.vendor"))); + return false; + } DiagnosticCollector diagnostics = new DiagnosticCollector(); StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, null); JavaCompiler.CompilationTask task = compiler.getTask( @@ -305,6 +308,15 @@ return true; } + private String property(String key) { + try { + String property = System.getProperty(key); + return property != null ? property : "UNKNOWN"; + } catch (SecurityException ignored) { + return "UNKNOWN"; + } + } + private List getExternalFiles(List exts) { List files = new ArrayList(); for (String ext : exts) { diff -r 9fffb959eb41 -r 86d4f46e622a jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java --- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Wed Jul 05 20:08:43 2017 +0200 +++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java Tue Dec 02 15:03:49 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -554,7 +554,8 @@ args.add(sourceFiles.get(i)); } - listener.message(WscompileMessages.WSIMPORT_COMPILING_CODE()); + if (!options.quiet) listener.message(WscompileMessages.WSIMPORT_COMPILING_CODE()); + if(options.verbose){ StringBuilder argstr = new StringBuilder(); for(String arg:args){