directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r902558 - in /directory/apacheds/trunk: i18n/src/main/java/org/apache/directory/server/i18n/ i18n/src/main/resources/org/apache/directory/server/i18n/ server-tools/src/main/java/org/apache/directory/server/tools/ utils/src/main/java/org/apa...
Date Sun, 24 Jan 2010 12:56:43 GMT
Author: felixk
Date: Sun Jan 24 12:56:41 2010
New Revision: 902558

URL: http://svn.apache.org/viewvc?rev=902558&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/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
    directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.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=902558&r1=902557&r2=902558&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 Sun Jan 24 12:56:41 2010
@@ -738,6 +738,38 @@
     public static String ERR_697 = "ERR_697";
     public static String ERR_698 = "ERR_698";
     public static String ERR_699 = "ERR_699";
+    public static String ERR_700 = "ERR_700";
+    public static String ERR_701 = "ERR_701";
+    public static String ERR_702 = "ERR_702";
+    public static String ERR_703 = "ERR_703";
+    public static String ERR_704 = "ERR_704";
+    public static String ERR_705 = "ERR_705";
+    public static String ERR_706 = "ERR_706";
+    public static String ERR_707 = "ERR_707";
+    public static String ERR_708 = "ERR_708";
+    public static String ERR_709 = "ERR_709";
+    public static String ERR_710 = "ERR_710";
+    public static String ERR_711 = "ERR_711";
+    public static String ERR_712 = "ERR_712";
+    public static String ERR_713 = "ERR_713";
+    public static String ERR_714 = "ERR_714";
+    public static String ERR_715 = "ERR_715";
+    public static String ERR_716 = "ERR_716";
+    public static String ERR_717 = "ERR_717";
+    public static String ERR_718 = "ERR_718";
+    public static String ERR_719 = "ERR_719";
+    public static String ERR_720 = "ERR_720";
+    public static String ERR_721 = "ERR_721";
+    public static String ERR_722 = "ERR_722";
+    public static String ERR_723 = "ERR_723";
+    public static String ERR_724 = "ERR_724";
+    public static String ERR_725 = "ERR_725";
+    public static String ERR_726 = "ERR_726";
+    public static String ERR_727 = "ERR_727";
+    public static String ERR_728 = "ERR_728";
+    public static String ERR_729 = "ERR_729";
+    public static String ERR_730 = "ERR_730";
+    public static String ERR_731 = "ERR_731";
 
 
     /**

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=902558&r1=902557&r2=902558&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 Sun Jan 24 12:56:41 2010
@@ -716,8 +716,40 @@
 ERR_692=Failed to add NTLM provider
 ERR_693=Unsupported protocol type {0}
 ERR_694=Empty ID: {0}
-ERR_695=Invalid replica ID: 
-ERR_696=
-ERR_697=
-ERR_698=
-ERR_699=
+ERR_695=Invalid replica ID\: 
+ERR_696=Schema load failed : {0}
+ERR_697=The following schema directory from the installation layout could not be found\:\n\t{0}
+ERR_698=Unknown SchemaObject type: {0}
+ERR_699=Could not find entry at '{0}' to delete it!
+ERR_700=[66] Cannot delete entry {0} it has children!
+ERR_701=Cursor pos ({0}) not in value range [0-{1}]
+ERR_702=Bind requests only tunnel down into partitions if there are no authenticators to handle the mechanism.\nCheck to see if you have correctly configured authenticators for the server.
+ERR_703=This cursor is empty and cannot return elements!
+ERR_704=Cannot efficiently search the DIB w/o an index on attribute {0}\n. To allow such searches please contact the directory\nadministrator to create the index or to enable referrals on searches using these\nattributes to a replica with the required set of indices.
+ERR_705=Cannot access element if positioned before first.
+ERR_706=Cannot access element if positioned after last.
+ERR_707=AndCursors are not ordered and do not support positioning by element.
+ERR_708=Cursor has not been positioned yet.
+ERR_709=Could not find matchingRule to use for EqualityNode evaluation: {0}
+ERR_710=Unknown assertion type: {0}
+ERR_711=Unrecognized leaf node
+ERR_712=Unrecognized branch node type
+ERR_713=Unrecognized search scope value for filter scope node
+ERR_714=EqualityCursors only support positioning by element when a user index exists on the asserted attribute.
+ERR_715=Could not find matchingRule to use for GreaterEqNode evaluation: {0}
+ERR_716=LessEqCursors only support positioning by element when a user index exists on the asserted attribute.
+ERR_717=Could not find matchingRule to use for LessEqNode evaluation: {0}
+ERR_718=NotCursors are not ordered and do not support positioning by element.
+ERR_719=Scope Cursors are not ordered and do not support positioning by element.
+ERR_720=ScopeNode is not of onelevel scope.
+ERR_721=This is too inefficient without getId() on ServerEntry
+ERR_722=OrCursors are not ordered and do not support positioning by element.
+ERR_723=Must have 2 or more sub-expression Cursors for a disjunction
+ERR_724=PresenceCursors do not support positioning by element without a user index on the presence attribute.
+ERR_725=SubstringCursors may not be ordered and do not support positioning by element.
+ERR_726=Scope Cursors are not ordered and do not support positioning by element.
+ERR_727=ScopeNode is not of subtree scope.
+ERR_728=There can only be 2 columns at index 0 and at 1
+ERR_729=You didn't correctly set col names
+ERR_730=Unrecognized mode.
+ERR_731=Unrecognized FilterDialog command: {0}

Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Sun Jan 24 12:56:41 2010
@@ -107,7 +107,7 @@
         
         if ( errors.size() != 0 )
         {
-            throw new Exception( "Schema load failed : " + ExceptionUtils.printErrors( errors ) );
+            throw new Exception( I18n.err( I18n.ERR_696, ExceptionUtils.printErrors( errors ) ) );
         }
 
         
@@ -135,8 +135,7 @@
 
         if ( !schemaDirectory.exists() )
         {
-            throw new LdapConfigurationException( "The following schema directory from "
-                + "the installation layout could not be found:\n\t" + schemaDirectory );
+            throw new LdapConfigurationException( I18n.err( I18n.ERR_697, schemaDirectory ) );
         }
 
         DirectoryService directoryService = new DefaultDirectoryService();

Modified: directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java (original)
+++ directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java Sun Jan 24 12:56:41 2010
@@ -27,6 +27,7 @@
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -91,7 +92,7 @@
             return getAttributes( ( NameForm ) obj, schema, schemaManager );
         }
         
-        throw new IllegalArgumentException( "Unknown SchemaObject type: " + obj.getClass() );
+        throw new IllegalArgumentException( I18n.err( I18n.ERR_698, obj.getClass() ) );
     }
     
     

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sun Jan 24 12:56:41 2010
@@ -45,6 +45,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.Partition;
+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.search.Optimizer;
@@ -262,13 +263,12 @@
         // don't continue if id is null
         if ( id == null )
         {
-            throw new LdapNameNotFoundException( "Could not find entry at '" + dn + "' to delete it!" );
+            throw new LdapNameNotFoundException( I18n.err( I18n.ERR_699, dn ) );
         }
 
         if ( getChildCount( id ) > 0 )
         {
-            LdapContextNotEmptyException cnee = new LdapContextNotEmptyException( "[66] Cannot delete entry " + dn
-                + " it has children!" );
+            LdapContextNotEmptyException cnee = new LdapContextNotEmptyException( I18n.err( I18n.ERR_700, dn ) );
             cnee.setRemainingName( dn );
             throw cnee;
         }

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Sun Jan 24 12:56:41 2010
@@ -19,6 +19,7 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.cursor.AbstractCursor;
@@ -197,8 +198,7 @@
             return tuple.setBoth( key, values.get( pos ) );
         }
 
-        throw new InvalidCursorPositionException( "Cursor pos (" + pos
-                + ") not in value range [0-" + ( values.size() - 1 )+ "]" );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_701, pos, ( values.size() - 1 ) ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java Sun Jan 24 12:56:41 2010
@@ -33,6 +33,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -389,9 +390,7 @@
         }
 
         // does nothing
-        throw new LdapAuthenticationNotSupportedException(
-            "Bind requests only tunnel down into partitions if there are no authenticators to handle the mechanism.\n"
-                + "Check to see if you have correctly configured authenticators for the server.",
+        throw new LdapAuthenticationNotSupportedException( I18n.err( I18n.ERR_702 ),
             ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
     }
 
@@ -399,9 +398,7 @@
     public final void bind( BindOperationContext bindContext ) throws Exception
     {
         // does nothing
-        throw new LdapAuthenticationNotSupportedException(
-            "Bind requests only tunnel down into partitions if there are no authenticators to handle the mechanism.\n"
-                + "Check to see if you have correctly configured authenticators for the server.",
+        throw new LdapAuthenticationNotSupportedException( I18n.err( I18n.ERR_702 ),
             ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
     }
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Sun Jan 24 12:56:41 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 
@@ -90,7 +91,7 @@
     public IndexEntry<K,E> get() throws Exception
     {
         checkNotClosed( "get()" );
-        throw new InvalidCursorPositionException( "This cursor is empty and cannot return elements!" );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_703 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/IndexNotFoundException.java Sun Jan 24 12:56:41 2010
@@ -22,6 +22,8 @@
 
 import javax.naming.NamingException;
 
+import org.apache.directory.server.i18n.I18n;
+
 
 /**
  * NamingException for missing indicies if full table scans are disallowed.
@@ -44,10 +46,7 @@
      */
     public IndexNotFoundException(String indexName)
     {
-        super( "Cannot efficiently search the DIB w/o an index on attribute " + indexName
-            + "\n. To allow such searches please contact the "
-            + "directory\nadministrator to create the index or to enable "
-            + "referrals on searches using these\nattributes to a replica with " + "the required set of indices." );
+        super( I18n.err( I18n.ERR_704, indexName ) );
         this.indexName = indexName;
     }
 

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Sun Jan 24 12:56:41 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.xdbm;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 
@@ -197,11 +198,11 @@
 
         if ( beforeFirst )
         {
-            throw new InvalidCursorPositionException( "Cannot access element if positioned before first." );
+            throw new InvalidCursorPositionException( I18n.err( I18n.ERR_705 ) );
         }
         else
         {
-            throw new InvalidCursorPositionException( "Cannot access element if positioned after last." );
+            throw new InvalidCursorPositionException( I18n.err( I18n.ERR_706 ) );
         }
     }
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java Sun Jan 24 12:56:41 2010
@@ -30,6 +30,7 @@
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 
@@ -42,8 +43,7 @@
  */
 public class AndCursor<V> extends AbstractIndexCursor<V, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "AndCursors are not ordered and do not support positioning by element.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_707 );
     private final IndexCursor<V,ServerEntry> wrapped;
     private final List<Evaluator<? extends ExprNode, ServerEntry>> evaluators;
     private boolean available = false;
