directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r902308 - in /directory/apacheds/trunk: i18n/src/main/resources/org/apache/directory/server/i18n/ jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
Date Fri, 22 Jan 2010 23:22:35 GMT
Author: felixk
Date: Fri Jan 22 23:22:35 2010
New Revision: 902308

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

Modified:
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainer.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.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=902308&r1=902307&r2=902308&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
Fri Jan 22 23:22:35 2010
@@ -588,36 +588,36 @@
 ERR_564=Cannot change setting while transactions are pending in the log
 ERR_565=Bad magic on log file
 ERR_566=Unexcepted exception: {0}
-ERR_567=Invalid record manager provider: {0}\n[{1}: {2}]
-ERR_568=
-ERR_569=
-ERR_570=
-ERR_571=
-ERR_572=
-ERR_573=
-ERR_574=
-ERR_575=
-ERR_576=
-ERR_577=
-ERR_578=
-ERR_579=
-ERR_580=
-ERR_581=
-ERR_582=
-ERR_583=
-ERR_584=
-ERR_585=
-ERR_586=
-ERR_587=
-ERR_588=
-ERR_589=
-ERR_590=
-ERR_591=
-ERR_592=
-ERR_593=
-ERR_594=
-ERR_595=
-ERR_596=
+ERR_567=Invalid record manager provider\: {0}\n[{1}\: {2}]
+ERR_568=Not a serialized BTreeRedirect object: {0}
+ERR_569=Not a serialized BTreeRedirect object: byte array is null.
+ERR_570=this is not an arrayTree container
+ERR_571=this is not a btreeRedirect container
+ERR_572=This cursor can only be used with tables that have duplicate keys enabled.
+ERR_573=Value based advances not supported.
+ERR_574=No Equality MatchingRule available for attribute {0}
+ERR_575=The {0} property for an index cannot be set after it has been initialized.
+ERR_576=Cannot set jdbm store property {0} after initialization.
+ERR_577=Errors encountered on destroy()
+ERR_578=[36] aliasDereferencingProblem - attempt to create alias to itself.
+ERR_579=[36] aliasDereferencingProblem - attempt to create alias with cycle to relative {0}
not allowed from descendent alias {1} 
+ERR_580=[36] aliasDereferencingProblem - the alias points to an entry outside of the {0}
namingContext to an object whose existence cannot be determined.
+ERR_581=[33] aliasProblem - the alias '{0}' when dereferenced would not name a known object.
The aliased ObjectName '{1}' must be set to a valid existing entry.
+ERR_582=[36] aliasDereferencingProblem - the alias points to another alias. Alias chaining
is not supported by this backend.
+ERR_583=Cannot store a ClonedServerEntry
+ERR_584=Id for parent '{0}' not found!
+ERR_585=Not a normalized name: {0}
+ERR_586=Entry {0} contains no objectClass attribute: {1}
+ERR_587=Entry {0} contains no entryCsn attribute: {1}
+ERR_588=Entry {0} contains no entryUuid attribute: {1}
+ERR_589=Cannot store a ClonedServerEntry
+ERR_590=Unidentified modification operation
+ERR_591=Key comparator cannot be null.
+ERR_592=Value comparator must not be null for tables with duplicate keys.
+ERR_593=Unfortunately this Table without duplicates enabled does not contain a value comparator
which is needed to answer your ordering question.
+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=

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java
Fri Jan 22 23:22:35 2010
@@ -23,6 +23,7 @@
 import java.io.IOException;
 
 import org.apache.directory.server.core.avltree.Marshaller;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.asn1.codec.binary.Hex;
 
 
