Mercurial > hg > release > icedtea7-forest-2.5 > jaxws
changeset 1097:ce5b9e0d988c jdk7u75-b01
Merge
author | asaha |
---|---|
date | Mon, 22 Sep 2014 09:54:29 -0700 |
parents | d6204bc9259a (diff) c18693763e10 (current diff) |
children | f0be7feb9d80 |
files | .hgtags |
diffstat | 3 files changed, 47 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 22 09:38:51 2014 -0700 +++ b/.hgtags Mon Sep 22 09:54:29 2014 -0700 @@ -473,6 +473,8 @@ db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19 0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32 28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20 +1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01 +db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40 190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31 6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33 1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01 @@ -480,3 +482,42 @@ 6090119e680a65addafb82f2b6227315813b7e68 jdk7u67-b32 aa1879afbb8dc4dd157eab31c86de2845a3cad6a jdk7u67-b33 a3290ceed5750bfc62a5ec5c00ee1aea125e9db3 jdk7u67-b34 +d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00 +1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01 +04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09 +73d97ba8b2d94c904f2b087b9f28664eb19e9ce2 jdk7u66-b10 +7ecf8d9df00c185f381fa8cb92ea66fe1e5798ca jdk7u66-b11 +9ac1d99f712a04548d7e5d784f06c87e35023080 jdk7u66-b12 +f562dd8fb2b211a11b9a84849995d61b541723c3 jdk7u66-b13 +ae584331109f291e03af72cc9fcbbe5f8f789ab1 jdk7u66-b14 +36461c772d3101a8cb1eca16a9c81ed53218a4c9 jdk7u66-b15 +19ed8a653a3e8c6536fd1090c14f93e690eda7a3 jdk7u66-b16 +ea1e6f01f95c9a0984378643754d0f493bfa4484 jdk7u66-b17 +6092d0059338df25e82fbc69cc749b95e2565547 jdk7u71-b00 +814a3f0bb13071666375dd35bab7c9cc44c62448 jdk7u71-b01 +ba22fdc22c0410b91f6f992e480d9e8b4c5e85d0 jdk7u71-b02 +30edf4d8760f96b420bd40a2d9552826435356d4 jdk7u71-b03 +22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04 +f612dbc0589894463f569fba245a98f842182d7a jdk7u71-b05 +15bdfc8b209a7c5b4e06907df11d3f795d326c14 jdk7u71-b06 +26ad03c06f31c516329059c5f053330570455887 jdk7u71-b07 +8d9d92a8e6d8610994d1596961395a4ce2bc5a69 jdk7u71-b08 +9ad7bbe28aecaf22c4f5c9ab905207ae963ec2c2 jdk7u71-b09 +32406b446fd458c6d0d8bd610eeb12d96a5f20a4 jdk7u71-b10 +b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11 +3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12 +9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13 +18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01 +e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02 +646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03 +30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04 +761c40c9076aefac72bbff913e8bc088e565386f jdk7u72-b05 +a3961ce4d5c1fd1f9cde546e62760a008b5b9d60 jdk7u72-b06 +1153553de579fbbf8c328ea47f07accf8e2d9ac2 jdk7u72-b07 +7b00d0359f49c82b38bb2f2faafae53eacc1a995 jdk7u72-b08 +f16ea19cfd03274e9e1fd5367c3f4c23accf4e75 jdk7u72-b09 +615c0d49e8927c9b03f5694df4ddb7a5e45eaf6d jdk7u72-b10 +b34f135642cddf3c15f1fecaad320cb12cbd9472 jdk7u72-b11 +cfa494e8b9bcd29ba59f1bfa3c365418b4102f71 jdk7u72-b12 +d4be88d9bfbff3e41bc4121838e90160734d9805 jdk7u72-b13 +664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon Sep 22 09:38:51 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon Sep 22 09:54:29 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 Mon Sep 22 09:38:51 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Mon Sep 22 09:54:29 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); }