Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Wed Apr 16 12:32:34 2014 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Wed Apr 16 15:05:18 2014 -0700
     1.3 @@ -177,7 +177,8 @@
     1.4              throw new AbortException();
     1.5          }
     1.6          _parameters.add(p);
     1.7 -        _parametersByName.put(p.getName(), p);
     1.8 +        String name = p.getCustomName() != null ? p.getCustomName() : p.getName();
     1.9 +        _parametersByName.put(name, p);
    1.10      }
    1.11  
    1.12      public Parameter getParameterByName(String name) {

     2.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	Wed Apr 16 12:32:34 2014 -0700
     2.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	Wed Apr 16 15:05:18 2014 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -41,6 +41,7 @@
    2.11  import java.io.ByteArrayInputStream;
    2.12  import java.io.StringReader;
    2.13  import java.io.StringWriter;
    2.14 +import java.nio.charset.StandardCharsets;
    2.15  import java.text.MessageFormat;
    2.16  import java.util.*;
    2.17  
    2.18 @@ -107,7 +108,7 @@
    2.19          }
    2.20          //add w3c EPR binding
    2.21          if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){
    2.22 -            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes()));
    2.23 +            InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes(StandardCharsets.UTF_8)));
    2.24              is.setSystemId(sysId+(++i +1));
    2.25              b.schemas.add(is);
    2.26          }

     3.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Wed Apr 16 12:32:34 2014 -0700
     3.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Wed Apr 16 15:05:18 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 @@ -1791,9 +1791,9 @@
    3.11                  }
    3.12  
    3.13                  if (part.isIN()) {
    3.14 -                    setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false);
    3.15 +                    setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false);
    3.16                  } else if (outMsg != null) {
    3.17 -                    setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false);
    3.18 +                    setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false);
    3.19                  }
    3.20  
    3.21                  params.add(param);