directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r902328 - in /directory/apacheds/trunk: i18n/src/main/resources/org/apache/directory/server/i18n/ ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/
Date Sat, 23 Jan 2010 01:20:59 GMT
Author: felixk
Date: Sat Jan 23 01:20:59 2010
New Revision: 902328

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

Modified:
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/DitToLdifWriter.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java

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=902328&r1=902327&r2=902328&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 01:20:59 2010
@@ -651,10 +651,10 @@
 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_630=Failed to connect to the server
+ERR_631=The specified configuration dir {0} doesn't exist under {1}
+ERR_632=The expected context entry does not exist
+ERR_633=The entry already exists
 ERR_634=
 ERR_635=
 ERR_636=

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/DitToLdifWriter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/DitToLdifWriter.java?rev=902328&r1=902327&r2=902328&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/DitToLdifWriter.java
(original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/DitToLdifWriter.java
Sat Jan 23 01:20:59 2010
@@ -25,6 +25,7 @@
 import java.io.FileWriter;
 import java.util.List;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.client.api.LdapConnection;
 import org.apache.directory.shared.ldap.client.api.messages.AddResponse;
 import org.apache.directory.shared.ldap.client.api.messages.SearchResponse;
@@ -76,7 +77,7 @@
         }
         catch( Exception e )
         {
-            throw new RuntimeException( "Failed to connect to the server", e );
+            throw new RuntimeException( I18n.err( I18n.ERR_630 ), e );
         }
     }
 
@@ -128,7 +129,7 @@
         
         if( ! dir.exists() )
         {
-            throw new Exception( "The specified configuration dir" + partitionSuffix + "
doesn't exist under " + baseDir.getAbsolutePath() );
+            throw new Exception( I18n.err( I18n.ERR_631, partitionSuffix, baseDir.getAbsolutePath()
) );
         }
         
         loadEntry( dir );

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=902328&r1=902327&r2=902328&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
(original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
Sat Jan 23 01:20:59 2010
@@ -227,7 +227,7 @@
                 }
                 else
                 {
-                    throw new NamingException( "The expected context entry does not exist"
);
+                    throw new NamingException( I18n.err( I18n.ERR_632 ) );
                 }
             }
             
@@ -550,7 +550,7 @@
         if ( ldifFile.exists() && create )
         {
             // The entry already exists
-            throw new NamingException( "The entry already exists" );
+            throw new NamingException( I18n.err( I18n.ERR_633 ) );
         }
         
         return ldifFile;

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java?rev=902328&r1=902327&r2=902328&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
(original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
Sat Jan 23 01:20:59 2010
@@ -31,6 +31,7 @@
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.partition.avl.AvlStore;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexNotFoundException;
@@ -102,7 +103,7 @@
         
         if( ! dir.exists() )
         {
-            throw new Exception( "The specified configuration dir " + upsuffixDir + " doesn't
exist under " + workingDirectory.getAbsolutePath() );
+            throw new Exception( I18n.err( I18n.ERR_631, upsuffixDir, workingDirectory.getAbsolutePath()
) );
         }
         
         loadEntry( dir );



Mime
View raw message