@@ -158,7 +158,7 @@
             return wrapped.get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Sun Jan 24 12:56:41 2010
@@ -26,6 +26,7 @@
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.entry.Value;
 
@@ -248,7 +249,7 @@
             return ( IndexEntry<V, ServerEntry> ) ndnIdxCursor.get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Sun Jan 24 12:56:41 2010
@@ -24,6 +24,7 @@
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
@@ -79,8 +80,7 @@
 
             if ( mr == null )
             {
-                throw new IllegalStateException(
-                    "Could not find matchingRule to use for EqualityNode evaluation: " + node );
+                throw new IllegalStateException( I18n.err( I18n.ERR_709, node ) );
             }
 
             normalizer = mr.getNormalizer();

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java Sun Jan 24 12:56:41 2010
@@ -27,6 +27,7 @@
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -116,7 +117,7 @@
                 throw new NotImplementedException();
 
             default:
-                throw new IllegalStateException( "Unknown assertion type: " + node.getAssertionType() );
+                throw new IllegalStateException( I18n.err( I18n.ERR_710, node.getAssertionType() ) );
         }
     }
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Sun Jan 24 12:56:41 2010
@@ -38,6 +38,7 @@
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.Store;
@@ -166,7 +167,7 @@
             }
             else
             {
-                throw new IllegalArgumentException( "Unrecognized leaf node" );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_711 ) );
             }
         }
         // --------------------------------------------------------------------
