directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r902319 - in /directory/apacheds/trunk: i18n/src/main/java/org/apache/directory/server/i18n/ i18n/src/main/resources/org/apache/directory/server/i18n/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/ kerberos-share...
Date Sat, 23 Jan 2010 00:17:52 GMT
Author: felixk
Date: Sat Jan 23 00:17:50 2010
New Revision: 902319

URL: http://svn.apache.org/viewvc?rev=902319&view=rev
Log:
I18n

Modified:
    directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/KerberosUtils.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/CallbackHandlerBean.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java

Modified: directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
(original)
+++ directory/apacheds/trunk/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
Sat Jan 23 00:17:50 2010
@@ -638,6 +638,106 @@
     public static String ERR_597 = "ERR_597";
     public static String ERR_598 = "ERR_598";
     public static String ERR_599 = "ERR_599";
+    public static String ERR_600 = "ERR_600";
+    public static String ERR_601 = "ERR_601";
+    public static String ERR_602 = "ERR_602";
+    public static String ERR_603 = "ERR_603";
+    public static String ERR_604 = "ERR_604";
+    public static String ERR_605 = "ERR_605";
+    public static String ERR_606 = "ERR_606";
+    public static String ERR_607 = "ERR_607";
+    public static String ERR_608 = "ERR_608";
+    public static String ERR_609 = "ERR_609";
+    public static String ERR_610 = "ERR_610";
+    public static String ERR_611 = "ERR_611";
+    public static String ERR_612 = "ERR_612";
+    public static String ERR_613 = "ERR_613";
+    public static String ERR_614 = "ERR_614";
+    public static String ERR_615 = "ERR_615";
+    public static String ERR_616 = "ERR_616";
+    public static String ERR_617 = "ERR_617";
+    public static String ERR_618 = "ERR_618";
+    public static String ERR_619 = "ERR_619";
+    public static String ERR_620 = "ERR_620";
+    public static String ERR_621 = "ERR_621";
+    public static String ERR_622 = "ERR_622";
+    public static String ERR_623 = "ERR_623";
+    public static String ERR_624 = "ERR_624";
+    public static String ERR_625 = "ERR_625";
+    public static String ERR_626 = "ERR_626";
+    public static String ERR_627 = "ERR_627";
+    public static String ERR_628 = "ERR_628";
+    public static String ERR_629 = "ERR_629";
+    public static String ERR_630 = "ERR_630";
+    public static String ERR_631 = "ERR_631";
+    public static String ERR_632 = "ERR_632";
+    public static String ERR_633 = "ERR_633";
+    public static String ERR_634 = "ERR_634";
+    public static String ERR_635 = "ERR_635";
+    public static String ERR_636 = "ERR_636";
+    public static String ERR_637 = "ERR_637";
+    public static String ERR_638 = "ERR_638";
+    public static String ERR_639 = "ERR_639";
+    public static String ERR_640 = "ERR_640";
+    public static String ERR_641 = "ERR_641";
+    public static String ERR_642 = "ERR_642";
+    public static String ERR_643 = "ERR_643";
+    public static String ERR_644 = "ERR_644";
+    public static String ERR_645 = "ERR_645";
+    public static String ERR_646 = "ERR_646";
+    public static String ERR_647 = "ERR_647";
+    public static String ERR_648 = "ERR_648";
+    public static String ERR_649 = "ERR_649";
+    public static String ERR_650 = "ERR_650";
+    public static String ERR_651 = "ERR_651";
+    public static String ERR_652 = "ERR_652";
+    public static String ERR_653 = "ERR_653";
+    public static String ERR_654 = "ERR_654";
+    public static String ERR_655 = "ERR_655";
+    public static String ERR_656 = "ERR_656";
+    public static String ERR_657 = "ERR_657";
+    public static String ERR_658 = "ERR_658";
+    public static String ERR_659 = "ERR_659";
+    public static String ERR_660 = "ERR_660";
+    public static String ERR_661 = "ERR_661";
+    public static String ERR_662 = "ERR_662";
+    public static String ERR_663 = "ERR_663";
+    public static String ERR_664 = "ERR_664";
+    public static String ERR_665 = "ERR_665";
+    public static String ERR_666 = "ERR_666";
+    public static String ERR_667 = "ERR_667";
+    public static String ERR_668 = "ERR_668";
+    public static String ERR_669 = "ERR_669";
+    public static String ERR_670 = "ERR_670";
+    public static String ERR_671 = "ERR_671";
+    public static String ERR_672 = "ERR_672";
+    public static String ERR_673 = "ERR_673";
+    public static String ERR_674 = "ERR_674";
+    public static String ERR_675 = "ERR_675";
+    public static String ERR_676 = "ERR_676";
+    public static String ERR_677 = "ERR_677";
+    public static String ERR_678 = "ERR_678";
+    public static String ERR_679 = "ERR_679";
+    public static String ERR_680 = "ERR_680";
+    public static String ERR_681 = "ERR_681";
+    public static String ERR_682 = "ERR_682";
+    public static String ERR_683 = "ERR_683";
+    public static String ERR_684 = "ERR_684";
+    public static String ERR_685 = "ERR_685";
+    public static String ERR_686 = "ERR_686";
+    public static String ERR_687 = "ERR_687";
+    public static String ERR_688 = "ERR_688";
+    public static String ERR_689 = "ERR_689";
+    public static String ERR_690 = "ERR_690";
+    public static String ERR_691 = "ERR_691";
+    public static String ERR_692 = "ERR_692";
+    public static String ERR_693 = "ERR_693";
+    public static String ERR_694 = "ERR_694";
+    public static String ERR_695 = "ERR_695";
+    public static String ERR_696 = "ERR_696";
+    public static String ERR_697 = "ERR_697";
+    public static String ERR_698 = "ERR_698";
+    public static String ERR_699 = "ERR_699";
 
 
     /**

Modified: directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
(original)
+++ directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
Sat Jan 23 00:17:50 2010
@@ -618,7 +618,106 @@
 ERR_594=null for key or value is not valid
 ERR_595=This cursor locks down the key so keywise advances are not allowed.
 ERR_596=This Cursor does not support duplicate keys.
-ERR_597=
-ERR_598=
-ERR_599=
-
+ERR_597=Encoder unavailable for {0}
+ERR_598=Error accessing encoder for {0}
+ERR_599=Error instantiating encoder for {0}
+ERR_600=Decoder unavailable for {0}
+ERR_601=Error accessing decoder for {0}
+ERR_602=Error instantiating decoder for {0}
+ERR_603=AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the client key
+ERR_604=AS-REP Ticket and TGS-REP Ticket (includes TGS session key or application session
key), encrypted with the service key
+ERR_605=AS-REP encrypted part (includes TGS session key or application session key), encrypted
with the client key
+ERR_606=TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS session key
+ERR_607=TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS authenticator subkey
+ERR_608=TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator cksum, keyed with the TGS session
key
+ERR_609=TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator (includes TGS authenticator subkey),
encrypted with the TGS session key
+ERR_610=TGS-REP encrypted part (includes application session key), encrypted with the TGS
session key
+ERR_611=TGS-REP encrypted part (includes application session key), encrypted with the TGS
session key
+ERR_612=AP-REQ Authenticator cksum, keyed with the application session key
+ERR_613=AP-REQ Authenticator (includes application authenticator subkey), encrypted with
the application session key
+ERR_614=AP-REP encrypted part (includes application session subkey), encrypted with the application
session key
+ERR_615=KRB-PRIV encrypted part, encrypted with a key chosen by the application
+ERR_616={0} is not a supported encryption type.
+ERR_617=Callback not supported
+ERR_618=File is too large {0}
+ERR_619=Could not completely read file {0}
+ERR_620=Cannot put a PDU in a null buffer !
+ERR_621=The PDU buffer size is too small !
+ERR_622=Cannot encode the AuthorizationDataEntry object, the PDU size is {0} when only {1}
bytes has been allocated
+ERR_623=Account Kerberos key attribute '{0}' contained an invalid value for krb5key.
+ERR_624=Failed to get catalog context {0}
+ERR_625=Failed to get initial context {0}
+ERR_626=Kerberos key should not be a String.
+ERR_627=Can't get a session
+ERR_628=An empty name is not valid in a kerberos name
+ERR_629=A '/' at the end of a Kerberos Name is not valid.
+ERR_630=
+ERR_631=
+ERR_632=
+ERR_633=
+ERR_634=
+ERR_635=
+ERR_636=
+ERR_637=
+ERR_638=
+ERR_639=
+ERR_640=
+ERR_641=
+ERR_642=
+ERR_643=
+ERR_644=
+ERR_645=
+ERR_646=
+ERR_647=
+ERR_648=
+ERR_649=
+ERR_650=
+ERR_651=
+ERR_652=
+ERR_653=
+ERR_654=
+ERR_655=
+ERR_656=
+ERR_657=
+ERR_658=
+ERR_659=
+ERR_660=
+ERR_661=
+ERR_662=
+ERR_663=
+ERR_664=
+ERR_665=
+ERR_666=
+ERR_667=
+ERR_668=
+ERR_669=
+ERR_670=
+ERR_671=
+ERR_672=
+ERR_673=
+ERR_674=
+ERR_675=
+ERR_676=
+ERR_677=
+ERR_678=
+ERR_679=
+ERR_680=
+ERR_681=
+ERR_682=
+ERR_683=
+ERR_684=
+ERR_685=
+ERR_686=
+ERR_687=
+ERR_688=
+ERR_689=
+ERR_690=
+ERR_691=
+ERR_692=
+ERR_693=
+ERR_694=
+ERR_695=
+ERR_696=
+ERR_697=
+ERR_698=
+ERR_699=

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/KerberosUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/KerberosUtils.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/KerberosUtils.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/KerberosUtils.java
Sat Jan 23 00:17:50 2010
@@ -27,6 +27,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -169,7 +170,7 @@
                         }
                         else
                         {
-                            throw new ParseException( "An empty name is not valid in a kerberos
name", i );
+                            throw new ParseException( I18n.err( I18n.ERR_628 ), i );
                         }
                     }
                     
@@ -194,7 +195,7 @@
                         }
                         else
                         {
-                            throw new ParseException( "An empty name is not valid in a kerberos
name", i );
+                            throw new ParseException( I18n.err( I18n.ERR_628 ), i );
                         }
                     }
                     
@@ -211,7 +212,7 @@
         
         if ( escaped )
         {
-            throw new ParseException( "A '/' at the end of a Kerberos Name is not valid.",
pos );
+            throw new ParseException( I18n.err( I18n.ERR_629 ), pos );
         }
         
         return nameComponents;

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
Sat Jan 23 00:17:50 2010
@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.io.decoder.AuthenticatorDecoder;
@@ -199,7 +200,7 @@
 
         if ( clazz == null )
         {
-            throw new IOException( "Encoder unavailable for " + encodableClass );
+            throw new IOException( I18n.err( I18n.ERR_597, encodableClass ) );
         }
 
         EncoderFactory factory = null;
@@ -210,11 +211,11 @@
         }
         catch ( IllegalAccessException iae )
         {
-            throw new IOException( "Error accessing encoder for " + encodableClass );
+            throw new IOException( I18n.err( I18n.ERR_598, encodableClass ) );
         }
         catch ( InstantiationException ie )
         {
-            throw new IOException( "Error instantiating encoder for " + encodableClass );
+            throw new IOException( I18n.err( I18n.ERR_599, encodableClass ) );
         }
 
         Encoder encoder = factory.getEncoder();
@@ -229,7 +230,7 @@
 
         if ( clazz == null )
         {
-            throw new IOException( "Decoder unavailable for " + encodable );
+            throw new IOException( I18n.err( I18n.ERR_600, encodable ) );
         }
 
         DecoderFactory factory = null;
@@ -240,11 +241,11 @@
         }
         catch ( IllegalAccessException iae )
         {
-            throw new IOException( "Error accessing decoder for " + encodable );
+            throw new IOException( I18n.err( I18n.ERR_601, encodable ) );
         }
         catch ( InstantiationException ie )
         {
-            throw new IOException( "Error instantiating decoder for " + encodable );
+            throw new IOException( I18n.err( I18n.ERR_602, encodable ) );
         }
 
         Decoder decoder = factory.getDecoder();

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
Sat Jan 23 00:17:50 2010
@@ -24,6 +24,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.directory.server.i18n.I18n;
+
 
 /**
  * From RFC 4120, "The Kerberos Network Authentication Service (V5)":
@@ -44,82 +46,67 @@
     /**
      * AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the client key (Section 5.2.7.2)
      */
