src/share/classes/com/sun/security/auth/module/JndiLoginModule.java

rev 1461 : 6987827: security/util/Resources.java needs improvement
Reviewed-by: valeriep

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2006, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2010, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 686,698 ****
  
          String protocol = userProvider.substring(0, userProvider.indexOf(":"));
  
          Callback[] callbacks = new Callback[2];
          callbacks[0] = new NameCallback(protocol + " "
!                                             + rb.getString("username: "));
          callbacks[1] = new PasswordCallback(protocol + " " +
!                                                 rb.getString("password: "),
                                              false);
  
          try {
              callbackHandler.handle(callbacks);
              username = ((NameCallback)callbacks[0]).getName();
--- 686,698 ----
  
          String protocol = userProvider.substring(0, userProvider.indexOf(":"));
  
          Callback[] callbacks = new Callback[2];
          callbacks[0] = new NameCallback(protocol + " "
!                                             + rb.getString("username."));
          callbacks[1] = new PasswordCallback(protocol + " " +
!                                                 rb.getString("password."),
                                              false);
  
          try {
              callbackHandler.handle(callbacks);
              username = ((NameCallback)callbacks[0]).getName();