harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r982174 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/ classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/modu...
Date Wed, 04 Aug 2010 09:21:33 GMT
Author: hindessm
Date: Wed Aug  4 09:21:33 2010
New Revision: 982174

URL: http://svn.apache.org/viewvc?rev=982174&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@982146:

  r982146 | hindessm | 2010-08-04 08:47:43 +0100 (Wed, 04 Aug 2010) | 4 lines
  
  Apply patch from "[#HARMONY-6599] [classlib][auth] added extra nls to
  auth/src/main/java/common/org/apache/harmony/module/keystorloginmodule.java
  package".
  


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
    harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  4 09:21:33 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820
+/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  4 09:21:33 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820
+/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  4 09:21:33 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties?rev=982174&r1=982173&r2=982174&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
Wed Aug  4 09:21:33 2010
@@ -117,3 +117,5 @@ auth.62=Protected authentication path mu
 auth.63=Failure to get KeyStore or KeyStore Password
 auth.64=KerberosErrorMessage encoder is not implemented
 auth.65=Not implemented
+auth.66=Cannot find certificate path for {0}
+auth.67=Cannot find private key for {0}

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java?rev=982174&r1=982173&r2=982174&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
Wed Aug  4 09:21:33 2010
@@ -294,9 +294,9 @@ public class KeyStoreLoginModule impleme
             Certificate[] certificates = keyStore
                     .getCertificateChain(keyStoreAlias);
             if (null == certificates || certificates.length == 0) {
-                throw new FailedLoginException(
-                        "Cannot find certificate path for " + keyStoreAlias);
-            }
+                //auth.66=Cannot find certificate path for {0}
+                throw new FailedLoginException(Messages.getString("auth.66", keyStoreAlias));
//$NON-NLS-1$
+                }
             List<Certificate> list = new ArrayList<Certificate>(
                     certificates.length);
             for (int i = 0; i < certificates.length; i++) {
@@ -312,9 +312,9 @@ public class KeyStoreLoginModule impleme
 
             Key privateKey = keyStore.getKey(keyStoreAlias, privateKeyPassword);
             if (null == privateKey || !(privateKey instanceof PrivateKey)) {
-                throw new FailedLoginException("Cannot find private key for "
-                        + keyStoreAlias);
-            }
+                //auth.67=Cannot find private key for {0}
+                throw new FailedLoginException(Messages.getString("auth.67", keyStoreAlias));
//$NON-NLS-1$
+               }
             privateCredential = new X500PrivateCredential(firstCertificate,
                     (PrivateKey) privateKey, keyStoreAlias);
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  4 09:21:33 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820
+/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  4 09:21:33 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820
+/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message