directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r902549 - in /directory/apacheds/trunk: i18n/src/main/resources/org/apache/directory/server/i18n/ protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ server-annotations/src/main/java/org/apache/directory/server/...
Date Sun, 24 Jan 2010 11:44:28 GMT
Author: felixk
Date: Sun Jan 24 11:44:27 2010
New Revision: 902549

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

Modified:
    directory/apacheds/trunk/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
    directory/apacheds/trunk/server-replication/pom.xml
    directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.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=902549&r1=902548&r2=902549&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 11:44:27 2010
@@ -709,14 +709,14 @@
 ERR_685=Unidentified single reply request/response type: {0}
 ERR_686=Unexpected base scope.
 ERR_687=TimeUnit not supported: {0}
-ERR_688=
-ERR_689=
-ERR_690=
-ERR_691=
-ERR_692=
-ERR_693=
-ERR_694=
-ERR_695=
+ERR_688=LDIF file does not exist.
+ERR_689=Unsupported protocol type {0}
+ERR_690=Failed to add the extended operation of type {0}
+ERR_691=Failed to add the SASL mechanism with the name {0} and implementation class {1}
+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=

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=902549&r1=902548&r2=902549&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
(original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
Sun Jan 24 11:44:27 2010
@@ -288,7 +288,7 @@
                 return in;
             }
 
-            throw new FileNotFoundException( "LDIF file does not exist." );
+            throw new FileNotFoundException( I18n.err( I18n.ERR_688 ) );
         }
 
         return in;

Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java?rev=902549&r1=902548&r2=902549&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
(original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
Sun Jan 24 11:44:27 2010
@@ -26,6 +26,7 @@
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.annotations.SaslMechanism;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.kerberos.kdc.KdcServer;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapServer;
@@ -81,7 +82,7 @@
                 }
                 else
                 {
-                    throw new IllegalArgumentException( "Unsupported protocol type " + protocol
);
+                    throw new IllegalArgumentException( I18n.err( I18n.ERR_689, protocol
) );
                 }
             }
         }
@@ -127,7 +128,7 @@
                 }
                 catch( Exception e )
                 {
-                    throw new RuntimeException( "Failed to add the extended operation of
type " + extOpClass.getName(), e );
+                    throw new RuntimeException( I18n.err( I18n.ERR_690, extOpClass.getName()
), e );
                 }
             }
             
@@ -140,7 +141,7 @@
                 }
                 catch( Exception e )
                 {
-                    throw new RuntimeException( "Failed to add the SASL mechanism with the
name " + saslMech.name() + " and implementation class " + saslMech.implClass().getName(),
e );
+                    throw new RuntimeException( I18n.err( I18n.ERR_691, saslMech.name(),
saslMech.implClass().getName() ), e );
                 }
             }
             
@@ -157,7 +158,7 @@
                     }
                     catch( Exception e )
                     {
-                        throw new RuntimeException( "Failed to add NTLM provider", e );
+                        throw new RuntimeException( I18n.err( I18n.ERR_692 ), e );
                     }
                 }
             }
@@ -289,7 +290,7 @@
                 }
                 else
                 {
-                    throw new IllegalArgumentException( "Unsupported protocol type " + protocol
);
+                    throw new IllegalArgumentException( I18n.err( I18n.ERR_693, protocol
) );
                 }
             }
         }

Modified: directory/apacheds/trunk/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/pom.xml?rev=902549&r1=902548&r2=902549&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/pom.xml (original)
+++ directory/apacheds/trunk/server-replication/pom.xml Sun Jan 24 11:44:27 2010
@@ -33,5 +33,14 @@
     across ApacheDS instances.  This service is modeled as an interceptor.
   </description>
   <packaging>jar</packaging>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
+  </dependencies>
+  
 </project>
 

Modified: directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java?rev=902549&r1=902548&r2=902549&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java
(original)
+++ directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicaId.java
Sun Jan 24 11:44:27 2010
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 import java.util.regex.Pattern;
 
+import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -63,14 +64,14 @@
     {
         if ( StringTools.isEmpty( id ) )
         {
-            throw new IllegalArgumentException( "Empty ID: " + id );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_694, id ) );
         }
 
         String tmpId = id.trim().toUpperCase();
 
         if ( !REPLICA_ID_PATTERN.matcher( tmpId ).matches() )
         {
-            throw new IllegalArgumentException( "Invalid replica ID: " + id );
+            throw new IllegalArgumentException( I18n.err( I18n.ERR_695, id ) );
         }
 
         this.id = id;



Mime
View raw message