directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r927404 [2/2] - in /directory: apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/src/ma...
Date Thu, 25 Mar 2010 13:55:20 GMT
Modified: directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=927404&r1=927403&r2=927404&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Thu
Mar 25 13:55:18 2010
@@ -599,6 +599,20 @@ public class I18n
     public static final String ERR_04454 = "ERR_04454";
     public static final String ERR_04455 = "ERR_04455";
     public static final String ERR_04456 = "ERR_04456";
+    public static final String ERR_04457 = "ERR_04457";
+    public static final String ERR_04458 = "ERR_04458";
+    public static final String ERR_04459 = "ERR_04459";
+    public static final String ERR_04460 = "ERR_04460";
+    public static final String ERR_04461 = "ERR_04461";
+    public static final String ERR_04462 = "ERR_04462";
+    public static final String ERR_04463 = "ERR_04463";
+    public static final String ERR_04464 = "ERR_04464";
+    public static final String ERR_04465 = "ERR_04465";
+    public static final String ERR_04466 = "ERR_04466";
+    public static final String ERR_04467 = "ERR_04467";
+    public static final String ERR_04468 = "ERR_04468";
+    public static final String ERR_04469 = "ERR_04469";
+    public static final String ERR_04470 = "ERR_04470";
 
 	// ldap-constants
 	public static final String ERR_05001 = "ERR_05001";

Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=927404&r1=927403&r2=927404&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
(original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
Thu Mar 25 13:55:18 2010
@@ -558,6 +558,20 @@ ERR_04453=The upID ({0}) is not an OID o
 ERR_04454=Cannot use standard serialization for a ServerAttribute
 ERR_04455=The ID '{0}'is incompatible with the AttributeType's id '{1}'
 ERR_04456=An ID cannnot be null, empty, or resolved to an emtpy value when trimmed
+ERR_04457=The ID should not be null or empty
+ERR_04458=Cannot add an attribute without an ID
+ERR_04459=We have had an error while adding the '{0}' AttributeType : {1}
+ERR_04460=The attributeType should not be null
+ERR_04461=Only String values supported for objectClass attribute
+ERR_04462=The ServerAttribute list should not contain null elements
+ERR_04463=The '{0}' id is not compatible with the '{1}' attribute type
+ERR_04464=Error while adding values into the '{0}' attribute. Error \: {1} 
+ERR_04465=The removal of values for the missing '{0}' attribute is not possible
+ERR_04466=The removal of values for the bad '{0}' attribute is not possible
+ERR_04467=The AttributeType list should not contain null values
+ERR_04468=Cannot use standard serialization for a ServerAttribute
+ERR_04469=Cannot use standard serialization for a ServerEntry
+ERR_04470=Cannot read the attribute as it's OID ('{0}') does not exist
 
 
 

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
(from r927380, directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java&p1=directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java&r1=927380&r2=927404&rev=927404&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultServerEntry.java
Thu Mar 25 13:55:18 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.server.core.entry;
+package org.apache.directory.shared.ldap.entry;
 
 
 import java.io.IOException;
@@ -28,16 +28,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.AbstractEntry;
-import org.apache.directory.shared.ldap.entry.DefaultServerAttribute;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.ServerAttribute;
-import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
@@ -86,7 +79,7 @@ public final class DefaultServerEntry ex
     {
         if ( StringTools.isEmpty( StringTools.trim( upId ) ) )
         {
-            String message = I18n.err( I18n.ERR_98 );
+            String message = I18n.err( I18n.ERR_04457 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -106,7 +99,7 @@ public final class DefaultServerEntry ex
         {
             if ( StringTools.isEmpty( normUpId ) )
             {
-                String message = I18n.err( I18n.ERR_99 );
+                String message = I18n.err( I18n.ERR_04458 );
                 LOG.error( message );
                 throw new IllegalArgumentException( message );
             }
@@ -208,7 +201,7 @@ public final class DefaultServerEntry ex
      * This entry <b>must</b> be initialized before being used !
      * </p>
      */
-    /* no protection ! */ DefaultServerEntry()
+    public DefaultServerEntry()
     {
         schemaManager = null;
         dn = DN.EMPTY_DN;
@@ -425,7 +418,7 @@ public final class DefaultServerEntry ex
         catch ( LdapException ne )
         {
             // Just discard the AttributeType
-            LOG.error( I18n.err( I18n.ERR_100, upId, ne.getLocalizedMessage() ) );
+            LOG.error( I18n.err( I18n.ERR_04459, upId, ne.getLocalizedMessage() ) );
         }
     }
     
@@ -530,7 +523,7 @@ public final class DefaultServerEntry ex
     {
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -538,7 +531,7 @@ public final class DefaultServerEntry ex
         // ObjectClass with binary values are not allowed
         if ( attributeType.equals( OBJECT_CLASS_AT ) )
         {
-            String message = I18n.err( I18n.ERR_102 );
+            String message = I18n.err( I18n.ERR_04461 );
             LOG.error(  message  );
             throw new UnsupportedOperationException( message );
         }
@@ -583,7 +576,7 @@ public final class DefaultServerEntry ex
     {    
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -628,7 +621,7 @@ public final class DefaultServerEntry ex
     {
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -711,7 +704,7 @@ public final class DefaultServerEntry ex
         // ObjectClass with binary values are not allowed
         if ( attributeType.equals( OBJECT_CLASS_AT ) )
         {
-            String message = I18n.err( I18n.ERR_102 );
+            String message = I18n.err( I18n.ERR_04461 );
             LOG.error(  message  );
             throw new UnsupportedOperationException( message );
         }
@@ -759,7 +752,7 @@ public final class DefaultServerEntry ex
     {
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -795,7 +788,7 @@ public final class DefaultServerEntry ex
     {
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -1404,7 +1397,7 @@ public final class DefaultServerEntry ex
         {
             if ( serverAttribute == null )
             {
-                String message = I18n.err( I18n.ERR_103 );
+                String message = I18n.err( I18n.ERR_04462 );
                 LOG.error( message );
                 throw new IllegalArgumentException( message );
             }
@@ -1448,7 +1441,7 @@ public final class DefaultServerEntry ex
     {
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -1459,7 +1452,7 @@ public final class DefaultServerEntry ex
         
             if ( !tempAT.equals( attributeType ) )
             {
-                String message = I18n.err( I18n.ERR_104, upId, attributeType );
+                String message = I18n.err( I18n.ERR_04463, upId, attributeType );
                 LOG.error( message );
                 throw new IllegalArgumentException( message );
             }
@@ -1471,7 +1464,7 @@ public final class DefaultServerEntry ex
         
         if ( attributeType.equals( OBJECT_CLASS_AT ) )
         {
-            String message = I18n.err( I18n.ERR_102 );
+            String message = I18n.err( I18n.ERR_04461 );
             LOG.error( message );
             throw new UnsupportedOperationException( message );
         }
@@ -1514,7 +1507,7 @@ public final class DefaultServerEntry ex
             }
             catch ( IllegalArgumentException iae )
             {
-                String message = I18n.err( I18n.ERR_101 );
+                String message = I18n.err( I18n.ERR_04460 );
                 LOG.error( message );
                 throw new IllegalArgumentException( message );
             }
@@ -1527,7 +1520,7 @@ public final class DefaultServerEntry ex
             
                 if ( !tempAT.equals( attributeType ) )
                 {
-                    String message = I18n.err( I18n.ERR_104, upId, attributeType );
+                    String message = I18n.err( I18n.ERR_04463, upId, attributeType );
                     LOG.error( message );
                     throw new IllegalArgumentException( message );
                 }
@@ -1570,7 +1563,7 @@ public final class DefaultServerEntry ex
     {
         if ( attributeType == null )
         {
-            String message = I18n.err( I18n.ERR_101 );
+            String message = I18n.err( I18n.ERR_04460 );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -1581,7 +1574,7 @@ public final class DefaultServerEntry ex
         
             if ( !tempAT.equals( attributeType ) )
             {
-                String message = I18n.err( I18n.ERR_104, upId, attributeType );
+                String message = I18n.err( I18n.ERR_04463, upId, attributeType );
                 LOG.error( message );
                 throw new IllegalArgumentException( message );
             }
@@ -1620,7 +1613,7 @@ public final class DefaultServerEntry ex
         }
         catch ( LdapException ne )
         {
-            String message = I18n.err( I18n.ERR_105, upId, ne.getLocalizedMessage() );
+            String message = I18n.err( I18n.ERR_04464, upId, ne.getLocalizedMessage() );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -1652,7 +1645,7 @@ public final class DefaultServerEntry ex
         }
         catch ( LdapException ne )
         {
-            String message = I18n.err( I18n.ERR_105, upId, ne.getLocalizedMessage() );
+            String message = I18n.err( I18n.ERR_04464, upId, ne.getLocalizedMessage() );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -1683,7 +1676,7 @@ public final class DefaultServerEntry ex
         }
         catch ( LdapException ne )
         {
-            String message = I18n.err( I18n.ERR_105, upId, ne.getLocalizedMessage() );
+            String message = I18n.err( I18n.ERR_04464, upId, ne.getLocalizedMessage() );
             LOG.error( message );
             throw new IllegalArgumentException( message );
         }
@@ -1749,7 +1742,7 @@ public final class DefaultServerEntry ex
         }
         catch ( IllegalArgumentException iae )
         {
-            LOG.error( I18n.err( I18n.ERR_106, attributeType ) );
+            LOG.error( I18n.err( I18n.ERR_04465, attributeType ) );
             return false;
         }
     }
@@ -1814,7 +1807,7 @@ public final class DefaultServerEntry ex
         }
         catch ( IllegalArgumentException iae )
         {
-            LOG.error( I18n.err( I18n.ERR_106, attributeType ) );
+            LOG.error( I18n.err( I18n.ERR_04465, attributeType ) );
             return false;
         }
     }
@@ -1879,7 +1872,7 @@ public final class DefaultServerEntry ex
         }
         catch ( IllegalArgumentException iae )
         {
-            LOG.error( I18n.err( I18n.ERR_106, attributeType ) );
+            LOG.error( I18n.err( I18n.ERR_04465, attributeType ) );
             return false;
         }
     }
@@ -1933,12 +1926,12 @@ public final class DefaultServerEntry ex
         }
         catch ( LdapException ne )
         {
-            LOG.error( I18n.err( I18n.ERR_106, upId ) );
+            LOG.error( I18n.err( I18n.ERR_04465, upId ) );
             return false;
         }
         catch ( IllegalArgumentException iae )
         {
-            LOG.error( I18n.err( I18n.ERR_107, upId ) );
+            LOG.error( I18n.err( I18n.ERR_04466, upId ) );
             return false;
         }
     }
@@ -1975,12 +1968,12 @@ public final class DefaultServerEntry ex
         }
         catch ( LdapException ne )
         {
-            LOG.error( I18n.err( I18n.ERR_106, upId ) );
+            LOG.error( I18n.err( I18n.ERR_04465, upId ) );
             return false;
         }
         catch ( IllegalArgumentException iae )
         {
-            LOG.error( I18n.err( I18n.ERR_107, upId ) );
+            LOG.error( I18n.err( I18n.ERR_04466, upId ) );
             return false;
         }
     }
@@ -2017,12 +2010,12 @@ public final class DefaultServerEntry ex
         }
         catch ( LdapException ne )
         {
-            LOG.error( I18n.err( I18n.ERR_106, upId ) );
+            LOG.error( I18n.err( I18n.ERR_04465, upId ) );
             return false;
         }
         catch ( IllegalArgumentException iae )
         {
-            LOG.error( I18n.err( I18n.ERR_107, upId ) );
+            LOG.error( I18n.err( I18n.ERR_04466, upId ) );
             return false;
         }
     }
@@ -2153,7 +2146,7 @@ public final class DefaultServerEntry ex
         {
             if ( attributeType == null )
             {
-                String message = I18n.err( I18n.ERR_108 );
+                String message = I18n.err( I18n.ERR_04467 );
                 LOG.error( message );
                 continue;
             }
@@ -2301,7 +2294,7 @@ public final class DefaultServerEntry ex
      */
     public void writeExternal( ObjectOutput out ) throws IOException
     {
-        throw new IllegalStateException( I18n.err( I18n.ERR_456 ) );
+        throw new IllegalStateException( I18n.err( I18n.ERR_04469 ) );
     }
     
     
@@ -2357,7 +2350,7 @@ public final class DefaultServerEntry ex
      */
     public void readExternal( ObjectInput in ) throws IOException, ClassNotFoundException
     {
-        throw new IllegalStateException( I18n.err( I18n.ERR_455 ) );
+        throw new IllegalStateException( I18n.err( I18n.ERR_04468 ) );
     }
     
     
@@ -2397,7 +2390,7 @@ public final class DefaultServerEntry ex
             catch ( LdapException ne )
             {
                 // We weren't able to find the OID. The attribute will not be added
-                LOG.warn( I18n.err( I18n.ERR_460, oid ) );
+                LOG.warn( I18n.err( I18n.ERR_04470, oid ) );
                 
             }
         }



Mime
View raw message