@@ -74,12 +75,11 @@
         {
             if ( bites != null )
             {
-                throw new IOException( "Not a serialized BTreeRedirect object: "
-                        + new String( Hex.encodeHex( bites ) ) );
+                throw new IOException( I18n.err( I18n.ERR_568, new String( Hex.encodeHex(
bites ) ) ) );
             }
             else
             {
-                throw new IOException( "Not a serialized BTreeRedirect object: byte array
is null." );
+                throw new IOException( I18n.err( I18n.ERR_569 ) );
             }
         }
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainer.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainer.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainer.java
Fri Jan 22 23:22:35 2010
@@ -21,6 +21,7 @@
 
 
 import org.apache.directory.server.core.avltree.ArrayTree;
+import org.apache.directory.server.i18n.I18n;
 
 
 /**
@@ -68,7 +69,7 @@
     {
         if ( arrayTree == null )
         {
-            throw new IllegalStateException( "this is not an arrayTree container" );
+            throw new IllegalStateException( I18n.err( I18n.ERR_570 ) );
         }
 
         return arrayTree;
@@ -79,7 +80,7 @@
     {
         if ( btreeRedirect == null )
         {
-            throw new IllegalStateException( "this is not a btreeRedirect container" );
+            throw new IllegalStateException( I18n.err( I18n.ERR_571 ) );
         }
 
         return btreeRedirect;

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
Fri Jan 22 23:22:35 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -57,8 +58,7 @@
     {
         if ( ! table.isDupsEnabled() )
         {
-            throw new IllegalStateException(
-                "This cursor can only be used with tables that have duplicate keys enabled."
);
+            throw new IllegalStateException( I18n.err( I18n.ERR_572 ) );
         }
 
         this.table = table;
@@ -130,13 +130,13 @@
 
     public void beforeValue( K key, DupsContainer<V> value ) throws Exception
     {
-        throw new UnsupportedOperationException( "Value based advances not supported." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_573 ) );
     }
 
 
     public void afterValue( K key, DupsContainer<V> value ) throws Exception
     {
-        throw new UnsupportedOperationException( "Value based advances not supported." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_573 ) );
     }
 
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
Fri Jan 22 23:22:35 2010
@@ -32,6 +32,7 @@
 
 import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor;
 import org.apache.directory.server.core.partition.impl.btree.LongComparator;
+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.Tuple;
@@ -208,7 +209,7 @@
         
         if ( mr == null )
         {
-            throw new IOException( "No Equality MatchingRule available for attribute " +
attribute.getName() );
+            throw new IOException( I18n.err( I18n.ERR_574, attribute.getName() ) );
         }
         
         comp = new SerializableComparator<K>( mr.getOid() );
@@ -280,8 +281,7 @@
     {
         if ( initialized )
         {
-            throw new IllegalStateException( "The " + property
-                + " property for an index cannot be set after it has been initialized." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_575, property ) );
         }
     }
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
Fri Jan 22 23:22:35 2010
@@ -25,6 +25,7 @@
 import jdbm.helper.Serializer;
 import jdbm.helper.StringComparator;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.MasterTable;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
@@ -51,11 +52,11 @@
         {
             if ( o1 == null )
             {
-                throw new IllegalArgumentException( "Argument 'obj1' is null" );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_525 ) );
             } 
             else if ( o2 == null )
             {
-                throw new IllegalArgumentException( "Argument 'obj2' is null" );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_526 ) );
             }
 
             if ( o1 == ( long ) o2 )

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
Fri Jan 22 23:22:35 2010
@@ -167,7 +167,7 @@
     {
         if ( initialized )
         {
-            throw new IllegalStateException( "Cannot set jdbm store property " + property
+ " after initialization." );
+            throw new IllegalStateException( I18n.err( I18n.ERR_576, property ) );
         }
     }
 
@@ -461,7 +461,7 @@
         List<Index<?,E>> array = new ArrayList<Index<?,E>>();
         array.addAll( userIndices.values() );
         array.addAll( systemIndices.values() );
-        MultiException errors = new MultiException( "Errors encountered on destroy()" );
+        MultiException errors = new MultiException( I18n.err( I18n.ERR_577 ) );
 
         for ( Index<?,E> index : array )
         {
@@ -1029,16 +1029,14 @@
         {
             if ( aliasDn.equals( normalizedAliasTargetDn ) )
             {
-                String msg = "[36] aliasDereferencingProblem - attempt to create alias to
itself.";
+                String msg = I18n.err( I18n.ERR_578 );
                 ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
                 LdapNamingException e = new LdapNamingException( msg, rc );
                 e.setResolvedName( aliasDn );
                 throw e;
             }
 
-            String msg = "[36] aliasDereferencingProblem - "
-                + "attempt to create alias with cycle to relative " + aliasTarget
-                + " not allowed from descendent alias " + aliasDn;
+            String msg = I18n.err( I18n.ERR_579, aliasTarget, aliasDn );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1055,9 +1053,7 @@
          */
         if ( !normalizedAliasTargetDn.startsWith( normSuffix ) )
         {
-            String msg = "[36] aliasDereferencingProblem - "
-                + " the alias points to an entry outside of the " + upSuffix.getName()
-                + " namingContext to an object whose existence cannot be determined.";
+            String msg = I18n.err( I18n.ERR_580, upSuffix.getName() );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1076,9 +1072,7 @@
         if ( null == targetId )
         {
             // Complain about target not existing
-            String msg = "[33] aliasProblem - "
-                + "the alias '" + aliasDn.getName() + "' when dereferenced would not name
a known object."
-                + "The aliased ObjectName '" + aliasTarget + "' must be set to a valid existing
entry.";
+            String msg = I18n.err( I18n.ERR_581, aliasDn.getName(), aliasTarget );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1097,8 +1091,7 @@
          */
         if ( null != aliasIdx.reverseLookup( targetId ) )
         {
-            String msg = "[36] aliasDereferencingProblem - "
-                + " the alias points to another alias.  Alias chaining is not supported by
this backend.";
+            String msg = I18n.err( I18n.ERR_582 );
             ResultCodeEnum rc = ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM;
             LdapNamingException e = new LdapNamingException( msg, rc );
             e.setResolvedName( aliasDn );
@@ -1161,7 +1154,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( "Cannot store a ClonedServerEntry" );
+            throw new Exception( I18n.err( I18n.ERR_583 ) );
         }
         
         Long parentId;
@@ -1189,14 +1182,14 @@
         // don't keep going if we cannot find the parent Id
         if ( parentId == null )
         {
-            throw new LdapNameNotFoundException( "Id for parent '" + parentDn + "' not found!"
);
+            throw new LdapNameNotFoundException( I18n.err( I18n.ERR_584, parentDn ) );
         }
 
         EntryAttribute objectClass = entry.get( OBJECT_CLASS_AT );
 
         if ( objectClass == null )
         {
-            String msg = "Entry " + entryDn.getName() + " contains no objectClass attribute:
" + entry;
+            String msg = I18n.err( I18n.ERR_586, entryDn.getName(), entry );
             ResultCodeEnum rc = ResultCodeEnum.OBJECT_CLASS_VIOLATION;
             NamingException e = new LdapSchemaViolationException( msg, rc );
             e.setResolvedName( entryDn );
@@ -1220,7 +1213,7 @@
 
         if ( !Character.isDigit( entryDn.toNormName().charAt( 0 ) ) )
         {
-            throw new IllegalStateException( "Not a normalized name: " + entryDn.toNormName()
);
+            throw new IllegalStateException( I18n.err( I18n.ERR_585, entryDn.toNormName()
) );
         }
 
         ndnIdx.add( entryDn.toNormName(), id );
@@ -1232,7 +1225,7 @@
 
         if ( entryCsn == null )
         {
-            String msg = "Entry " + entryDn.getName() + " contains no entryCsn attribute:
" + entry;
+            String msg = I18n.err( I18n.ERR_587, entryDn.getName(), entry );
             throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION
);
         }
         
@@ -1243,7 +1236,7 @@
 
         if ( entryUuid == null )
         {
-            String msg = "Entry " + entryDn.getName() + " contains no entryUuid attribute:
" + entry;
+            String msg = I18n.err( I18n.ERR_588, entryDn.getName(), entry );
             throw new LdapSchemaViolationException( msg, ResultCodeEnum.OBJECT_CLASS_VIOLATION
);
         }
         
@@ -1422,7 +1415,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( "Cannot store a ClonedServerEntry" );
+            throw new Exception( I18n.err( I18n.ERR_589 ) );
         }
         
         String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId()
);
@@ -1485,7 +1478,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( "Cannot store a ClonedServerEntry" );
+            throw new Exception( I18n.err( I18n.ERR_589 ) );
         }
         
         String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId()
);
@@ -1579,7 +1572,7 @@
     {
         if ( entry instanceof ClonedServerEntry )
         {
-            throw new Exception( "Cannot store a ClonedServerEntry" );
+            throw new Exception( I18n.err( I18n.ERR_589 ) );
         }
         
         String modsOid = schemaManager.getAttributeTypeRegistry().getOidByName( mods.getId()
);
@@ -1655,7 +1648,7 @@
     {
         if ( mods instanceof ClonedServerEntry )
         {
-            throw new Exception( "Cannot store a ClonedServerEntry" );
+            throw new Exception( I18n.err( I18n.ERR_589 ) );
         }
         
         Long id = getEntryId( dn.toString() );
@@ -1681,7 +1674,7 @@
                     break;
 
                 default:
-                    throw new NamingException( "Unidentified modification operation" );
+                    throw new NamingException( I18n.err( I18n.ERR_590 ) );
             }
         }
 