@@ -196,7 +197,7 @@
             }
             else
             {
-                throw new IllegalArgumentException( "Unrecognized branch node type" );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_712 ) );
             }
         }
 
@@ -384,7 +385,7 @@
                 }
             
             default:
-                throw new IllegalArgumentException( "Unrecognized search scope " + "value for filter scope node" );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_713 ) );
         }
     }
 }

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Sun Jan 24 12:56:41 2010
@@ -26,6 +26,7 @@
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.entry.Value;
 
@@ -42,8 +43,7 @@
  */
 public class EqualityCursor<V> extends AbstractIndexCursor<V, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "EqualityCursors only support positioning by element when a user index exists on the asserted attribute.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_714 );
 
     /** An equality evaluator for candidates */
     @SuppressWarnings("unchecked")
@@ -249,7 +249,7 @@
             return ( IndexEntry<V, ServerEntry> )ndnIdxCursor.get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java Sun Jan 24 12:56:41 2010
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.shared.ldap.NotImplementedException;
@@ -121,7 +122,7 @@
                 throw new NotImplementedException();
 
             default:
-                throw new IllegalStateException( "Unknown assertion type: " + node.getAssertionType() );
+                throw new IllegalStateException( I18n.err( I18n.ERR_710, node.getAssertionType() ) );
         }
     }
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Sun Jan 24 12:56:41 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Index;
@@ -358,7 +359,7 @@
                 return userIdxCursor.get();
             }
 
