Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/.hgtags	Mon May 19 21:56:58 2014 -0700
     1.2 +++ b/.hgtags	Thu May 29 13:41:03 2014 -0700
     1.3 @@ -245,7 +245,9 @@
     1.4  32050ab53c8a8e4cb09f04b88db78258a480fb61 jdk8-b121
     1.5  bc622ba563f9316f981c11c3a260f4c3fdc5ef07 jdk8-b122
     1.6  91f5c542ccad330efc0d281362dd6f33f2039746 jdk8-b123
     1.7 +241e4effed6d4702815f54efdfb34ebd5c3990f6 jdk8u20-b00
     1.8  ef71ecbcd7bc014b1be39a6d1b3a1fb663772c14 jdk8-b124
     1.9 +ac679298539a4bc6c23e1ce00acabf10d1d93fe2 jdk8u20-b01
    1.10  ef71ecbcd7bc014b1be39a6d1b3a1fb663772c14 jdk8-b125
    1.11  7193a007a159ef9401b672af5c36c5b95e6e2943 jdk8-b126
    1.12  8e46fe36e17595c24ccdbde7b34e3cbfb6056b42 jdk8-b127
    1.13 @@ -277,4 +279,23 @@
    1.14  c29ede8e947c365ce55174eba716050c48461576 jdk8u11-b07
    1.15  ca91f03660789a75710b4a081cd32aab00e80964 jdk8u11-b08
    1.16  6e994ba1e4610b367f292a41a0d2c77091f93ab6 jdk8u11-b09
    1.17 +aa3f37b9fbdca195ac9430b8c301db7f33347241 jdk8u11-b10
    1.18 +ba061957b8bdb5f04e58154b27405fbf6fe3c71f jdk8u20-b02
    1.19 +337a3a4086235e926e1d684bf4d0b2add70d6f55 jdk8u20-b03
    1.20 +579caba2483ee3c9e32d87b31ab46e86f1aa9cd3 jdk8u20-b04
    1.21 +918ceef47cb401f64451ff58725210128176c6a6 jdk8u20-b05
    1.22 +4195c0956930bf4e161ac6b0def0d6295bfba58f jdk8-b130
    1.23 +012b935707fa24a1a88b429255f77b386e082643 jdk8-b131
    1.24 +c2be0dd15dbf0c23ee693a1af32f8f6a012abd1e jdk8-b132
    1.25 +515ddaddbb6402452f5c6a63594db5d7d71b5aa1 jdk8u20-b06
    1.26 +a61ba2e3e6c85f7067fb7b0c3c02584abdfa96be jdk8u20-b07
    1.27 +bc6d2f3426f3d04adc8245ad120e2b52fe7dfbde jdk8u20-b08
    1.28 +2e76ce4ec993c32368ef51b67873aa5ff06e1437 jdk8u20-b09
    1.29 +84f913145e2acb8474f3779d7ef154eebec9537a jdk8u20-b10
    1.30 +ce4e5885a11012edaf76ce9a6115e23acabfd282 jdk8u20-b11
    1.31 +94fbd96ebb83a3ce966c347082b079f9e4fec76a jdk8u20-b12
    1.32 +9634e8ad55c9ab691325116aff765de00dfc8410 jdk8u20-b13
    1.33 +796c274fbf5e71f1af1e9c3111518c057dcc95bd jdk8u20-b14
    1.34 +8ef9f5f9b0c5f86f325c4aad3c6dc1ff9243ea43 jdk8u20-b15
    1.35 +86741f3a4a381de18fbbfecd588660ca7a94c5ed jdk8u20-b16
    1.36  efc85d318f4697f40bdd1f3757677be97f1758d9 jdk8u25-b00

     2.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Mon May 19 21:56:58 2014 -0700
     2.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Thu May 29 13:41:03 2014 -0700
     2.3 @@ -177,7 +177,8 @@
     2.4              throw new AbortException();
     2.5          }
     2.6          _parameters.add(p);
     2.7 -        _parametersByName.put(p.getName(), p);
     2.8 +        String name = p.getCustomName() != null ? p.getCustomName() : p.getName();
     2.9 +        _parametersByName.put(name, p);
    2.10      }
    2.11  
    2.12      public Parameter getParameterByName(String name) {

     3.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	Mon May 19 21:56:58 2014 -0700
     3.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	Thu May 29 13:41:03 2014 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -41,6 +41,7 @@
    3.11  import java.io.ByteArrayInputStream;
    3.12  import java.io.StringReader;
    3.13  import java.io.StringWriter;
    3.14 +import java.nio.charset.StandardCharsets;
    3.15  import java.text.MessageFormat;
    3.16  import java.util.*;
    3.17  
    3.18 @@ -107,7 +108,7 @@
    3.19          }
    3.20          //add w3c EPR binding
    3.21          if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){
    3.22 -            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes()));
    3.23 +            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes(StandardCharsets.UTF_8)));
    3.24              is.setSystemId(sysId+(++i +1));
    3.25              b.schemas.add(is);
    3.26          }

     4.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Mon May 19 21:56:58 2014 -0700
     4.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Thu May 29 13:41:03 2014 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -1791,9 +1791,9 @@
    4.11                  }
    4.12  
    4.13                  if (part.isIN()) {
    4.14 -                    setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false);
    4.15 +                    setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false);
    4.16                  } else if (outMsg != null) {
    4.17 -                    setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false);
    4.18 +                    setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false);
    4.19                  }
    4.20  
    4.21                  params.add(param);