@@ -1718,7 +1711,7 @@
                     break;
 
                 default:
-                    throw new NamingException( "Unidentified modification operation" );
+                    throw new NamingException( I18n.err( I18n.ERR_590 ) );
             }
         }
 

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
Fri Jan 22 23:22:35 2010
@@ -140,7 +140,7 @@
 
         if ( keyComparator == null )
         {
-            throw new NullPointerException( "Key comparator cannot be null." );
+            throw new NullPointerException( I18n.err( I18n.ERR_591 ) );
         }
         else
         {
@@ -149,7 +149,7 @@
 
         if ( valueComparator == null )
         {
-            throw new NullPointerException( "Value comparator must not be null for tables
with duplicate keys." );
+            throw new NullPointerException( I18n.err( I18n.ERR_592 ) );
         }
         else
         {
@@ -216,7 +216,7 @@
 
         if ( keyComparator == null )
         {
-            throw new NullPointerException( "Key comparator cannot be null." );
+            throw new NullPointerException( I18n.err( I18n.ERR_591 ) );
         }
         else
         {
@@ -432,8 +432,7 @@
 
         if ( ! allowsDuplicates )
         {
-            throw new UnsupportedOperationException( "Unfortunately this Table without duplicates
enabled " +
-                    "does not contain a value comparator which is needed to answer your ordering
question." );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_593 ) );
         }
 
         DupsContainer<V> values = getDupsContainer( ( byte[] ) bt.find( key ) );
@@ -464,8 +463,7 @@
 
         if ( ! allowsDuplicates )
         {
-            throw new UnsupportedOperationException( "Unfortunately this Table without duplicates
enabled " +
-                    "does not contain a value comparator which is needed to answer your ordering
question." );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_593 ) );
         }
 
         DupsContainer<V> values = getDupsContainer( ( byte[] ) bt.find( key ) );
@@ -612,7 +610,7 @@
 
             if ( ( value == null ) || ( key == null ) )
             {
-                throw new IllegalArgumentException( "null for key or value is not valid"
);
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_594 ) );
             }
             
             V replaced;

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursor.java
Fri Jan 22 23:22:35 2010
@@ -23,6 +23,7 @@
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
 import org.apache.directory.server.core.avltree.ArrayTree;
 import org.apache.directory.server.core.avltree.ArrayTreeCursor;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 
 
@@ -72,13 +73,13 @@
 
     public void beforeKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
     }
 
 
     public void afterKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
     }
 
 
@@ -87,7 +88,7 @@
         checkNotClosed( "beforeValue()" );
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
         }
 
         wrapped.before( value );
@@ -100,7 +101,7 @@
         checkNotClosed( "afterValue()" );
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
         }
 
         wrapped.after( value );

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
Fri Jan 22 23:22:35 2010
@@ -19,6 +19,7 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -82,13 +83,13 @@
 
     public void beforeKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
     }
 
 
     public void afterKey( K key ) throws Exception
     {
-        throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
     }
 
 