-            throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+            throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
         }
 
         if ( available )
@@ -366,7 +367,7 @@
             return ( IndexEntry<V, ServerEntry> ) ndnCandidate;
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Sun Jan 24 12:56:41 2010
@@ -25,6 +25,7 @@
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
@@ -88,8 +89,7 @@
 
         if ( mr == null )
         {
-            throw new IllegalStateException(
-                "Could not find matchingRule to use for GreaterEqNode evaluation: " + node );
+            throw new IllegalStateException( I18n.err( I18n.ERR_715, node ) );
         }
 
         normalizer = mr.getNormalizer();

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Sun Jan 24 12:56:41 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Index;
@@ -42,8 +43,7 @@
  */
 public class LessEqCursor<V> extends AbstractIndexCursor<V, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "LessEqCursors only support positioning by element when a user index exists on the asserted attribute.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_716 );
 
     /** An less eq evaluator for candidates */
     private final LessEqEvaluator lessEqEvaluator;
@@ -387,7 +387,7 @@
                 return userIdxCursor.get();
             }
 
-            throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+            throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
         }
 
         if ( available )
@@ -395,7 +395,7 @@
             return ndnCandidate;
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Sun Jan 24 12:56:41 2010
@@ -24,6 +24,7 @@
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
@@ -88,8 +89,7 @@
 
         if ( mr == null )
         {
-            throw new IllegalStateException(
-                "Could not find matchingRule to use for LessEqNode evaluation: " + node );
+            throw new IllegalStateException( I18n.err( I18n.ERR_717, node ) );
         }
 
         normalizer = mr.getNormalizer();

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Sun Jan 24 12:56:41 2010
@@ -26,6 +26,7 @@
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 
@@ -38,8 +39,7 @@
  */
 public class NotCursor<V> extends AbstractIndexCursor<V, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "NotCursors are not ordered and do not support positioning by element.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_718 );
     private final IndexCursor<V,ServerEntry> ndnCursor;
     private final Evaluator<? extends ExprNode, ServerEntry> childEvaluator;
     private boolean available = false;
@@ -154,7 +154,7 @@
             return ndnCursor.get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Sun Jan 24 12:56:41 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -39,8 +40,7 @@
 public class OneLevelScopeCursor extends AbstractIndexCursor<Long, ServerEntry>
 {
     /** Error message for unsupported operations */
-    private static final String UNSUPPORTED_MSG =
-        "Scope Cursors are not ordered and do not support positioning by element.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_719 );
 
     /** The entry database/store */
     private final Store<ServerEntry> db;
@@ -297,7 +297,7 @@
             return cursor.get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java Sun Jan 24 12:56:41 2010
@@ -22,6 +22,7 @@
 
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
@@ -61,7 +62,7 @@
 
         if ( node.getScope() != SearchScope.ONELEVEL )
         {
-            throw new IllegalStateException( "ScopeNode is not of onelevel scope." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_720 ) );
         }
 
         this.db = db;
@@ -138,7 +139,7 @@
      */
     public boolean evaluate( E candidate ) throws Exception
     {
-        throw new UnsupportedOperationException( "This is too inefficient without getId() on ServerEntry" );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_721 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Sun Jan 24 12:56:41 2010
@@ -26,6 +26,7 @@
 import java.util.Set;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
@@ -44,8 +45,7 @@
  */
 public class OrCursor<V> extends AbstractIndexCursor<V, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "OrCursors are not ordered and do not support positioning by element.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_722 );
     private final List<IndexCursor<V,ServerEntry>> cursors;
     private final List<Evaluator<? extends ExprNode,ServerEntry>> evaluators;
     private final List<Set<Long>> blacklists;
@@ -58,8 +58,7 @@
     {
         if ( cursors.size() <= 1 )
         {
-            throw new IllegalArgumentException(
-                "Must have 2 or more sub-expression Cursors for a disjunction" );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_723 ) );
         }
 
         this.cursors = cursors;
@@ -244,7 +243,7 @@
             return cursors.get( cursorIndex ).get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Sun Jan 24 12:56:41 2010
