You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/01/21 11:20:26 UTC
svn commit: r901635 [1/3] - in /directory/sandbox/felixk/apacheds-i18n:
avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-api/src/main/java/org/apac...
Author: felixk
Date: Thu Jan 21 10:20:06 2010
New Revision: 901635
URL: http://svn.apache.org/viewvc?rev=901635&view=rev
Log:
Refactor to/and prepare not only error translation but also 'normal' messages
Added:
directory/sandbox/felixk/apacheds-i18n/i18n/.settings/
directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.eclipse.jdt.core.prefs
directory/sandbox/felixk/apacheds-i18n/i18n/.settings/org.maven.ide.eclipse.prefs
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
- copied, changed from r901606, directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/Err.java
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages.properties (with props)
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_de.properties (with props)
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/messages_fr.properties (with props)
directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/InlineMessageTest.java (with props)
directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages.properties (with props)
directory/sandbox/felixk/apacheds-i18n/i18n/src/test/resources/org/apache/directory/server/i18n/messages_de.properties (with props)
Removed:
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/java/org/apache/directory/server/i18n/Err.java
Modified:
directory/sandbox/felixk/apacheds-i18n/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
directory/sandbox/felixk/apacheds-i18n/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
directory/sandbox/felixk/apacheds-i18n/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_de.properties
directory/sandbox/felixk/apacheds-i18n/i18n/src/main/resources/org/apache/directory/server/i18n/errors_fr.properties
directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/GermanLanguageTest.java
directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/MissingErrorCodeTest.java
directory/sandbox/felixk/apacheds-i18n/i18n/src/test/java/org/apache/directory/server/i18n/UnknownLanguageTest.java
directory/sandbox/felixk/apacheds-i18n/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
directory/sandbox/felixk/apacheds-i18n/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationData.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedData.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddress.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/HostAddresses.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalName.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/TransitedEncoding.java
directory/sandbox/felixk/apacheds-i18n/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
directory/sandbox/felixk/apacheds-i18n/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameService.java
directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java
directory/sandbox/felixk/apacheds-i18n/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
directory/sandbox/felixk/apacheds-i18n/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SearchResultDoneResponseHandler.java
directory/sandbox/felixk/apacheds-i18n/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
directory/sandbox/felixk/apacheds-i18n/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
directory/sandbox/felixk/apacheds-i18n/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ApachedsTools.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/BaseCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DisconnectNotificationCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
directory/sandbox/felixk/apacheds-i18n/server-tools/src/main/java/org/apache/directory/server/tools/IndexCommand.java
directory/sandbox/felixk/apacheds-i18n/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
directory/sandbox/felixk/apacheds-i18n/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
Modified: directory/sandbox/felixk/apacheds-i18n/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Thu Jan 21 10:20:06 2010
@@ -38,7 +38,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerStringValue;
import org.apache.directory.server.core.partition.impl.btree.LongComparator;
-import org.apache.directory.server.i18n.Err;
+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;
@@ -586,8 +586,8 @@
}
catch ( NamingException e )
{
- LOG.error( Err.i18n( Err.ERR_1, id ), e.getLocalizedMessage() );
- throw new IndexNotFoundException( Err.i18n( Err.ERR_1, id ), id, e );
+ LOG.error( I18n.err( I18n.ERR_1, id ), e.getLocalizedMessage() );
+ throw new IndexNotFoundException( I18n.err( I18n.ERR_1, id ), id, e );
}
if ( systemIndices.containsKey( id ) )
@@ -595,7 +595,7 @@
return systemIndices.get( id );
}
- throw new IndexNotFoundException( Err.i18n( Err.ERR_2, id, name ) );
+ throw new IndexNotFoundException( I18n.err( I18n.ERR_2, id, name ) );
}
@@ -620,8 +620,8 @@
}
catch ( NamingException e )
{
- LOG.error( Err.i18n( Err.ERR_1, id ), e.getLocalizedMessage() );
- throw new IndexNotFoundException( Err.i18n( Err.ERR_1, id ), id, e );
+ LOG.error( I18n.err( I18n.ERR_1, id ), e.getLocalizedMessage() );
+ throw new IndexNotFoundException( I18n.err( I18n.ERR_1, id ), id, e );
}
if ( userIndices.containsKey( id ) )
@@ -629,7 +629,7 @@
return userIndices.get( id );
}
- throw new IndexNotFoundException( Err.i18n( Err.ERR_3, id, name ) );
+ throw new IndexNotFoundException( I18n.err( I18n.ERR_3, id, name ) );
}
@@ -823,7 +823,7 @@
}
else
{
- LOG.error( Err.i18n( Err.ERR_4, attributeType.getName() ) );
+ LOG.error( I18n.err( I18n.ERR_4, attributeType.getName() ) );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Thu Jan 21 10:20:06 2010
@@ -37,7 +37,7 @@
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
@@ -261,7 +261,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_80, ldifFile, e.getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_80, ldifFile, e.getLocalizedMessage() ) );
}
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Thu Jan 21 10:20:06 2010
@@ -36,7 +36,7 @@
import org.apache.directory.server.core.interceptor.context.ListOperationContext;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.i18n.Err;
+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.Entry;
@@ -380,7 +380,7 @@
*/
public List<Entry> loadDitContentRules( Schema... schemas ) throws Exception
{
- LOG.error( Err.i18n( Err.ERR_86 ) );
+ LOG.error( I18n.err( I18n.ERR_86 ) );
return null;
}
@@ -391,7 +391,7 @@
*/
public List<Entry> loadDitStructureRules( Schema... schemas ) throws Exception
{
- LOG.error( Err.i18n( Err.ERR_87 ) );
+ LOG.error( I18n.err( I18n.ERR_87 ) );
return null;
}
@@ -439,7 +439,7 @@
*/
public List<Entry> loadMatchingRuleUses( Schema... schemas ) throws Exception
{
- LOG.error( Err.i18n( Err.ERR_88 ) );
+ LOG.error( I18n.err( I18n.ERR_88 ) );
return null;
}
@@ -450,7 +450,7 @@
*/
public List<Entry> loadNameForms( Schema... schemas ) throws Exception
{
- LOG.error( Err.i18n( Err.ERR_89 ) );
+ LOG.error( I18n.err( I18n.ERR_89 ) );
return null;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Thu Jan 21 10:20:06 2010
@@ -50,7 +50,7 @@
import org.apache.directory.server.core.partition.NullPartition;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.schema.registries.synchronizers.RegistrySynchronizerAdaptor;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -241,7 +241,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_90 ), e );
+ LOG.error( I18n.err( I18n.ERR_90 ), e );
throw new RuntimeException( e );
}
@@ -259,7 +259,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_91 ), e );
+ LOG.error( I18n.err( I18n.ERR_91 ), e );
throw new RuntimeException( e );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Thu Jan 21 10:20:06 2010
@@ -33,7 +33,7 @@
import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
-import org.apache.directory.server.i18n.Err;
+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;
@@ -187,7 +187,7 @@
{
if ( opContext.getDn().size() != 3 )
{
- String msg = Err.i18n( Err.ERR_81 );
+ String msg = I18n.err( I18n.ERR_81 );
LOG.error( msg );
throw new LdapInvalidNameException( msg, ResultCodeEnum.NAMING_VIOLATION );
}
@@ -197,14 +197,14 @@
if ( ! VALID_OU_VALUES.contains( ouValue ) )
{
- String msg = Err.i18n( Err.ERR_82, VALID_OU_VALUES );
+ String msg = I18n.err( I18n.ERR_82, VALID_OU_VALUES );
LOG.error( msg );
throw new LdapInvalidNameException( msg, ResultCodeEnum.NAMING_VIOLATION );
}
}
- String msg = Err.i18n( Err.ERR_83, opContext.getDn() );
+ String msg = I18n.err( I18n.ERR_83, opContext.getDn() );
LOG.error( msg );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
}
@@ -300,7 +300,7 @@
return false;
}
- LOG.error( String.format( Err.i18n( Err.ERR_84 ),
+ LOG.error( String.format( I18n.err( I18n.ERR_84 ),
opContext.getDn(), entry, opContext.getModItems() ) );
throw new LdapOperationNotSupportedException( ResultCodeEnum.UNWILLING_TO_PERFORM );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Thu Jan 21 10:20:06 2010
@@ -37,7 +37,7 @@
import org.apache.directory.server.core.entry.ServerModification;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.server.core.partition.ByPassConstants;
-import org.apache.directory.server.i18n.Err;
+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;
@@ -575,7 +575,7 @@
if ( schema == null )
{
// This is not possible. We can't enable a schema which is not loaded.
- String msg = Err.i18n( Err.ERR_85, schemaName );
+ String msg = I18n.err( I18n.ERR_85, schemaName );
LOG.error( msg );
throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java Thu Jan 21 10:20:06 2010
@@ -27,7 +27,7 @@
import javax.naming.NamingException;
import javax.naming.directory.InvalidAttributeValueException;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
@@ -180,7 +180,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_92 );
+ String message = I18n.err( I18n.ERR_92 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -338,7 +338,7 @@
catch( NamingException ne )
{
// The value can't be normalized : we don't add it.
- LOG.error( Err.i18n( Err.ERR_93, val ) );
+ LOG.error( I18n.err( I18n.ERR_93, val ) );
return 0;
}
@@ -348,7 +348,7 @@
}
else
{
- LOG.error( Err.i18n( Err.ERR_94, val ) );
+ LOG.error( I18n.err( I18n.ERR_94, val ) );
}
}
@@ -397,7 +397,7 @@
}
else
{
- LOG.error( Err.i18n( Err.ERR_94, val ) );
+ LOG.error( I18n.err( I18n.ERR_94, val ) );
}
}
}
@@ -460,7 +460,7 @@
}
else
{
- String message = Err.i18n( Err.ERR_95 );
+ String message = I18n.err( I18n.ERR_95 );
LOG.error( message );
}
}
@@ -500,7 +500,7 @@
}
else
{
- String message = Err.i18n( Err.ERR_96 );
+ String message = I18n.err( I18n.ERR_96 );
LOG.error( message );
}
}
@@ -1116,7 +1116,7 @@
}
else
{
- String message = Err.i18n( Err.ERR_97, upId, attributeType.getOid() );
+ String message = I18n.err( I18n.ERR_97, upId, attributeType.getOid() );
// Not a valid OID : use the AttributeTypes OID name instead
LOG.error( message );
throw new IllegalArgumentException( message );
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Thu Jan 21 10:20:06 2010
@@ -30,7 +30,7 @@
import javax.naming.NamingException;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.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;
@@ -84,7 +84,7 @@
{
if ( StringTools.isEmpty( StringTools.trim( upId ) ) )
{
- String message = Err.i18n( Err.ERR_98 );
+ String message = I18n.err( I18n.ERR_98 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -104,7 +104,7 @@
{
if ( StringTools.isEmpty( normUpId ) )
{
- String message = Err.i18n( Err.ERR_99 );
+ String message = I18n.err( I18n.ERR_99 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -423,7 +423,7 @@
catch ( NamingException ne )
{
// Just discard the AttributeType
- LOG.error( Err.i18n( Err.ERR_100, upId, ne.getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_100, upId, ne.getLocalizedMessage() ) );
}
}
@@ -528,7 +528,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -536,7 +536,7 @@
// ObjectClass with binary values are not allowed
if ( attributeType.equals( OBJECT_CLASS_AT ) )
{
- String message = Err.i18n( Err.ERR_102 );
+ String message = I18n.err( I18n.ERR_102 );
LOG.error( message );
throw new UnsupportedOperationException( message );
}
@@ -581,7 +581,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -626,7 +626,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -709,7 +709,7 @@
// ObjectClass with binary values are not allowed
if ( attributeType.equals( OBJECT_CLASS_AT ) )
{
- String message = Err.i18n( Err.ERR_102 );
+ String message = I18n.err( I18n.ERR_102 );
LOG.error( message );
throw new UnsupportedOperationException( message );
}
@@ -757,7 +757,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -793,7 +793,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1402,7 +1402,7 @@
{
if ( serverAttribute == null )
{
- String message = Err.i18n( Err.ERR_103 );
+ String message = I18n.err( I18n.ERR_103 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1446,7 +1446,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1457,7 +1457,7 @@
if ( !tempAT.equals( attributeType ) )
{
- String message = Err.i18n( Err.ERR_104, upId, attributeType );
+ String message = I18n.err( I18n.ERR_104, upId, attributeType );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1469,7 +1469,7 @@
if ( attributeType.equals( OBJECT_CLASS_AT ) )
{
- String message = Err.i18n( Err.ERR_102 );
+ String message = I18n.err( I18n.ERR_102 );
LOG.error( message );
throw new UnsupportedOperationException( message );
}
@@ -1512,7 +1512,7 @@
}
catch ( IllegalArgumentException iae )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1525,7 +1525,7 @@
if ( !tempAT.equals( attributeType ) )
{
- String message = Err.i18n( Err.ERR_104, upId, attributeType );
+ String message = I18n.err( I18n.ERR_104, upId, attributeType );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1568,7 +1568,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_101 );
+ String message = I18n.err( I18n.ERR_101 );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1579,7 +1579,7 @@
if ( !tempAT.equals( attributeType ) )
{
- String message = Err.i18n( Err.ERR_104, upId, attributeType );
+ String message = I18n.err( I18n.ERR_104, upId, attributeType );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1618,7 +1618,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_105, upId, ne.getLocalizedMessage() );
+ String message = I18n.err( I18n.ERR_105, upId, ne.getLocalizedMessage() );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1650,7 +1650,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_105, upId, ne.getLocalizedMessage() );
+ String message = I18n.err( I18n.ERR_105, upId, ne.getLocalizedMessage() );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1681,7 +1681,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_105, upId, ne.getLocalizedMessage() );
+ String message = I18n.err( I18n.ERR_105, upId, ne.getLocalizedMessage() );
LOG.error( message );
throw new IllegalArgumentException( message );
}
@@ -1747,7 +1747,7 @@
}
catch ( IllegalArgumentException iae )
{
- LOG.error( Err.i18n( Err.ERR_106, attributeType ) );
+ LOG.error( I18n.err( I18n.ERR_106, attributeType ) );
return false;
}
}
@@ -1812,7 +1812,7 @@
}
catch ( IllegalArgumentException iae )
{
- LOG.error( Err.i18n( Err.ERR_106, attributeType ) );
+ LOG.error( I18n.err( I18n.ERR_106, attributeType ) );
return false;
}
}
@@ -1877,7 +1877,7 @@
}
catch ( IllegalArgumentException iae )
{
- LOG.error( Err.i18n( Err.ERR_106, attributeType ) );
+ LOG.error( I18n.err( I18n.ERR_106, attributeType ) );
return false;
}
}
@@ -1931,12 +1931,12 @@
}
catch ( NamingException ne )
{
- LOG.error( Err.i18n( Err.ERR_106, upId ) );
+ LOG.error( I18n.err( I18n.ERR_106, upId ) );
return false;
}
catch ( IllegalArgumentException iae )
{
- LOG.error( Err.i18n( Err.ERR_107, upId ) );
+ LOG.error( I18n.err( I18n.ERR_107, upId ) );
return false;
}
}
@@ -1973,12 +1973,12 @@
}
catch ( NamingException ne )
{
- LOG.error( Err.i18n( Err.ERR_106, upId ) );
+ LOG.error( I18n.err( I18n.ERR_106, upId ) );
return false;
}
catch ( IllegalArgumentException iae )
{
- LOG.error( Err.i18n( Err.ERR_107, upId ) );
+ LOG.error( I18n.err( I18n.ERR_107, upId ) );
return false;
}
}
@@ -2015,12 +2015,12 @@
}
catch ( NamingException ne )
{
- LOG.error( Err.i18n( Err.ERR_106, upId ) );
+ LOG.error( I18n.err( I18n.ERR_106, upId ) );
return false;
}
catch ( IllegalArgumentException iae )
{
- LOG.error( Err.i18n( Err.ERR_107, upId ) );
+ LOG.error( I18n.err( I18n.ERR_107, upId ) );
return false;
}
}
@@ -2151,7 +2151,7 @@
{
if ( attributeType == null )
{
- String message = Err.i18n( Err.ERR_108 );
+ String message = I18n.err( I18n.ERR_108 );
LOG.error( message );
continue;
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Thu Jan 21 10:20:06 2010
@@ -28,7 +28,7 @@
import javax.naming.NamingException;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
@@ -384,13 +384,13 @@
}
catch ( NamingException e )
{
- String msg = Err.i18n( Err.ERR_109, Arrays.toString( getReference() ), value );
+ String msg = I18n.err( I18n.ERR_109, Arrays.toString( getReference() ), value );
LOG.error( msg, e );
throw new IllegalStateException( msg, e );
}
}
- String message = Err.i18n( Err.ERR_110 );
+ String message = I18n.err( I18n.ERR_110 );
LOG.error( message );
throw new NotImplementedException( message );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java Thu Jan 21 10:20:06 2010
@@ -25,7 +25,7 @@
import javax.naming.NamingException;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -104,7 +104,7 @@
catch ( NamingException ne )
{
// The attributeType is incorrect. Log, but do nothing otherwise.
- LOG.error( Err.i18n( Err.ERR_111, modAttribute.getId() ) );
+ LOG.error( I18n.err( I18n.ERR_111, modAttribute.getId() ) );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java Thu Jan 21 10:20:06 2010
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
@@ -296,7 +296,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_112, stringValue );
+ String message = I18n.err( I18n.ERR_112, stringValue );
LOG.error( message );
}
@@ -307,7 +307,7 @@
}
catch ( NamingException ne )
{
- String message = Err.i18n( Err.ERR_112, this );
+ String message = I18n.err( I18n.ERR_112, this );
LOG.error( message );
}
@@ -318,13 +318,13 @@
}
catch ( NamingException e )
{
- String msg = Err.i18n( Err.ERR_113, this, value );
+ String msg = I18n.err( I18n.ERR_113, this, value );
LOG.error( msg, e );
throw new IllegalStateException( msg, e );
}
}
- String message = Err.i18n( Err.ERR_114 );
+ String message = I18n.err( I18n.ERR_114 );
LOG.error( message );
throw new NotImplementedException( message );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Thu Jan 21 10:20:06 2010
@@ -38,7 +38,7 @@
import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.entry.DefaultServerEntry;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -81,12 +81,12 @@
}
catch ( IOException e )
{
- LOG.error( Err.i18n( Err.ERR_115 ), e );
+ LOG.error( I18n.err( I18n.ERR_115 ), e );
}
}
if ( wkdir.exists() )
{
- throw new IOException( Err.i18n( Err.ERR_116, wkdir ) );
+ throw new IOException( I18n.err( I18n.ERR_116, wkdir ) );
}
}
@@ -118,7 +118,7 @@
}
else
{
- String message = Err.i18n( Err.ERR_117, entry.getChangeType() );
+ String message = I18n.err( I18n.ERR_117, entry.getChangeType() );
LOG.error( message );
throw new NamingException( message );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core-jndi/src/main/java/org/apache/directory/server/core/jndi/EventListenerAdapter.java Thu Jan 21 10:20:06 2010
@@ -38,7 +38,7 @@
import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@
private void deliverNamingExceptionEvent( Exception e, OperationContext opContext )
{
- LOG.error( Err.i18n( Err.ERR_118 ), e );
+ LOG.error( I18n.err( I18n.ERR_118 ), e );
NamingExceptionEvent evt = null;
if ( e instanceof NamingException )
@@ -102,7 +102,7 @@
}
else
{
- NamingException ne = new NamingException( Err.i18n( Err.ERR_119 ) );
+ NamingException ne = new NamingException( I18n.err( I18n.ERR_119 ) );
ne.setRootCause( e );
evt = new NamingExceptionEvent( source, ne );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Jan 21 10:20:06 2010
@@ -74,7 +74,7 @@
import org.apache.directory.server.core.security.TlsKeyGenerator;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.core.trigger.TriggerInterceptor;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -269,7 +269,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_74 ), e );
+ LOG.error( I18n.err( I18n.ERR_74 ), e );
}
}
}
@@ -845,15 +845,15 @@
break;
default:
- LOG.error( Err.i18n( Err.ERR_75 ) );
- throw new NotImplementedException( Err.i18n( Err.ERR_76, reverse.getChangeType() ) );
+ LOG.error( I18n.err( I18n.ERR_75 ) );
+ throw new NotImplementedException( I18n.err( I18n.ERR_76, reverse.getChangeType() ) );
}
}
}
}
catch ( IOException e )
{
- String message = Err.i18n( Err.ERR_77, revision );
+ String message = I18n.err( I18n.ERR_77, revision );
LOG.error( message );
throw new NamingException( message );
}
@@ -1565,7 +1565,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_78, ldif, dn ) );
+ LOG.error( I18n.err( I18n.ERR_78, ldif, dn ) );
// do nothing
return null;
}
@@ -1670,7 +1670,7 @@
{
if ( ( replicaId < 0 ) || ( replicaId > 999 ) )
{
- LOG.error( Err.i18n( Err.ERR_79 ) );
+ LOG.error( I18n.err( I18n.ERR_79 ) );
this.replicaId = 0;
}
else
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Thu Jan 21 10:20:06 2010
@@ -53,7 +53,7 @@
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
@@ -417,8 +417,8 @@
if ( operation.getSession().isAnonymous() && !directoryService.isAllowAnonymousAccess()
&& !operation.getDn().isEmpty() )
{
- LOG.error( Err.i18n( Err.ERR_5, operation.getName() ) );
- throw new LdapNoPermissionException( Err.i18n( Err.ERR_5, operation.getName() ) );
+ LOG.error( I18n.err( I18n.ERR_5, operation.getName() ) );
+ throw new LdapNoPermissionException( I18n.err( I18n.ERR_5, operation.getName() ) );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Thu Jan 21 10:20:06 2010
@@ -48,7 +48,7 @@
import org.apache.directory.server.core.schema.SchemaInterceptor;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.core.trigger.TriggerInterceptor;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.LdapSecurityConstants;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -613,7 +613,7 @@
}
catch ( Exception cause )
{
- LOG.error( Err.i18n( Err.ERR_6, cause.getLocalizedMessage() ) );
+ LOG.error( I18n.err( I18n.ERR_6, cause.getLocalizedMessage() ) );
LdapAuthenticationException e = new LdapAuthenticationException( cause.getLocalizedMessage() );
e.setRootCause( e );
throw e;
@@ -724,7 +724,7 @@
}
catch ( NoSuchAlgorithmException nsae )
{
- LOG.error( Err.i18n( Err.ERR_7, algorithm ) );
+ LOG.error( I18n.err( I18n.ERR_7, algorithm ) );
throw new IllegalArgumentException( nsae.getLocalizedMessage() );
}
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Jan 21 10:20:06 2010
@@ -61,7 +61,7 @@
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.aci.ACIItem;
import org.apache.directory.shared.ldap.aci.ACIItemParser;
import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -234,14 +234,14 @@
if ( dn.isEmpty() )
{
- String msg = Err.i18n( Err.ERR_8 );
+ String msg = I18n.err( I18n.ERR_8 );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( isTheAdministrator( dn ) )
{
- String msg = Err.i18n( Err.ERR_9, principalDn.getName(), dn.getName() );
+ String msg = I18n.err( I18n.ERR_9, principalDn.getName(), dn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -335,7 +335,7 @@
}
catch ( ParseException e )
{
- String msg = Err.i18n( Err.ERR_10, aciString );
+ String msg = I18n.err( I18n.ERR_10, aciString );
LOG.error( msg, e );
throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONS_ERROR );
}
@@ -388,7 +388,7 @@
}
catch ( ParseException e )
{
- String msg = Err.i18n( Err.ERR_11, aciString );
+ String msg = I18n.err( I18n.ERR_11, aciString );
LOG.error( msg, e );
throw new LdapNamingException( msg, ResultCodeEnum.OPERATIONS_ERROR );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Thu Jan 21 10:20:06 2010
@@ -49,7 +49,7 @@
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.partition.DefaultPartitionNexus;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -177,21 +177,21 @@
if ( name.isEmpty() )
{
- String msg = Err.i18n( Err.ERR_12 );
+ String msg = I18n.err( I18n.ERR_12 );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( name.getNormName().equals( ADMIN_GROUP_DN.getNormName() ) )
{
- String msg = Err.i18n( Err.ERR_13 );
+ String msg = I18n.err( I18n.ERR_13 );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( isTheAdministrator( name ) )
{
- String msg = Err.i18n( Err.ERR_14, principalDn.getName() );
+ String msg = I18n.err( I18n.ERR_14, principalDn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -202,14 +202,14 @@
{
if ( name.startsWith( USER_BASE_DN ) )
{
- String msg = Err.i18n( Err.ERR_15, principalDn.getName(), name.getName() );
+ String msg = I18n.err( I18n.ERR_15, principalDn.getName(), name.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( name.startsWith( GROUP_BASE_DN ) )
{
- String msg = Err.i18n( Err.ERR_16, principalDn.getName(), name.getName() );
+ String msg = I18n.err( I18n.ERR_16, principalDn.getName(), name.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -272,7 +272,7 @@
if ( dn.isEmpty() )
{
- String msg = Err.i18n( Err.ERR_17 );
+ String msg = I18n.err( I18n.ERR_17 );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -287,7 +287,7 @@
if ( dn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
{
- String msg = Err.i18n( Err.ERR_18, principalDn.getName() );
+ String msg = I18n.err( I18n.ERR_18, principalDn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -296,14 +296,14 @@
{
if ( dn.startsWith( USER_BASE_DN ) )
{
- String msg = Err.i18n( Err.ERR_19, principalDn.getName(), dn.getName() );
+ String msg = I18n.err( I18n.ERR_19, principalDn.getName(), dn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( dn.startsWith( GROUP_BASE_DN ) )
{
- String msg = Err.i18n( Err.ERR_20, principalDn.getName(), dn.getName() );
+ String msg = I18n.err( I18n.ERR_20, principalDn.getName(), dn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -368,28 +368,28 @@
if ( dn.getNormName().equals( ADMIN_GROUP_DN.getNormName() ) )
{
- String msg = Err.i18n( Err.ERR_21 );
+ String msg = I18n.err( I18n.ERR_21 );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( isTheAdministrator( dn ) )
{
- String msg = Err.i18n( Err.ERR_22, principalDn.getName(), dn.getName() );
+ String msg = I18n.err( I18n.ERR_22, principalDn.getName(), dn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( dn.size() > 2 && dn.startsWith( USER_BASE_DN ) && !isAnAdministrator( principalDn ) )
{
- String msg = Err.i18n( Err.ERR_23, principalDn.getName(), dn.getName() );
+ String msg = I18n.err( I18n.ERR_23, principalDn.getName(), dn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
if ( dn.size() > 2 && dn.startsWith( GROUP_BASE_DN ) && !isAnAdministrator( principalDn ) )
{
- String msg = Err.i18n( Err.ERR_24, principalDn.getName(), dn.getName() );
+ String msg = I18n.err( I18n.ERR_24, principalDn.getName(), dn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -424,7 +424,7 @@
return;
}
- String msg = Err.i18n( Err.ERR_25, normalizedDn.getName(), principalDn.getName() );
+ String msg = I18n.err( I18n.ERR_25, normalizedDn.getName(), principalDn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -437,7 +437,7 @@
return;
}
- String msg = Err.i18n( Err.ERR_26, normalizedDn.getName(), principalDn.getName() );
+ String msg = I18n.err( I18n.ERR_26, normalizedDn.getName(), principalDn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
@@ -451,7 +451,7 @@
return;
}
- String msg = Err.i18n( Err.ERR_27, principalDn.getName() );
+ String msg = I18n.err( I18n.ERR_27, principalDn.getName() );
LOG.error( msg );
throw new LdapNoPermissionException( msg );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Thu Jan 21 10:20:06 2010
@@ -37,7 +37,7 @@
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.aci.ACIItem;
import org.apache.directory.shared.ldap.aci.ACIItemParser;
import org.apache.directory.shared.ldap.aci.ACITuple;
@@ -199,7 +199,7 @@
}
catch ( ParseException e )
{
- String msg = Err.i18n( Err.ERR_28, item );
+ String msg = I18n.err( I18n.ERR_28, item );
LOG.error( msg, e );
// do not process this ACI Item because it will be null
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Thu Jan 21 10:20:06 2010
@@ -24,7 +24,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,7 +97,7 @@
{
if ( storeInitialized )
{
- LOG.error( Err.i18n( Err.ERR_29 ) );
+ LOG.error( I18n.err( I18n.ERR_29 ) );
}
else
{
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Thu Jan 21 10:20:06 2010
@@ -49,7 +49,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.interceptor.context.SearchingOperationContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
@@ -210,7 +210,7 @@
if ( !isAdmin )
{
// Wrong !
- String message = Err.i18n( Err.ERR_30, SchemaConstants.ENTRY_UUID_AT );
+ String message = I18n.err( I18n.ERR_30, SchemaConstants.ENTRY_UUID_AT );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
}
@@ -225,7 +225,7 @@
if ( !isAdmin )
{
// Wrong !
- String message = Err.i18n( Err.ERR_30, SchemaConstants.ENTRY_CSN_AT );
+ String message = I18n.err( I18n.ERR_30, SchemaConstants.ENTRY_CSN_AT );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
}
@@ -258,14 +258,14 @@
if ( attributeType.equals( MODIFIERS_NAME_ATTRIBUTE_TYPE ) )
{
- String message = Err.i18n( Err.ERR_31 );
+ String message = I18n.err( I18n.ERR_31 );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
}
if ( attributeType.equals( MODIFY_TIMESTAMP_ATTRIBUTE_TYPE ) )
{
- String message = Err.i18n( Err.ERR_32 );
+ String message = I18n.err( I18n.ERR_32 );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Thu Jan 21 10:20:06 2010
@@ -66,7 +66,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.interceptor.context.UnbindOperationContext;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.MultiException;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
@@ -199,7 +199,7 @@
}
catch ( IOException e )
{
- LOG.error( Err.i18n( Err.ERR_33 ) );
+ LOG.error( I18n.err( I18n.ERR_33 ) );
}
rootDSE.put( SchemaConstants.VENDOR_VERSION_AT, props.getProperty( "apacheds.version", "UNKNOWN" ) );
@@ -924,7 +924,7 @@
if ( partition == null )
{
- String msg = Err.i18n( Err.ERR_34, key );
+ String msg = I18n.err( I18n.ERR_34, key );
LOG.error( msg );
throw new NameNotFoundException( msg );
}
@@ -943,7 +943,7 @@
}
else
{
- String msg = Err.i18n( Err.ERR_35, key );
+ String msg = I18n.err( I18n.ERR_35, key );
LOG.error( msg );
throw new NameNotFoundException( msg );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Thu Jan 21 10:20:06 2010
@@ -40,7 +40,7 @@
import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -99,35 +99,35 @@
// This is the default value if we don't have any scope
// Let's assume that it's incorrect if we get something
// else in the LdapURL
- String message = Err.i18n( Err.ERR_36 );
+ String message = I18n.err( I18n.ERR_36 );
LOG.error( message );
throw new NamingException( message );
}
if ( !StringTools.isEmpty( ldapUrl.getFilter() ) )
{
- String message = Err.i18n( Err.ERR_37 );
+ String message = I18n.err( I18n.ERR_37 );
LOG.error( message );
throw new NamingException( message );
}
if ( ( ldapUrl.getAttributes() != null ) && ( ldapUrl.getAttributes().size() != 0 ) )
{
- String message = Err.i18n( Err.ERR_38 );
+ String message = I18n.err( I18n.ERR_38 );
LOG.error( message );
throw new NamingException( message );
}
if ( ( ldapUrl.getExtensions() != null ) && ( ldapUrl.getExtensions().size() != 0 ) )
{
- String message = Err.i18n( Err.ERR_39 );
+ String message = I18n.err( I18n.ERR_39 );
LOG.error( message );
throw new NamingException( message );
}
if ( ( ldapUrl.getExtensions() != null ) && ( ldapUrl.getExtensions().size() != 0 ) )
{
- String message = Err.i18n( Err.ERR_40 );
+ String message = I18n.err( I18n.ERR_40 );
LOG.error( message );
throw new NamingException( message );
}
@@ -136,7 +136,7 @@
if ( ( dn == null ) || dn.isEmpty() )
{
- String message = Err.i18n( Err.ERR_41 );
+ String message = I18n.err( I18n.ERR_41 );
LOG.error( message );
throw new NamingException( message );
}
@@ -176,7 +176,7 @@
if ( refAttr == null )
{
// very unlikely, as we have already checked the entry in SchemaInterceptor
- String message = Err.i18n( Err.ERR_42 );
+ String message = I18n.err( I18n.ERR_42 );
LOG.error( message );
throw new NamingException( message );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Thu Jan 21 10:20:06 2010
@@ -29,7 +29,7 @@
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
@@ -686,8 +686,8 @@
if ( idOid == null )
{
- log.error( Err.i18n( Err.ERR_43, id ) );
- throw new NamingException( Err.i18n( Err.ERR_44, id ) );
+ log.error( I18n.err( I18n.ERR_43, id ) );
+ throw new NamingException( I18n.err( I18n.ERR_44, id ) );
}
String[] comps = NamespaceTools.getCompositeComponents( name.get( name.size() - 1 ) );
@@ -701,8 +701,8 @@
if ( rdnAttrOid == null )
{
- log.error( Err.i18n( Err.ERR_44, rdnAttrOid ) );
- throw new NamingException( Err.i18n( Err.ERR_45, rdnAttrOid ) );
+ log.error( I18n.err( I18n.ERR_44, rdnAttrOid ) );
+ throw new NamingException( I18n.err( I18n.ERR_45, rdnAttrOid ) );
}
if ( rdnAttrOid.equalsIgnoreCase( idOid ) )
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Thu Jan 21 10:20:06 2010
@@ -57,7 +57,7 @@
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.i18n.Err;
+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.cursor.EmptyCursor;
@@ -535,7 +535,7 @@
}
catch ( UnsupportedEncodingException uee )
{
- String message = Err.i18n( Err.ERR_47 );
+ String message = I18n.err( I18n.ERR_47 );
LOG.error( message );
throw new NamingException( message );
}
@@ -551,7 +551,7 @@
}
catch ( UnsupportedEncodingException uee )
{
- String message = Err.i18n( Err.ERR_48 );
+ String message = I18n.err( I18n.ERR_48 );
LOG.error( message );
throw new NamingException( message );
}
@@ -571,7 +571,7 @@
{
if ( filter == null )
{
- String message = Err.i18n( Err.ERR_49 );
+ String message = I18n.err( I18n.ERR_49 );
LOG.error( message );
throw new NamingException( message );
}
@@ -596,7 +596,7 @@
if ( !schemaManager.lookupAttributeTypeRegistry( node.getAttribute() ).getSyntax().isHumanReadable() )
{
- String message = Err.i18n( Err.ERR_50 );
+ String message = I18n.err( I18n.ERR_50 );
LOG.error( message );
throw new NamingException( message );
}
@@ -636,7 +636,7 @@
if ( !schemaManager.lookupAttributeTypeRegistry( node.getAttribute() ).getSyntax().isHumanReadable() )
{
- String message = Err.i18n( Err.ERR_51 );
+ String message = I18n.err( I18n.ERR_51 );
LOG.error( message );
throw new NamingException( message );
}
@@ -1206,7 +1206,7 @@
if ( !attributeType.equals( MODIFIERS_NAME_ATTRIBUTE_TYPE ) &&
!attributeType.equals( MODIFY_TIMESTAMP_ATTRIBUTE_TYPE ) )
{
- String msg = Err.i18n( Err.ERR_52, attributeType );
+ String msg = I18n.err( I18n.ERR_52, attributeType );
LOG.error( msg );
throw new NoPermissionException( msg );
}
@@ -1219,7 +1219,7 @@
if ( !attribute.isValid() )
{
// The value syntax is incorrect : this is an error
- String msg = Err.i18n( Err.ERR_53, attributeType );
+ String msg = I18n.err( I18n.ERR_53, attributeType );
LOG.error( msg );
throw new LdapInvalidAttributeValueException( msg,
ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
@@ -1239,7 +1239,7 @@
if ( currentAttribute.contains( value ))
{
// This is an error.
- String msg = Err.i18n( Err.ERR_54, value );
+ String msg = I18n.err( I18n.ERR_54, value );
LOG.error( msg );
throw new LdapAttributeInUseException( msg );
}
@@ -1263,7 +1263,7 @@
// First check that the removed attribute exists
if ( !tempEntry.containsAttribute( attributeType ) )
{
- String msg = Err.i18n( Err.ERR_55, attributeType );
+ String msg = I18n.err( I18n.ERR_55, attributeType );
LOG.error( msg );
throw new LdapNoSuchAttributeException( msg );
}
@@ -1288,7 +1288,7 @@
}
else
{
- String msg = Err.i18n( Err.ERR_56, attributeType );
+ String msg = I18n.err( I18n.ERR_56, attributeType );
LOG.error( msg );
throw new LdapNoSuchAttributeException( msg );
}
@@ -1640,7 +1640,7 @@
case ABSTRACT :
if ( !superior.isAbstract() )
{
- String message = Err.i18n( Err.ERR_57 );
+ String message = I18n.err( I18n.ERR_57 );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1650,7 +1650,7 @@
case AUXILIARY :
if ( !superior.isAbstract() && ! superior.isAuxiliary() )
{
- String message = Err.i18n( Err.ERR_58 );
+ String message = I18n.err( I18n.ERR_58 );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1664,7 +1664,7 @@
catch ( NamingException ne )
{
// The superior OC does not exist : this is an error
- String message = Err.i18n( Err.ERR_59 );
+ String message = I18n.err( I18n.ERR_59 );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1863,7 +1863,7 @@
if ( structuralObjectClasses.isEmpty() )
{
- String message = Err.i18n( Err.ERR_60, dn );
+ String message = I18n.err( I18n.ERR_60, dn );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1895,7 +1895,7 @@
// Like the highlander there can only be one :).
if ( remaining.size() > 1 )
{
- String message = Err.i18n( Err.ERR_61, dn, remaining );
+ String message = I18n.err( I18n.ERR_61, dn, remaining );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.OBJECT_CLASS_VIOLATION );
}
@@ -1948,7 +1948,7 @@
if ( ( attribute == null ) || ( !attribute.contains( atav.getNormValue() ) ) )
{
- String message = Err.i18n( Err.ERR_62, dn, atav.getUpType() );
+ String message = I18n.err( I18n.ERR_62, dn, atav.getUpType() );
LOG.error( message );
throw new LdapSchemaViolationException( message, ResultCodeEnum.NOT_ALLOWED_ON_RDN );
}
@@ -2028,14 +2028,14 @@
}
catch ( UnsupportedEncodingException uee )
{
- String message = Err.i18n( Err.ERR_63 );
+ String message = I18n.err( I18n.ERR_63 );
LOG.error( message );
throw new NamingException( message );
}
}
else
{
- String message = Err.i18n( Err.ERR_64 );
+ String message = I18n.err( I18n.ERR_64 );
LOG.error( message );
throw new NamingException( message );
}
Modified: directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=901635&r1=901634&r2=901635&view=diff
==============================================================================
--- directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/sandbox/felixk/apacheds-i18n/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Thu Jan 21 10:20:06 2010
@@ -42,7 +42,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.i18n.Err;
+import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.SingletonEnumeration;
@@ -142,7 +142,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_65 ), e );
+ LOG.error( I18n.err( I18n.ERR_65 ), e );
}
}
@@ -178,7 +178,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_66 ), e );
+ LOG.error( I18n.err( I18n.ERR_66 ), e );
}
return null;
@@ -200,7 +200,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_67 ), e );
+ LOG.error( I18n.err( I18n.ERR_67 ), e );
}
return new Certificate[0];
@@ -234,7 +234,7 @@
}
catch ( Exception e )
{
- LOG.error( Err.i18n( Err.ERR_68 ), e );
+ LOG.error( I18n.err( I18n.ERR_68 ), e );
}
return null;