# HG changeset patch
# User andrew
# Date 1422319572 0
# Node ID be14a67897fcac1107923aabe5218f4a88fc7c1d
# Parent  08890e0ea7826f104b5636018e2ba4a005363f31# Parent  2232599a19acc7c45baa0b3c70f072a47f1cbc22
Merge jdk7u75-b31

diff -r 08890e0ea782 -r be14a67897fc .hgtags
--- a/.hgtags	Wed Jan 21 03:56:41 2015 +0000
+++ b/.hgtags	Tue Jan 27 00:46:12 2015 +0000
@@ -505,6 +505,11 @@
 db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40
 190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
 6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
+1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
+34e3554140b7f9efe2ad20fa04dfd5faf5821248 jdk7u67-b31
+6090119e680a65addafb82f2b6227315813b7e68 jdk7u67-b32
+aa1879afbb8dc4dd157eab31c86de2845a3cad6a jdk7u67-b33
+a3290ceed5750bfc62a5ec5c00ee1aea125e9db3 jdk7u67-b34
 d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
 1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
 04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
@@ -534,3 +539,35 @@
 686552a98cae5fef622eb2a0e5fbe84bec3c11ca icedtea-2.5.4pre02
 c604500818dadbf3258d5881132c8e325a575d04 icedtea-2.5.4pre03
 9a6c9033692216a43475e64c476bc4fda2a8e3d2 icedtea-2.5.4
+a580f2c49eacc68a11cf0e724aec4a974fb77745 jdk7u71-b14
+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
+e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14
+587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30
+4257d52e30b4054c9ce43cfe830dff2b8f740037 jdk7u72-b31
+664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00
+ce5b9e0d988cb52d9e6c36edeafe60bd16280534 jdk7u75-b01
+1b6ba791cbf7d995a81dfd1478906ebae3769ea2 jdk7u75-b02
+033349ac9e45fd897571ff4f6e38ed48d46cd539 jdk7u75-b03
+f1266833b5a07aa84d5da263f4a18503838286f4 jdk7u75-b04
+bfe594779717071439b94ddc771117eedb442a25 jdk7u75-b05
+b700cddd5754a82fca4f5465116fbba516a96667 jdk7u75-b06
+781d7a0230eef7cbef89bb32bc0d722730c198e3 jdk7u75-b07
+b85627d6afbb758fc244147dfdbbd287ee524eed jdk7u75-b08
+e7aef72db8cf95b27af7c2508a02bf87b52b325b jdk7u75-b09
+d7c340b9d530da158dce7da897f66e31e83b1366 jdk7u75-b10
+4b36c07b29c32064abdfa6df09c381861875ddd4 jdk7u75-b11
+5458349b0e4860662dc5a4f96363c0e714d09c65 jdk7u75-b12
+38d474b401c6a69dfc7cea5ba79a894980fa8107 jdk7u75-b13
+4d068ffb0b544d004792b3047c5aa9ab72b53529 jdk7u75-b30
diff -r 08890e0ea782 -r be14a67897fc src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Wed Jan 21 03:56:41 2015 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Tue Jan 27 00:46:12 2015 +0000
@@ -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) {
diff -r 08890e0ea782 -r be14a67897fc src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Wed Jan 21 03:56:41 2015 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Tue Jan 27 00:46:12 2015 +0000
@@ -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);
             }
diff -r 08890e0ea782 -r be14a67897fc src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
diff -r 08890e0ea782 -r be14a67897fc src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java