Mercurial > hg > openjdk > bsd-port > jaxws
changeset 1081:ba292a274415
Merge
author | asaha |
---|---|
date | Thu, 28 Aug 2014 13:53:02 -0700 |
parents | 5d60eecdd6b8 (current diff) ace21763f956 (diff) |
children | 9fed28dcccaa |
files | .hgtags |
diffstat | 4 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 29 17:50:37 2014 +0100 +++ b/.hgtags Thu Aug 28 13:53:02 2014 -0700 @@ -465,5 +465,8 @@ dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18 db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19 0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32 +bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00 +0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01 +579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02 28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20 1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Tue Jul 29 17:50:37 2014 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Thu Aug 28 13:53:02 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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,6 @@ package com.sun.tools.internal.ws.processor.model; -import com.sun.tools.internal.ws.wsdl.framework.Entity; import com.sun.tools.internal.ws.wscompile.ErrorReceiver; import com.sun.tools.internal.ws.wscompile.AbortException; import com.sun.tools.internal.ws.resources.ModelMessages; @@ -177,7 +176,8 @@ throw new AbortException(); } _parameters.add(p); - _parametersByName.put(p.getName(), p); + String name = p.getCustomName() != null ? p.getCustomName() : p.getName(); + _parametersByName.put(name, p); } public Parameter getParameterByName(String name) {
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Tue Jul 29 17:50:37 2014 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Thu Aug 28 13:53:02 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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 @@ -1757,9 +1757,9 @@ } if (part.isIN()) - setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false); + setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false); else if (outMsg != null) - setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false); + setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false); params.add(param); }
--- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Tue Jul 29 17:50:37 2014 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Thu Aug 28 13:53:02 2014 -0700 @@ -571,7 +571,8 @@ mailMap.addMailcap("text/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler"); mailMap.addMailcap("application/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler"); mailMap.addMailcap("application/fastinfoset;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler"); - mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler"); + // this handler seems to be not used according VCS history ... + // mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler"); mailMap.addMailcap("image/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.ImageDataContentHandler"); mailMap.addMailcap("text/plain;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.StringDataContentHandler"); }