From a4da7a94d8470c9eff68cbeedc64bbfb209f92f9 Mon Sep 17 00:00:00 2001 From: emmanuel lecharny Date: Thu, 15 Aug 2024 08:46:16 +0200 Subject: [PATCH] Partial fix for DIRSERVER-1728 --- .../server/core/api/AbstractLayout.java | 2 +- .../server/core/jndi/ServerContext.java | 2 +- .../server/core/DefaultDirectoryService.java | 20 ++++---- .../server/core/DefaultOperationManager.java | 8 +-- .../server/core/security/TlsKeyGenerator.java | 14 +++--- .../apache/directory/server/i18n/I18n.java | 50 ++++++++----------- .../directory/server/i18n/errors.properties | 48 ++++++++---------- .../server/installers/MojoHelperUtils.java | 2 +- .../archive/ArchiveInstallerCommand.java | 2 +- .../installers/bin/BinInstallerCommand.java | 6 +-- .../installers/deb/DebInstallerCommand.java | 6 +-- .../macosxpkg/MacOsXPkgInstallerCommand.java | 30 +++++------ .../installers/nsis/NsisInstallerCommand.java | 2 +- .../installers/rpm/RpmInstallerCommand.java | 12 ++--- .../core/changelog/DefaultChangeLog.java | 2 +- .../core/changelog/MemoryChangeLogStore.java | 2 +- .../impl/btree/jdbm/JdbmPartition.java | 2 +- .../core/partition/ldif/LdifPartition.java | 2 +- .../impl/btree/mavibot/MavibotPartition.java | 2 +- .../provider/SyncReplRequestHandler.java | 2 +- .../server/config/LdifConfigExtractor.java | 10 ++-- .../directory/server/ApacheDsService.java | 2 +- .../impl/btree/AbstractBTreePartition.java | 2 +- 23 files changed, 108 insertions(+), 122 deletions(-) diff --git a/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java b/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java index b6d204934a..0170e91866 100644 --- a/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java +++ b/core-api/src/main/java/org/apache/directory/server/core/api/AbstractLayout.java @@ -115,7 +115,7 @@ public void mkdirs() throws IOException { if ( !requiredDirectory.exists() && !requiredDirectory.mkdirs() ) { - throw new IOException( I18n.err( I18n.ERR_02000_COULD_NOT_CREATE_DIRECTORY, requiredDirectory ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, requiredDirectory ) ); } } } diff --git a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java index 5dea15dd2e..5bbfd6753c 100644 --- a/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java +++ b/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java @@ -1178,7 +1178,7 @@ public void rename( Name oldName, Name newName ) throws NamingException if ( oldDn.size() == 0 ) { - throw new NoPermissionException( I18n.err( I18n.ERR_312 ) ); + throw new NoPermissionException( I18n.err( I18n.ERR_00014_CANNOT_REMOVE_ROOT_DSE ) ); } // calculate parents diff --git a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java index cba02cc7b3..d1dafbf4da 100644 --- a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java +++ b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java @@ -1013,7 +1013,7 @@ public long revert() throws LdapException { if ( changeLog == null || !changeLog.isEnabled() ) { - throw new IllegalStateException( I18n.err( I18n.ERR_310 ) ); + throw new IllegalStateException( I18n.err( I18n.ERR_00012_CHANGE_LOG_NOT_ENABLED ) ); } Tag latest = changeLog.getLatest(); @@ -1031,7 +1031,7 @@ public long revert() throws LdapException } } - throw new IllegalStateException( I18n.err( I18n.ERR_311 ) ); + throw new IllegalStateException( I18n.err( I18n.ERR_00013_MISSING_TAG_TO_REVERT ) ); } @@ -1042,7 +1042,7 @@ private void moddn( Dn oldDn, Dn newDn, boolean delOldRdn ) throws LdapException { if ( oldDn.size() == 0 ) { - throw new LdapNoPermissionException( I18n.err( I18n.ERR_312 ) ); + throw new LdapNoPermissionException( I18n.err( I18n.ERR_00014_CANNOT_REMOVE_ROOT_DSE ) ); } // calculate parents @@ -1085,17 +1085,17 @@ public long revert( long revision ) throws LdapException { if ( changeLog == null || !changeLog.isEnabled() ) { - throw new IllegalStateException( I18n.err( I18n.ERR_310 ) ); + throw new IllegalStateException( I18n.err( I18n.ERR_00012_CHANGE_LOG_NOT_ENABLED ) ); } if ( revision < 0 ) { - throw new IllegalArgumentException( I18n.err( I18n.ERR_239 ) ); + throw new IllegalArgumentException( I18n.err( I18n.ERR_00023_NEGATIVE_REVISION ) ); } if ( revision >= changeLog.getChangeLogStore().getCurrentRevision() ) { - throw new IllegalArgumentException( I18n.err( I18n.ERR_314 ) ); + throw new IllegalArgumentException( I18n.err( I18n.ERR_00015_TOO_HIGH_REVISION_NUMBER ) ); } Cursor cursor = changeLog.getChangeLogStore().findAfter( revision ); @@ -1160,8 +1160,8 @@ public long revert( long revision ) throws LdapException break; default: - LOG.error( I18n.err( I18n.ERR_75 ) ); - throw new NotImplementedException( I18n.err( I18n.ERR_76, reverse.getChangeType() ) ); + LOG.error( I18n.err( I18n.ERR_00016_CHANGE_TYPE_UNKNOWN ) ); + throw new NotImplementedException( I18n.err( I18n.ERR_00020_REVERT_CHANGE_TYPE_NOT_IMPLEMENTED, reverse.getChangeType() ) ); } } @@ -2131,7 +2131,7 @@ public Entry newEntry( String ldif, String dn ) } catch ( Exception e ) { - LOG.error( I18n.err( I18n.ERR_78, ldif, dn ) ); + LOG.error( I18n.err( I18n.ERR_00021_CANNOT_BUILD_ENTRY, ldif, dn ) ); // do nothing return null; } @@ -2293,7 +2293,7 @@ public void setReplicaId( int replicaId ) { if ( ( replicaId < 0 ) || ( replicaId > 999 ) ) { - LOG.error( I18n.err( I18n.ERR_79 ) ); + LOG.error( I18n.err( I18n.ERR_00022_BAD_REPLICA_ID ) ); this.replicaId = 0; } else diff --git a/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java b/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java index bc57b6938b..8b9142a723 100644 --- a/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java +++ b/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java @@ -193,7 +193,7 @@ private void eagerlyPopulateFields( OperationContext opContext ) throws LdapExce else { // This is an error : we *must* have an entry if we want to be able to rename. - throw new LdapNoSuchObjectException( I18n.err( I18n.ERR_256_NO_SUCH_OBJECT, opContext.getDn() ) ); + throw new LdapNoSuchObjectException( I18n.err( I18n.ERR_00017_NO_SUCH_OBJECT, opContext.getDn() ) ); } } } @@ -215,7 +215,7 @@ private Entry getOriginalEntry( OperationContext opContext ) throws LdapExceptio else { // This is an error : we *must* have an entry if we want to be able to rename. - throw new LdapNoSuchObjectException( I18n.err( I18n.ERR_256_NO_SUCH_OBJECT, + throw new LdapNoSuchObjectException( I18n.err( I18n.ERR_00017_NO_SUCH_OBJECT, opContext.getDn() ) ); } } @@ -337,7 +337,7 @@ private LdapReferralException buildReferralExceptionForSearch( Entry parentEntry private LdapPartialResultException buildLdapPartialResultException( Dn childDn ) { - LdapPartialResultException lpre = new LdapPartialResultException( I18n.err( I18n.ERR_315 ) ); + LdapPartialResultException lpre = new LdapPartialResultException( I18n.err( I18n.ERR_00018_CANNOT_CREATE_REFERRAL_WHEN_IGNORE ) ); lpre.setRemainingDn( childDn ); lpre.setResolvedDn( Dn.EMPTY_DN ); @@ -1992,7 +1992,7 @@ private void ensureStarted() throws LdapServiceUnavailableException { if ( !directoryService.isStarted() ) { - throw new LdapServiceUnavailableException( ResultCodeEnum.UNAVAILABLE, I18n.err( I18n.ERR_316 ) ); + throw new LdapServiceUnavailableException( ResultCodeEnum.UNAVAILABLE, I18n.err( I18n.ERR_00019_DIRECTORY_SERVICE_NOT_STARTED ) ); } } } diff --git a/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java b/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java index dccb33f499..8598a363cb 100644 --- a/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java +++ b/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java @@ -126,7 +126,7 @@ public static X509Certificate getCertificate( Entry entry ) throws LdapException } catch ( Exception e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_286 ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00005_FAILED_TO_GET_X509_CERTIFICATE_FACTORY ) ); ne.initCause( e ); throw ne; } @@ -140,7 +140,7 @@ public static X509Certificate getCertificate( Entry entry ) throws LdapException } catch ( CertificateException e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_287 ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00006_BAD_CERTIFICATE_FORMAT ) ); ne.initCause( e ); throw ne; } @@ -168,7 +168,7 @@ public static KeyPair getKeyPair( Entry entry ) throws LdapException } catch ( Exception e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_288, ALGORITHM ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00007_FAILED_TO_GET_KEY_FACTORY, ALGORITHM ) ); ne.initCause( e ); throw ne; } @@ -180,7 +180,7 @@ public static KeyPair getKeyPair( Entry entry ) throws LdapException } catch ( Exception e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_289 ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00008_BAD_PRIVATE_KEY_FORMAT ) ); ne.initCause( e ); throw ne; } @@ -192,7 +192,7 @@ public static KeyPair getKeyPair( Entry entry ) throws LdapException } catch ( InvalidKeySpecException e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_290 ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00009_BAD_PUBLIC_KEY_FORMAT ) ); ne.initCause( e ); throw ne; } @@ -278,7 +278,7 @@ public static void addKeyPair( Entry entry, String issuerDN, String subjectDN, D } catch ( NoSuchAlgorithmException e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_291 ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00010_CANNPOT_GENERATE_KEY_PAIR ) ); ne.initCause( e ); throw ne; } @@ -325,7 +325,7 @@ public static void addKeyPair( Entry entry, String issuerDN, String subjectDN, D } catch ( Exception e ) { - LdapException ne = new LdapException( I18n.err( I18n.ERR_292 ) ); + LdapException ne = new LdapException( I18n.err( I18n.ERR_00011_CANNOT_GENERATE_SELF_SIGNED_CERTIFICATE ) ); ne.initCause( e ); throw ne; } diff --git a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java index 428855954a..4b54ab3fbb 100644 --- a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java +++ b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java @@ -40,11 +40,29 @@ public enum I18n ERR_00002_FAILED_COMPARE_CERTIFICATE_BYTES("ERR_00002_FAILED_COMPARE_CERTIFICATE_BYTES"), ERR_00003_FAILED_EXTRACT_KEY("ERR_00003_FAILED_EXTRACT_KEY"), ERR_00004_COULD_NOT_CREATE_DIRECTORY("ERR_00004_COULD_NOT_CREATE_DIRECTORY"), + ERR_00005_FAILED_TO_GET_X509_CERTIFICATE_FACTORY("ERR_00005_FAILED_TO_GET_X509_CERTIFICATE_FACTORY"), + ERR_00006_BAD_CERTIFICATE_FORMAT("ERR_00006_BAD_CERTIFICATE_FORMAT"), + ERR_00007_FAILED_TO_GET_KEY_FACTORY("ERR_00007_FAILED_TO_GET_KEY_FACTORY"), + ERR_00008_BAD_PRIVATE_KEY_FORMAT("ERR_00008_BAD_PRIVATE_KEY_FORMAT"), + ERR_00009_BAD_PUBLIC_KEY_FORMAT("ERR_00009_BAD_PUBLIC_KEY_FORMAT"), + ERR_00010_CANNPOT_GENERATE_KEY_PAIR("ERR_00010_CANNPOT_GENERATE_KEY_PAIR"), + ERR_00011_CANNOT_GENERATE_SELF_SIGNED_CERTIFICATE("ERR_00011_CANNOT_GENERATE_SELF_SIGNED_CERTIFICATE"), + ERR_00012_CHANGE_LOG_NOT_ENABLED("ERR_00012_CHANGE_LOG_NOT_ENABLED"), + ERR_00013_MISSING_TAG_TO_REVERT("ERR_00013_MISSING_TAG_TO_REVERT"), + ERR_00014_CANNOT_REMOVE_ROOT_DSE("ERR_00014_CANNOT_REMOVE_ROOT_DSE"), + ERR_00015_TOO_HIGH_REVISION_NUMBER("ERR_00015_TOO_HIGH_REVISION_NUMBER"), + ERR_00016_CHANGE_TYPE_UNKNOWN("ERR_00016_CHANGE_TYPE_UNKNOWN"), + ERR_00017_NO_SUCH_OBJECT("ERR_00017_NO_SUCH_OBJECT"), + ERR_00018_CANNOT_CREATE_REFERRAL_WHEN_IGNORE("ERR_00018_CANNOT_CREATE_REFERRAL_WHEN_IGNORE"), + ERR_00019_DIRECTORY_SERVICE_NOT_STARTED("ERR_00019_DIRECTORY_SERVICE_NOT_STARTED"), + ERR_00020_REVERT_CHANGE_TYPE_NOT_IMPLEMENTED("ERR_00020_REVERT_CHANGE_TYPE_NOT_IMPLEMENTED"), + ERR_00021_CANNOT_BUILD_ENTRY("ERR_00021_CANNOT_BUILD_ENTRY"), + ERR_00022_BAD_REPLICA_ID("ERR_00022_BAD_REPLICA_ID"), + ERR_00023_NEGATIVE_REVISION("ERR_00023_NEGATIVE_REVISION"), // apacheds-core-annotation errors 1000 - 1999 // apacheds-core-api errors 2000 - 2999 - ERR_02000_COULD_NOT_CREATE_DIRECTORY("ERR_02000_COULD_NOT_CREATE_DIRECTORY"), // apacheds-core-avl errors 3000 - 3999 ERR_03000_NEGATIVE_AVL_NODE_COUNT("ERR_03000_NEGATIVE_AVL_NODE_COUNT"), @@ -67,7 +85,6 @@ public enum I18n // apacheds-installers errors 10000 - 10999 // apacheds-installers-maven-plugins errors 11000 - 11999 - ERR_11000_COULD_NOT_CREATE_DIRECTORY("ERR_11000_COULD_NOT_CREATE_DIRECTORY"), // apacheds-interceptor-kerberos errors 12000 - 12999 // apacheds-interceptors-admin errors 13000 - 13999 @@ -89,33 +106,26 @@ public enum I18n // apacheds-interceptors-subtree errors 29000 - 29999 // apacheds-interceptors-trigger errors 30000 - 30999 // apacheds-jdbm-partition errors 31000 - 31999 - ERR_31000_COULD_NOT_CREATE_DIRECTORY("ERR_31000_COULD_NOT_CREATE_DIRECTORY"), ERR_31001_ODD_NUMBER_OF_BYTES_IN_SERIALIZED_STRING("ERR_31001_ODD_NUMBER_OF_BYTES_IN_SERIALIZED_STRING"), ERR_31002_NEGATIOVE_NB_ATTRIBUTES_IN_ENTRY("ERR_31002_NEGATIOVE_NB_ATTRIBUTES_IN_ENTRY"), // apacheds-kerberos-codec errors 32000 - 32999 - // apacheds-ldif-partition errors 33000 - 33999 - ERR_33000_COULD_NOT_CREATE_DIRECTORY("ERR_33000_COULD_NOT_CREATE_DIRECTORY"), - + // apacheds-ldif-partition errors 33000 - 33999 // apacheds-mavipot-partition errors 34000 - 34999 - ERR_34000_COULD_NOT_CREATE_DIRECTORY("ERR_34000_COULD_NOT_CREATE_DIRECTORY"), // apacheds-osgi-integ errors 35000 - 35999 // apacheds-protocol-dhcp errors 36000 - 36999 // apacheds-protocol-dns errors 37000 - 37999 // apacheds-protocol-ldap errors 38000 - 38999 - ERR_38000_COULD_NOT_CREATE_DIRECTORY("ERR_38000_COULD_NOT_CREATE_DIRECTORY"), // apacheds-protocol-ntp errors 39000 - 39999 // apacheds-protocol-shared errors 40000 - 40999 // apacheds-server-annotations errors 41000 - 41999 // apacheds-server-config errors 42000 - 42999 - ERR_42000_COULD_NOT_CREATE_DIRECTORY("ERR_42000_COULD_NOT_CREATE_DIRECTORY"), // apacheds-server-integ errors 43000 - 43999 // apacheds-server-jndi errors 44000 - 44999 // apacheds-service errors 45000 - 45999 - ERR_45000_COULD_NOT_CREATE_DIRECTORY("ERR_45000_COULD_NOT_CREATE_DIRECTORY"), // apacheds-service-builder errors 46000 - 46999 // apacheds-test-framework errors 47000 - 47999 @@ -192,11 +202,7 @@ public enum I18n ERR_72("ERR_72"), ERR_73("ERR_73"), ERR_74("ERR_74"), - ERR_75("ERR_75"), - ERR_76("ERR_76"), ERR_77("ERR_77"), - ERR_78("ERR_78"), - ERR_79("ERR_79"), ERR_80("ERR_80"), ERR_81("ERR_81"), ERR_82("ERR_82"), @@ -355,7 +361,6 @@ public enum I18n ERR_236("ERR_236"), ERR_237("ERR_237"), ERR_238("ERR_238"), - ERR_239("ERR_239"), ERR_240("ERR_240"), ERR_241_CANNOT_STORE_COLLECTIVE_ATT_IN_ENTRY("ERR_241_CANNOT_STORE_COLLECTIVE_ATT_IN_ENTRY"), ERR_242("ERR_242"), @@ -372,7 +377,6 @@ public enum I18n ERR_253("ERR_253"), ERR_254_ADD_EXISTING_VALUE("ERR_254_ADD_EXISTING_VALUE"), ERR_255("ERR_255"), - ERR_256_NO_SUCH_OBJECT("ERR_256_NO_SUCH_OBJECT"), ERR_257_COLLECTIVE_SUBENTRY_WITHOUT_COLLECTIVE_AT("ERR_257_COLLECTIVE_SUBENTRY_WITHOUT_COLLECTIVE_AT"), ERR_258("ERR_258"), ERR_259("ERR_259"), @@ -402,13 +406,6 @@ public enum I18n ERR_283("ERR_283"), ERR_284("ERR_284"), ERR_285("ERR_285"), - ERR_286("ERR_286"), - ERR_287("ERR_287"), - ERR_288("ERR_288"), - ERR_289("ERR_289"), - ERR_290("ERR_290"), - ERR_291("ERR_291"), - ERR_292("ERR_292"), ERR_293("ERR_293"), ERR_294("ERR_294"), ERR_295("ERR_295"), @@ -426,13 +423,8 @@ public enum I18n ERR_307("ERR_307"), ERR_308("ERR_308"), ERR_309("ERR_309"), - ERR_310("ERR_310"), - ERR_311("ERR_311"), - ERR_312("ERR_312"), + ERR_313("ERR_313"), - ERR_314("ERR_314"), - ERR_315("ERR_315"), - ERR_316("ERR_316"), ERR_317("ERR_317"), // ERR_318( "ERR_318" ), ERR_319("ERR_319"), diff --git a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties index 30fe3b405c..1931921ab7 100644 --- a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties +++ b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties @@ -27,11 +27,31 @@ ERR_00001_FAILED_CERTIFICATE_ACCESS=Failed to access certificate in DIT. ERR_00002_FAILED_COMPARE_CERTIFICATE_BYTES=Failed on attempt to compare certificate bytes to determine alias. ERR_00003_FAILED_EXTRACT_KEY=Failed on attempt to extract key. ERR_00004_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} +ERR_00005_FAILED_TO_GET_X509_CERTIFICATE_FACTORY=Failed to get BC Certificate factory for algorithm: X.509 +ERR_00006_BAD_CERTIFICATE_FORMAT=Bad certificate format. +ERR_00007_FAILED_TO_GET_KEY_FACTORY=Failed to get key factory for algorithm: {0} +ERR_00008_BAD_PRIVATE_KEY_FORMAT=Bad private key format. +ERR_00009_BAD_PUBLIC_KEY_FORMAT=Bad public key format. +ERR_00010_CANNPOT_GENERATE_KEY_PAIR=Cannot generate key pair for TLS +ERR_00011_CANNOT_GENERATE_SELF_SIGNED_CERTIFICATE=Cannot generate self signed certificate. +ERR_00012_CHANGE_LOG_NOT_ENABLED=The change log must be enabled to revert to previous log revisions. +ERR_00013_MISSING_TAG_TO_REVERT=There must be at least one tag to revert to the latest tag. +ERR_00014_CANNOT_REMOVE_ROOT_DSE=can''t rename the rootDSE +ERR_00015_TOO_HIGH_REVISION_NUMBER=revision must be less than the current revision +ERR_00016_CHANGE_TYPE_UNKNOWN=ChangeType unknown +ERR_00017_NO_SUCH_OBJECT=Entry {0} does not exist! +ERR_00018_CANNOT_CREATE_REFERRAL_WHEN_IGNORE=cannot create an entry under a referral when the Context.REFERRAL is set to ''ignore'' +ERR_00019_DIRECTORY_SERVICE_NOT_STARTED=Directory service is not started. +ERR_00020_REVERT_CHANGE_TYPE_NOT_IMPLEMENTED=Reverts of change type {0} has not yet been implemented! +ERR_00021_CANNOT_BUILD_ENTRY=Cannot build an entry for ''{0}'' and this DN :''{1}'' +ERR_00022_BAD_REPLICA_ID=The replicaId must be in [0, 999] +ERR_00023_NEGATIVE_REVISION=revision must be greater than or equal to 0 + + # apacheds-core-annotation errors 1000 - 1999 # apacheds-core-api errors 2000 - 2999 -ERR_02000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-core-avl errors 3000 - 3999 ERR_03000_NEGATIVE_AVL_NODE_COUNT=The number of node for the deserialized AVL is negative @@ -54,7 +74,6 @@ ERR_03003_INVALID_NODE_NUMBER=The Node number is not valid: {0}, {1} expected # apacheds-installers errors 10000 - 10999 # apacheds-installers-maven-plugins errors 11000 - 11999 -ERR_11000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-interceptor-kerberos errors 12000 - 12999 # apacheds-interceptors-admin errors 13000 - 13999 @@ -76,33 +95,27 @@ ERR_11000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-interceptors-subtree errors 29000 - 29999 # apacheds-interceptors-trigger errors 30000 - 30999 # apacheds-jdbm-partition errors 31000 - 31999 -ERR_31000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} ERR_31001_ODD_NUMBER_OF_BYTES_IN_SERIALIZED_STRING=The serialized String contains an odd number of bytes ERR_31002_NEGATIOVE_NB_ATTRIBUTES_IN_ENTRY=The number of attributes is negative # apacheds-kerberos-codec errors 32000 - 32999 # apacheds-ldif-partition errors 33000 - 33999 -ERR_33000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-mavipot-partition errors 34000 - 34999 -ERR_34000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-osgi-integ errors 35000 - 35999 # apacheds-protocol-dhcp errors 36000 - 36999 # apacheds-protocol-dns errors 37000 - 37999 # apacheds-protocol-ldap errors 38000 - 38999 -ERR_38000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-protocol-ntp errors 39000 - 39999 # apacheds-protocol-shared errors 40000 - 40999 # apacheds-server-annotations errors 41000 - 41999 # apacheds-server-config errors 42000 - 42999 -ERR_42000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-server-integ errors 43000 - 43999 # apacheds-server-jndi errors 44000 - 44999 # apacheds-service errors 45000 - 45999 -ERR_45000_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0} # apacheds-service-builder errors 46000 - 46999 # apacheds-test-framework errors 47000 - 47999 @@ -179,11 +192,7 @@ ERR_71=failed to parse the new subtreeSpecification ERR_72=failed to parse entryTrigger: {0} ERR_73=TriggerSpecification parser failure on ''{0}''. Cannot add Trigger Specifications to TriggerSpecCache. ERR_74=SynchWorker failed to synch directory. -ERR_75=ChangeType unknown -ERR_76=Reverts of change type {0} has not yet been implemented! ERR_77=Encountered a failure while trying to revert to a previous revision: {0}, msg : {1} -ERR_78=Cannot build an entry for ''{0}'' and this DN :''{1}'' -ERR_79=The replicaId must be in [0, 999] ERR_80=Cannot inject the following entry : {0}. Error : {1}. ERR_81=Schema entity containers of objectClass organizationalUnit should be 3 name components in length. ERR_82=Expecting organizationalUnit with one of the following names: {0} @@ -342,7 +351,6 @@ ERR_235=Undefined modify operation value of {0} ERR_236=The ChangeLog has not been enabled. ERR_237=The underlying changelog store does not support searching through it''s logs ERR_238=The underlying changelog store does not support searching through it''s tags -ERR_239=revision must be greater than or equal to 0 ERR_240=revision must be less than or equal to the current revision ERR_241_CANNOT_STORE_COLLECTIVE_ATT_IN_ENTRY=Collective attributes cannot be stored in non-collectiveAttributeSubentries ERR_242=Cannot operate on collective attributes in non-collectiveAttributeSubentries @@ -359,7 +367,6 @@ ERR_252_ALIAS_WITH_CHILD_NOT_ALLOWED=Attempt to add entry ''{0}'' under alias '' ERR_253=Can not allow the deletion of the subschemaSubentry ({0}) for the global schema. ERR_254_ADD_EXISTING_VALUE=Trying to add existing value ''{0}'' to attribute {1} ERR_255=Can not allow the renaming of the subschemaSubentry ({0}) for the global schema: it is fixed at {1} -ERR_256_NO_SUCH_OBJECT=Entry {0} does not exist! ERR_257_COLLECTIVE_SUBENTRY_WITHOUT_COLLECTIVE_AT=A CollectiveAttribute Subentry must have at least one collective Attribute ERR_258=Can not allow the move of the subschemaSubentry ({0}) for the global schema\: it is fixed at {1} ERR_259=Attempt to search under non-existant entry\: @@ -389,13 +396,6 @@ ERR_282=The value stored in an Human Readable attribute is not a String ERR_283=Modify REPLACE operations on schema subentries are not allowed\: it''s just silly to destroy and recreate so many \nschema entities that reside in schema operational attributes. Instead use \na targeted combination of modify ADD and REMOVE operations. ERR_284=Undefined modify operation: {0} ERR_285=Unknown index into handler array: {0} -ERR_286=Failed to get BC Certificate factory for algorithm: X.509 -ERR_287=Bad certificate format. -ERR_288=Failed to get key factory for algorithm: {0} -ERR_289=Bad private key format. -ERR_290=Bad public key format. -ERR_291=Cannot generate key pair for TLS -ERR_292=Cannot generate self signed certificate. ERR_293=Class {0} not found in DIT. ERR_294=Stored Procedure Language, {0} is not supported. ERR_295=node cannot be null @@ -413,13 +413,7 @@ ERR_306=Administration point {0} does not contain an administrativeRole attribut ERR_307=Failed while parsing subtreeSpecification for {0} ERR_308=Will not allow rename operation on entries with administrative descendants. ERR_309=Bad value for the OID {0} -ERR_310=The change log must be enabled to revert to previous log revisions. -ERR_311=There must be at least one tag to revert to the latest tag. -ERR_312=can''t rename the rootDSE ERR_313=Invalid operation on Name {0} -ERR_314=revision must be less than the current revision -ERR_315=cannot create an entry under a referral when the Context.REFERRAL is set to ''ignore'' -ERR_316=Directory service is not started. ERR_317=Schema load failed : {0} # ERR_318= ERR_319=Cannot execute indirect lookup if it is not the next operation. diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java index c13efd274c..7dc42c8a2f 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/MojoHelperUtils.java @@ -219,7 +219,7 @@ public static void copyFiles( File src, File dest ) throws IOException if ( !dest.mkdirs() ) { - throw new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, dest ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, dest ) ); } for ( File file : files ) diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java index 10daaa7e50..acf9ef44c6 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveInstallerCommand.java @@ -167,7 +167,7 @@ public void execute() throws MojoExecutionException, MojoFailureException // will be packaged to form the installer if ( !getTargetDirectory().mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java index f3e39ef1e8..2ff57a8fed 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java @@ -87,7 +87,7 @@ public void execute() throws MojoExecutionException, MojoFailureException // Creating the target directory if ( !getTargetDirectory().mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -104,7 +104,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !instanceDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, instanceDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, instanceDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -130,7 +130,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !binShDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, binShDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, binShDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java index 4a2e157939..40845f7fc6 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java @@ -102,7 +102,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !getTargetDirectory().mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -119,7 +119,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !debEtcInitdDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, debEtcInitdDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, debEtcInitdDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -139,7 +139,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !debDebianDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, debDebianDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, debDebianDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java index bf4c01a763..ff8a63d52e 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/macosxpkg/MacOsXPkgInstallerCommand.java @@ -211,7 +211,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !targetDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -223,7 +223,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgRootDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -232,7 +232,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootUsrBinDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgRootUsrBinDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootUsrBinDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -242,7 +242,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootUsrLocalApachedsDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootUsrLocalApachedsDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -252,7 +252,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootInstancesDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -261,7 +261,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootInstancesDefaultDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDefaultDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -272,7 +272,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootInstancesDefaultConfDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDefaultConfDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -282,7 +282,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootInstancesDefaultDirectoryLog.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDefaultDirectoryLog ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -293,7 +293,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootInstancesDefaultDirectoryPartitions.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDefaultDirectoryPartitions ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -303,7 +303,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootInstancesDefaultDirectoryRun.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDefaultDirectoryRun ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -313,7 +313,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgRootLibraryLaunchDaemons.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgRootLibraryLaunchDaemons ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -342,7 +342,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgResourcesEnglishDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgResourcesEnglishDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); @@ -352,7 +352,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !pkgScriptsDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgScriptsDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, pkgScriptsDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -415,7 +415,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !dmgDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, dmgDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, dmgDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -427,7 +427,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !dmgDmgBackgroundDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, dmgDmgBackgroundDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, dmgDmgBackgroundDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java index 212070b60f..2fcbaf3b12 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/nsis/NsisInstallerCommand.java @@ -157,7 +157,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !targetDirectory.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java index 96bf16d7bb..18f2589399 100644 --- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java +++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java @@ -91,7 +91,7 @@ public void execute() throws MojoExecutionException, MojoFailureException // Creating the target directory if ( !getTargetDirectory().mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -105,7 +105,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !rpmBuild.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmBuild ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, rpmBuild ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -114,7 +114,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !rpmRpms.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmRpms ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, rpmRpms ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -123,7 +123,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !rpmSources.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmSources ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, rpmSources ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -132,7 +132,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !rpmSpecs.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmSpecs ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, rpmSpecs ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } @@ -141,7 +141,7 @@ public void execute() throws MojoExecutionException, MojoFailureException if ( !rpmSrpms.mkdirs() ) { - Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmSrpms ) ); + Exception e = new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, rpmSrpms ) ); log.error( e.getLocalizedMessage() ); throw new MojoFailureException( e.getMessage() ); } diff --git a/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java b/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java index a6a72806e9..2a5703fc16 100644 --- a/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java +++ b/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java @@ -245,7 +245,7 @@ public Tag tag( long revision, String description ) throws Exception { if ( revision < 0 ) { - throw new IllegalArgumentException( I18n.err( I18n.ERR_239 ) ); + throw new IllegalArgumentException( I18n.err( I18n.ERR_00023_NEGATIVE_REVISION ) ); } if ( revision > store.getCurrentRevision() ) diff --git a/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java b/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java index 796c8dfb01..e775992dfb 100644 --- a/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java +++ b/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java @@ -433,7 +433,7 @@ public ChangeLogEvent lookup( long revision ) { if ( revision < 0 ) { - throw new IllegalArgumentException( I18n.err( I18n.ERR_239 ) ); + throw new IllegalArgumentException( I18n.err( I18n.ERR_00023_NEGATIVE_REVISION ) ); } if ( revision > getCurrentRevision() ) diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java index 5064e25725..3843070fbc 100644 --- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java +++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java @@ -421,7 +421,7 @@ protected void doInit() throws LdapException if ( !partitionDir.exists() && !partitionDir.mkdirs() ) { - throw new LdapOtherException( I18n.err( I18n.ERR_31000_COULD_NOT_CREATE_DIRECTORY, partitionDir ) ); + throw new LdapOtherException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, partitionDir ) ); } // First, check if the file storing the data exists diff --git a/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java b/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java index 883dedceb1..2826902749 100644 --- a/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java +++ b/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java @@ -700,7 +700,7 @@ private File getFile( Dn entryDn, boolean create ) throws LdapException // We have to create the entry if it does not have a parent if ( !dir.mkdir() ) { - throw new LdapException( I18n.err( I18n.ERR_33000_COULD_NOT_CREATE_DIRECTORY, dir ) ); + throw new LdapException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, dir ) ); } } diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java index 1ffeb9a285..35ba35cef3 100644 --- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java +++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotPartition.java @@ -155,7 +155,7 @@ protected void doInit() throws LdapException if ( !partitionDir.exists() && !partitionDir.mkdirs() ) { - throw new LdapOtherException( I18n.err( I18n.ERR_34000_COULD_NOT_CREATE_DIRECTORY, partitionDir ) ); + throw new LdapOtherException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, partitionDir ) ); } if ( cacheSize < 0 ) diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java index 75051b6c5c..0a116370ca 100644 --- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java +++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java @@ -196,7 +196,7 @@ public void start( LdapServer server ) if ( !syncReplData.exists() && !syncReplData.mkdirs() ) { - throw new IOException( I18n.err( I18n.ERR_38000_COULD_NOT_CREATE_DIRECTORY, syncReplData ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, syncReplData ) ); } // Create the replication manager diff --git a/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java b/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java index 38240e5e12..e8f25ef4c6 100644 --- a/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java +++ b/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java @@ -85,7 +85,7 @@ public static void extract( File outputDirectory, boolean overwrite ) throws IOE LOG.debug( "creating non existing output directory {}", outputDirectory.getAbsolutePath() ); if ( !outputDirectory.mkdir() ) { - throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, outputDirectory ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, outputDirectory ) ); } } @@ -96,7 +96,7 @@ public static void extract( File outputDirectory, boolean overwrite ) throws IOE LOG.debug( "creating non existing config directory {}", configDirectory.getAbsolutePath() ); if ( !configDirectory.mkdir() ) { - throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, configDirectory ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, configDirectory ) ); } } else if ( !overwrite ) @@ -137,7 +137,7 @@ private static void copyFile( File source, File destination ) throws IOException if ( !destination.getParentFile().exists() && !destination.getParentFile().mkdirs() ) { - throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, destination.getParentFile() ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, destination.getParentFile() ) ); } if ( !source.getParentFile().exists() ) @@ -185,7 +185,7 @@ private static void extractFromJar( File outputDirectory, String resource ) thro if ( !destination.getParentFile().exists() && !destination.getParentFile().mkdirs() ) { - throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, destination.getParentFile() ) ); } @@ -283,7 +283,7 @@ public static String extractSingleFileConfig( File configDir, String file, boole if ( !configDir.mkdir() ) { throw new RuntimeException( - new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, configDir ) ) ); + new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, configDir ) ) ); } } else diff --git a/service/src/main/java/org/apache/directory/server/ApacheDsService.java b/service/src/main/java/org/apache/directory/server/ApacheDsService.java index 36b1183efb..4e30113f9d 100644 --- a/service/src/main/java/org/apache/directory/server/ApacheDsService.java +++ b/service/src/main/java/org/apache/directory/server/ApacheDsService.java @@ -164,7 +164,7 @@ public void start( InstanceLayout instanceLayout, boolean startServers ) throws if ( !partitionsDir.mkdirs() ) { - throw new IOException( I18n.err( I18n.ERR_45000_COULD_NOT_CREATE_DIRECTORY, partitionsDir ) ); + throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY, partitionsDir ) ); } } diff --git a/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java b/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java index a8ad3fe81c..8476c23842 100644 --- a/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java +++ b/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java @@ -2109,7 +2109,7 @@ public final synchronized void move( PartitionTxn partitionTxn, Dn oldDn, Dn new { // This is not allowed : the parent must exist throw new LdapEntryAlreadyExistsException( - I18n.err( I18n.ERR_256_NO_SUCH_OBJECT, newSuperiorDn.getName() ) ); + I18n.err( I18n.ERR_00017_NO_SUCH_OBJECT, newSuperiorDn.getName() ) ); } // Now check that the new entry does not exist