@@ -25,6 +25,7 @@
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
@@ -37,8 +38,7 @@
  */
 public class PresenceCursor extends AbstractIndexCursor<String, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "PresenceCursors do not support positioning by element without a user index on the presence attribute.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_724 );
     private final IndexCursor<String,ServerEntry> ndnCursor;
     private final IndexCursor<String,ServerEntry> presenceCursor;
     private final PresenceEvaluator presenceEvaluator;
@@ -234,7 +234,7 @@
                 return presenceCursor.get();
             }
 
-            throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+            throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
         }
 
         if ( available )
@@ -249,7 +249,7 @@
             return indexEntry;
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java Sun Jan 24 12:56:41 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Index;
@@ -38,8 +39,7 @@
  */
 public class SubstringCursor extends AbstractIndexCursor<String, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "SubstringCursors may not be ordered and do not support positioning by element.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_725 );
     private final boolean hasIndex;
     private final IndexCursor<String,ServerEntry> wrapped;
     private final SubstringEvaluator evaluator;
@@ -224,7 +224,7 @@
             return indexEntry;
         }
 
-        throw new InvalidCursorPositionException( "Cursor has yet to be positioned." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Sun Jan 24 12:56:41 2010
@@ -25,6 +25,7 @@
 
 import org.apache.directory.server.core.entry.ServerAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
@@ -201,7 +202,7 @@
 
     private boolean evaluateWithIndex( ServerEntry entry ) throws Exception
     {
-        throw new UnsupportedOperationException( "This is too inefficient without getId() on ServerEntry" );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_721 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Sun Jan 24 12:56:41 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -37,8 +38,7 @@
  */
 public class SubtreeScopeCursor extends AbstractIndexCursor<Long, ServerEntry>
 {
-    private static final String UNSUPPORTED_MSG =
-        "Scope Cursors are not ordered and do not support positioning by element.";
+    private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_726 );
 
     /** The Entry database/store */
     private final Store<ServerEntry> db;
@@ -326,7 +326,7 @@
             return cursor.get();
         }
 
-        throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
+        throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java Sun Jan 24 12:56:41 2010
@@ -22,6 +22,7 @@
 
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
 import org.apache.directory.server.xdbm.search.Evaluator;
@@ -75,7 +76,7 @@
 
         if ( node.getScope() != SearchScope.SUBTREE )
         {
-            throw new IllegalStateException( "ScopeNode is not of subtree scope." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_727 ) );
         }
 
         baseId = db.getEntryId( node.getBaseDn() );
@@ -256,7 +257,7 @@
      */
     public boolean evaluate( E candidate ) throws Exception
     {
-        throw new UnsupportedOperationException( "This is too inefficient without getId() on ServerEntry" );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_721 ) );
     }
 
 

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Sun Jan 24 12:56:41 2010
@@ -25,6 +25,7 @@
 import javax.swing.table.AbstractTableModel;
 
 import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 
@@ -112,7 +113,7 @@
         }
         else
         {
-            throw new RuntimeException( "There can only be 2 columns at index " + "0 and at 1" );
+            throw new RuntimeException( I18n.err( I18n.ERR_728 ) );
         }
     }
 
@@ -173,7 +174,7 @@
         }
         else
         {
-            throw new RuntimeException( "You didn't correctly set col names" );
+            throw new RuntimeException( I18n.err( I18n.ERR_729 ) );
         }
     }
 

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java Sun Jan 24 12:56:41 2010
@@ -44,6 +44,8 @@
 import javax.swing.JTextField;
 import javax.swing.border.TitledBorder;
 
+import org.apache.directory.server.i18n.I18n;
+
 
 /**
  * A dialog for the filter.
@@ -217,7 +219,7 @@
         }
         else
         {
-            throw new RuntimeException( "Unrecognized mode." );
+            throw new RuntimeException( I18n.err( I18n.ERR_730 ) );
         }
     }
 

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=902558&r1=902557&r2=902558&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Sun Jan 24 12:56:41 2010
@@ -63,6 +63,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
+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.IndexEntry;
@@ -549,7 +550,7 @@
             }
             else
             {
-                throw new RuntimeException( "Unrecognized mode." );
+                throw new RuntimeException( I18n.err( I18n.ERR_730 ) );
             }
         }
         catch ( Exception e )
@@ -589,7 +590,7 @@
                 }
                 else
                 {
-                    throw new RuntimeException( "Unrecognized FilterDialog command: " + cmd );
+                    throw new RuntimeException( I18n.err( I18n.ERR_731, cmd ) );
                 }
 
                 dialog.setVisible( false );



Mime
View raw message