@@ -97,7 +98,7 @@
         checkNotClosed( "beforeValue()" );
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
         }
 
         browser = btree.browse( value );
@@ -110,7 +111,7 @@
     {
         if ( key != null && ! key.equals( this.key ) )
         {
-            throw new UnsupportedOperationException( "This cursor locks down the key so keywise
advances are not allowed." );
+            throw new UnsupportedOperationException( I18n.err( I18n.ERR_595 ) );
         }
 
         browser = btree.browse( value );

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java?rev=902308&r1=902307&r2=902308&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
Fri Jan 22 23:22:35 2010
@@ -19,6 +19,7 @@
 package org.apache.directory.server.core.partition.impl.btree.jdbm;
 
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.Tuple;
 import org.apache.directory.server.xdbm.AbstractTupleCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
@@ -116,13 +117,13 @@
 
     public void beforeValue( K key, V value ) throws Exception
     {
-        throw new UnsupportedOperationException( "This Cursor does not support duplicate
keys." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_596 ) );
     }
 
 
     public void afterValue( K key, V value ) throws Exception
     {
-        throw new UnsupportedOperationException( "This Cursor does not support duplicate
keys." );
+        throw new UnsupportedOperationException( I18n.err( I18n.ERR_596 ) );
     }
 
 



Mime
View raw message