-    public static final KeyUsage NUMBER1 = new KeyUsage( 1,
-        "AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the client key" );
+    public static final KeyUsage NUMBER1 = new KeyUsage( 1, I18n.err( I18n.ERR_603 ) );
 
     /**
      * AS-REP Ticket and TGS-REP Ticket (includes TGS session key or application session
key), encrypted with the service key (Section 5.3)
      */
-    public static final KeyUsage NUMBER2 = new KeyUsage(
-        2,
-        "AS-REP Ticket and TGS-REP Ticket (includes TGS session key or application session
key), encrypted with the service key" );
+    public static final KeyUsage NUMBER2 = new KeyUsage( 2, I18n.err( I18n.ERR_604 ) );
 
     /**
      * AS-REP encrypted part (includes TGS session key or application session key), encrypted
with the client key (Section 5.4.2)
      */
-    public static final KeyUsage NUMBER3 = new KeyUsage( 3,
-        "AS-REP encrypted part (includes TGS session key or application session key), encrypted
with the client key" );
+    public static final KeyUsage NUMBER3 = new KeyUsage( 3, I18n.err( I18n.ERR_605 ) );
 
     /**
      * TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS session key (Section
5.4.1)
      */
-    public static final KeyUsage NUMBER4 = new KeyUsage( 4,
-        "TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS session key" );
+    public static final KeyUsage NUMBER4 = new KeyUsage( 4, I18n.err( I18n.ERR_606 ) );
 
     /**
      * TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS authenticator subkey
(Section 5.4.1)
      */
-    public static final KeyUsage NUMBER5 = new KeyUsage( 5,
-        "TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS authenticator subkey"
);
+    public static final KeyUsage NUMBER5 = new KeyUsage( 5, I18n.err( I18n.ERR_607 ) );
 
     /**
      * TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator cksum, keyed with the TGS session key
(Section 5.5.1)
      */
-    public static final KeyUsage NUMBER6 = new KeyUsage( 6,
-        "TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator cksum, keyed with the TGS session
key" );
+    public static final KeyUsage NUMBER6 = new KeyUsage( 6, I18n.err( I18n.ERR_608 ) );
 
     /**
      * TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator (includes TGS authenticator subkey),
encrypted with the TGS session key (Section 5.5.1)
      */
-    public static final KeyUsage NUMBER7 = new KeyUsage(
-        7,
-        "TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator (includes TGS authenticator subkey),
encrypted with the TGS session key" );
+    public static final KeyUsage NUMBER7 = new KeyUsage( 7, I18n.err( I18n.ERR_609 ) );
 
     /**
      * TGS-REP encrypted part (includes application session key), encrypted with the TGS
session key (Section 5.4.2)
      */
-    public static final KeyUsage NUMBER8 = new KeyUsage( 8,
-        "TGS-REP encrypted part (includes application session key), encrypted with the TGS
session key" );
+    public static final KeyUsage NUMBER8 = new KeyUsage( 8, I18n.err( I18n.ERR_610 ) );
 
     /**
      * TGS-REP encrypted part (includes application session key), encrypted with the TGS
authenticator subkey (Section 5.4.2)
      */
-    public static final KeyUsage NUMBER9 = new KeyUsage( 9,
-        "TGS-REP encrypted part (includes application session key), encrypted with the TGS
authenticator subkey" );
+    public static final KeyUsage NUMBER9 = new KeyUsage( 9, I18n.err( I18n.ERR_611 ) );
 
     /**
      * AP-REQ Authenticator cksum, keyed with the application session key (Section 5.5.1)
      */
-    public static final KeyUsage NUMBER10 = new KeyUsage( 10,
-        "AP-REQ Authenticator cksum, keyed with the application session key" );
+    public static final KeyUsage NUMBER10 = new KeyUsage( 10, I18n.err( I18n.ERR_612 ) );
 
     /**
      * AP-REQ Authenticator (includes application authenticator subkey), encrypted with the
application session key (Section 5.5.1)
      */
-    public static final KeyUsage NUMBER11 = new KeyUsage( 11,
-        "AP-REQ Authenticator (includes application authenticator subkey), encrypted with
the application session key" );
+    public static final KeyUsage NUMBER11 = new KeyUsage( 11, I18n.err( I18n.ERR_613 ) );
 
     /**
      * AP-REP encrypted part (includes application session subkey), encrypted with the application
session key (Section 5.5.2)
      */
-    public static final KeyUsage NUMBER12 = new KeyUsage( 12,
-        "AP-REP encrypted part (includes application session subkey), encrypted with the
application session key" );
+    public static final KeyUsage NUMBER12 = new KeyUsage( 12, I18n.err( I18n.ERR_614 ) );
 
     /**
      * KRB-PRIV encrypted part, encrypted with a key chosen by the application (Section 5.7.1)
      */
-    public static final KeyUsage NUMBER13 = new KeyUsage( 13,
-        "KRB-PRIV encrypted part, encrypted with a key chosen by the application" );
+    public static final KeyUsage NUMBER13 = new KeyUsage( 13, I18n.err( I18n.ERR_615 ) );
 
     /**
      * These two lines are all that's necessary to export a List of VALUES.

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
Sat Jan 23 00:17:50 2010
@@ -30,6 +30,7 @@
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
@@ -111,8 +112,7 @@
 
         if ( algorithm == null )
         {
-            throw new KerberosException( ErrorType.KDC_ERR_ETYPE_NOSUPP, encryptionType.getName()
-                + " is not a supported encryption type." );
+            throw new KerberosException( ErrorType.KDC_ERR_ETYPE_NOSUPP, I18n.err( I18n.ERR_616,
encryptionType.getName() ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/exceptions/ErrorType.java
Sat Jan 23 00:17:50 2010
@@ -33,6 +33,10 @@
  */
 public final class ErrorType implements Comparable<ErrorType>
 {
+ 
+    // TODO Add i18n. Don't no if these error messages are also a response to the client.
+    // If so shall they really be i18n?
+    
     /**
      * No error.
      */

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/CallbackHandlerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/CallbackHandlerBean.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/CallbackHandlerBean.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/CallbackHandlerBean.java
Sat Jan 23 00:17:50 2010
@@ -28,6 +28,8 @@
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
+import org.apache.directory.server.i18n.I18n;
+
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -72,7 +74,7 @@
             }
             else
             {
-                throw new UnsupportedCallbackException( callBack, "Callback not supported"
);
+                throw new UnsupportedCallbackException( callBack, I18n.err( I18n.ERR_617
) );
             }
         }
     }

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
Sat Jan 23 00:17:50 2010
@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.mina.core.buffer.IoBuffer;
 
 
@@ -194,7 +195,7 @@
         // Check to ensure that file is not larger than Integer.MAX_VALUE.
         if ( length > Integer.MAX_VALUE )
         {
-            throw new IOException( "File is too large " + file.getName() );
+            throw new IOException( I18n.err( I18n.ERR_618, file.getName() ) );
         }
 
         // Create the byte array to hold the data.
@@ -211,7 +212,7 @@
         // Ensure all the bytes have been read in.
         if ( offset < bytes.length )
         {
-            throw new IOException( "Could not completely read file " + file.getName() );
+            throw new IOException( I18n.err( I18n.ERR_619, file.getName() ) );
         }
 
         // Close the input stream and return bytes.

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
Sat Jan 23 00:17:50 2010
@@ -159,7 +159,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataEntry.java
Sat Jan 23 00:17:50 2010
@@ -23,6 +23,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.messages.value.types.AuthorizationType;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -214,7 +215,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try
@@ -236,11 +237,9 @@
         catch ( BufferOverflowException boe )
         {
             log
-                .error(
-                    "Cannot encode the AuthorizationDataEntry object, the PDU size is {}
when only {} bytes has been allocated",
-                    1 + TLV.getNbBytes( authorizationDataEntryLength ) + authorizationDataEntryLength,
buffer
-                        .capacity() );
-            throw new EncoderException( "The PDU buffer size is too small !" );
+                .error( I18n.err( I18n.ERR_622, 1 + TLV.getNbBytes( authorizationDataEntryLength
) + authorizationDataEntryLength, 
+                    buffer.capacity() ) );
+            throw new EncoderException( I18n.err( I18n.ERR_621 ) );
         }
 
         if ( IS_DEBUG )

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
Sat Jan 23 00:17:50 2010
@@ -220,7 +220,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
Sat Jan 23 00:17:50 2010
@@ -265,7 +265,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
Sat Jan 23 00:17:50 2010
@@ -269,7 +269,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
Sat Jan 23 00:17:50 2010
@@ -243,7 +243,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
Sat Jan 23 00:17:50 2010
@@ -217,7 +217,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
Sat Jan 23 00:17:50 2010
@@ -208,7 +208,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
Sat Jan 23 00:17:50 2010
@@ -376,7 +376,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( "Cannot put a PDU in a null buffer !" );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
Sat Jan 23 00:17:50 2010
@@ -203,7 +203,7 @@
     {
         if ( buffer == null )
         {
-            throw new EncoderException( I18n.err( I18n.ERR_148 ) );
+            throw new EncoderException( I18n.err( I18n.ERR_620 ) );
         }
 
         try

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
Sat Jan 23 00:17:50 2010
@@ -28,6 +28,8 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.store.operations.ChangePassword;
 import org.apache.directory.server.kerberos.shared.store.operations.GetPrincipal;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
@@ -61,7 +63,7 @@
         }
         catch ( Exception e )
         {
-            String message = "Failed to get catalog context " + catalogBaseDn;
+            String message = I18n.err( I18n.ERR_624, catalogBaseDn );
             throw new ServiceConfigurationException( message, e );
         }
     }
@@ -75,7 +77,7 @@
         }
         catch ( NamingException ne )
         {
-            String message = "Failed to get initial context " + principal.getRealm();
+            String message = I18n.err( I18n.ERR_625, principal.getRealm() );
             throw new ServiceConfigurationException( message, ne );
         }
     }
@@ -89,7 +91,7 @@
         }
         catch ( NamingException ne )
         {
-            String message = "Failed to get initial context " + principal.getRealm();
+            String message = I18n.err( I18n.ERR_625, principal.getRealm() );
             throw new ServiceConfigurationException( message, ne );
         }
     }

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
Sat Jan 23 00:17:50 2010
@@ -28,6 +28,7 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.core.entry.ServerStringValue;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.io.decoder.EncryptionKeyDecoder;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
@@ -287,7 +288,7 @@
         {
             if ( val instanceof ServerStringValue )
             {
-                throw new IllegalStateException( "Kerberos key should not be a String." );
+                throw new IllegalStateException( I18n.err( I18n.ERR_626 ) );
             }
 
             byte[] encryptionKeyBytes = val.getBytes();

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
Sat Jan 23 00:17:50 2010
@@ -24,6 +24,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.store.operations.ChangePassword;
 import org.apache.directory.server.kerberos.shared.store.operations.GetPrincipal;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
@@ -52,7 +53,7 @@
         }
         catch ( Exception e )
         {
-            throw new ServiceConfigurationException( "Can't get a session", e );
+            throw new ServiceConfigurationException( I18n.err( I18n.ERR_627 ), e );
         }
 
     }

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=902319&r1=902318&r2=902319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
(original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
Sat Jan 23 00:17:50 2010
@@ -30,6 +30,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
@@ -146,8 +147,7 @@
             }
             catch ( IOException ioe )
             {
-                throw new InvalidAttributeValueException( "Account Kerberos key attribute
'" + KerberosAttribute.KRB5_KEY_AT
-                    + "' contained an invalid value for krb5key." );
+                throw new InvalidAttributeValueException( I18n.err( I18n.ERR_623, KerberosAttribute.KRB5_KEY_AT
) );
             }
         }
 



Mime
View raw message