You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2024/08/14 10:29:49 UTC
(directory-server) branch master updated: Bumped up some plugins version
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 0d2540f3f5 Bumped up some plugins version
0d2540f3f5 is described below
commit 0d2540f3f55a2d993049954a1864b0af36e68b21
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Aug 14 09:26:09 2024 +0200
Bumped up some plugins version
---
.../directory/server/core/api/AbstractLayout.java | 2 +-
.../server/core/DefaultDirectoryService.java | 10 +--
.../server/core/security/CoreKeyStoreSpi.java | 8 +-
.../org/apache/directory/server/i18n/I18n.java | 87 ++++++++++++++++++++--
.../apache/directory/server/i18n/errors.properties | 87 ++++++++++++++++++++--
.../server/installers/MojoHelperUtils.java | 2 +-
.../archive/ArchiveInstallerCommand.java | 2 +-
.../server/installers/bin/BinInstallerCommand.java | 6 +-
.../server/installers/deb/DebInstallerCommand.java | 6 +-
.../macosxpkg/MacOsXPkgInstallerCommand.java | 30 ++++----
.../installers/nsis/NsisInstallerCommand.java | 2 +-
.../server/installers/rpm/RpmInstallerCommand.java | 12 +--
.../partition/impl/btree/jdbm/JdbmPartition.java | 2 +-
.../server/core/partition/ldif/LdifPartition.java | 2 +-
.../impl/btree/mavibot/MavibotPartition.java | 2 +-
.../provider/SyncReplRequestHandler.java | 2 +-
.../server/config/LdifConfigExtractor.java | 10 +--
.../apache/directory/server/ApacheDsService.java | 2 +-
18 files changed, 214 insertions(+), 60 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 b8541e8baf..b6d204934a 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 abstract class AbstractLayout
{
if ( !requiredDirectory.exists() && !requiredDirectory.mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, requiredDirectory ) );
+ throw new IOException( I18n.err( I18n.ERR_02000_COULD_NOT_CREATE_DIRECTORY, requiredDirectory ) );
}
}
}
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 3edf7793a0..cba02cc7b3 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
@@ -727,31 +727,31 @@ public class DefaultDirectoryService implements DirectoryService
// Create the directories if they are missing
if ( !instanceLayout.getInstanceDirectory().exists() && !instanceLayout.getInstanceDirectory().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY,
instanceLayout.getInstanceDirectory() ) );
}
if ( !instanceLayout.getLogDirectory().exists() && !instanceLayout.getLogDirectory().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY,
instanceLayout.getLogDirectory() ) );
}
if ( !instanceLayout.getRunDirectory().exists() && !instanceLayout.getRunDirectory().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY,
instanceLayout.getRunDirectory() ) );
}
if ( !instanceLayout.getPartitionsDirectory().exists() && !instanceLayout.getPartitionsDirectory().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY,
instanceLayout.getPartitionsDirectory() ) );
}
if ( !instanceLayout.getConfDirectory().exists() && !instanceLayout.getConfDirectory().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ throw new IOException( I18n.err( I18n.ERR_00004_COULD_NOT_CREATE_DIRECTORY,
instanceLayout.getConfDirectory() ) );
}
}
diff --git a/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java b/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
index c59f91b97c..d031e71929 100644
--- a/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
+++ b/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
@@ -141,7 +141,7 @@ public class CoreKeyStoreSpi extends KeyStoreSpi
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_65 ), e );
+ LOG.error( I18n.err( I18n.ERR_00001_FAILED_CERTIFICATE_ACCESS ), e );
}
}
@@ -187,7 +187,7 @@ public class CoreKeyStoreSpi extends KeyStoreSpi
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_66 ), e );
+ LOG.error( I18n.err( I18n.ERR_00002_FAILED_COMPARE_CERTIFICATE_BYTES ), e );
}
return null;
@@ -213,7 +213,7 @@ public class CoreKeyStoreSpi extends KeyStoreSpi
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_66 ), e );
+ LOG.error( I18n.err( I18n.ERR_00002_FAILED_COMPARE_CERTIFICATE_BYTES ), e );
}
return new Certificate[0];
@@ -250,7 +250,7 @@ public class CoreKeyStoreSpi extends KeyStoreSpi
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_68 ), e );
+ LOG.error( I18n.err( I18n.ERR_00003_FAILED_EXTRACT_KEY ), e );
}
return null;
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 b859ed71dd..71ddbd161b 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
@@ -35,6 +35,88 @@ import java.util.ResourceBundle;
*/
public enum I18n
{
+ // apacheds-core errors 0 - 999
+ ERR_00001_FAILED_CERTIFICATE_ACCESS("ERR_00001_FAILED_CERTIFICATE_ACCESS"),
+ 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"),
+
+ // 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
+
+ // apacheds-core-constants errors 4000 - 4999
+
+ // apacheds-core-integ errors 5000 - 5999
+
+ // apacheds-core-jndi errors 6000 - 6999
+
+ // apacheds-core-shared errors 7000 - 7999
+
+ // apacheds-http-directory-bridge errors 8000 - 8999
+
+ // apacheds-http-integration errors 9000 - 9999
+
+ // 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
+ // apacheds-interceptors-authn errors 14000 - 14999
+ // apacheds-interceptors-authz errors 15000 - 15999
+ // apacheds-interceptors-changelog errors 16000 - 16999
+ // apacheds-interceptors-collective errors 17000 - 17999
+ // apacheds-interceptors-event errors 18000 - 18999
+ // apacheds-interceptors-exception errors 19000 - 19999
+ // apacheds-interceptors-hash errors 20000 - 20999
+ // apacheds-interceptors-journal errors 21000 - 21999
+ // apacheds-interceptors-logger errors 22000 - 22999
+ // apacheds-interceptors-normalization errors 23000 - 23999
+ // apacheds-interceptors-number errors 24000 - 24999
+ // apacheds-interceptors-operational errors 25000 - 25999
+ // apacheds-interceptors-ppolicy errors 26000 - 26999
+ // apacheds-interceptors-referral errors 27000 - 27999
+ // apacheds-interceptors-schema errors 28000 - 28999
+ // 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"),
+
+ // 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-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
+ // apacheds-wrapper errors 48000 - 48999
+ // apacheds-xdbm-partition errors 49000 - 49999
+
ERR_1("ERR_1"),
ERR_2("ERR_2"),
ERR_3("ERR_3"),
@@ -99,10 +181,6 @@ public enum I18n
ERR_62("ERR_62"),
ERR_63("ERR_63"),
ERR_64("ERR_64"),
- ERR_65("ERR_65"),
- ERR_66("ERR_66"),
- // ERR_67( "ERR_67" ),
- ERR_68("ERR_68"),
ERR_69("ERR_69"),
ERR_70("ERR_70"),
ERR_71("ERR_71"),
@@ -146,7 +224,6 @@ public enum I18n
// ERR_109( "ERR_109" ),
// ERR_110( "ERR_110" ),
// ERR_111( "ERR_111" ),
- ERR_112_COULD_NOT_CREATE_DIRECTORY("ERR_112_COULD_NOT_CREATE_DIRECTORY"),
ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY("ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY"),
ERR_114("ERR_114"),
ERR_115("ERR_115"),
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 78af2bc394..ffb792572b 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
@@ -22,6 +22,88 @@
# Default error code translations comes here
#
+# apacheds-core errors 0 - 999
+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}
+
+# 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
+
+# apacheds-core-constants errors 4000 - 4999
+
+# apacheds-core-integ errors 5000 - 5999
+
+# apacheds-core-jndi errors 6000 - 6999
+
+# apacheds-core-shared errors 7000 - 7999
+
+# apacheds-http-directory-bridge errors 8000 - 8999
+
+# apacheds-http-integration errors 9000 - 9999
+
+# 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
+# apacheds-interceptors-authn errors 14000 - 14999
+# apacheds-interceptors-authz errors 15000 - 15999
+# apacheds-interceptors-changelog errors 16000 - 16999
+# apacheds-interceptors-collective errors 17000 - 17999
+# apacheds-interceptors-event errors 18000 - 18999
+# apacheds-interceptors-exception errors 19000 - 19999
+# apacheds-interceptors-hash errors 20000 - 20999
+# apacheds-interceptors-journal errors 21000 - 21999
+# apacheds-interceptors-logger errors 22000 - 22999
+# apacheds-interceptors-normalization errors 23000 - 23999
+# apacheds-interceptors-number errors 24000 - 24999
+# apacheds-interceptors-operational errors 25000 - 25999
+# apacheds-interceptors-ppolicy errors 26000 - 26999
+# apacheds-interceptors-referral errors 27000 - 27999
+# apacheds-interceptors-schema errors 28000 - 28999
+# 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
+
+# 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
+# apacheds-wrapper errors 48000 - 48999
+# apacheds-xdbm-partition errors 49000 - 49999
+
ERR_1=Failed to identify OID for: {0}
ERR_2=A system index on attribute {0} ({1}) does not exist!
ERR_3=A user index on attribute {0} ({1}) does not exist!
@@ -86,10 +168,6 @@ ERR_61=Entry {0} contains more than one STRUCTURAL ObjectClass: {1}
ERR_62=Entry {0} does not have the {1} attributeType, which is part of the RDN";
ERR_63=The value stored in a not Human Readable attribute as a String should be convertible to a byte[]
ERR_64=The value is not valid. It should be a String or a byte[]
-ERR_65=Failed to access certificate in DIT.
-ERR_66=Failed on attempt to compare certificate bytes to determine alias.
-# ERR_67=
-ERR_68=Failed on attempt to extract key.
ERR_69=Exception while searching the DIT for class: {0}
ERR_70=Encountered failure while searching directory for class: {0}
ERR_71=failed to parse the new subtreeSpecification
@@ -133,7 +211,6 @@ ERR_91=Attempt to destroy wrapped partition failed.
# ERR_109=
# ERR_110=
# ERR_111=
-ERR_112_COULD_NOT_CREATE_DIRECTORY=Could not create directory {0}
ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY=Could not delete file or directory {0}
ERR_114=Unable to create a DirectoryService instance for unknow reason
ERR_115=Failed to delete the working directory.
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 039a542808..c13efd274c 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 final class MojoHelperUtils
if ( !dest.mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, dest ) );
+ throw new IOException( I18n.err( I18n.ERR_11000_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 b1bc5ca3fd..10daaa7e50 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 class ArchiveInstallerCommand extends LinuxInstallerCommand<ArchiveTarget
// will be packaged to form the installer
if ( !getTargetDirectory().mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_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 0001d7b9a6..f3e39ef1e8 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 class BinInstallerCommand extends LinuxInstallerCommand<BinTarget>
// Creating the target directory
if ( !getTargetDirectory().mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -104,7 +104,7 @@ public class BinInstallerCommand extends LinuxInstallerCommand<BinTarget>
if ( !instanceDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, instanceDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, instanceDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -130,7 +130,7 @@ public class BinInstallerCommand extends LinuxInstallerCommand<BinTarget>
if ( !binShDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, binShDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_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 c9f919e8b5..4a2e157939 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 class DebInstallerCommand extends LinuxInstallerCommand<DebTarget>
if ( !getTargetDirectory().mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -119,7 +119,7 @@ public class DebInstallerCommand extends LinuxInstallerCommand<DebTarget>
if ( !debEtcInitdDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, debEtcInitdDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, debEtcInitdDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -139,7 +139,7 @@ public class DebInstallerCommand extends LinuxInstallerCommand<DebTarget>
if ( !debDebianDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, debDebianDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_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 d49b218379..bf4c01a763 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 class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !targetDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -223,7 +223,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, pkgRootDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgRootDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -232,7 +232,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootUsrBinDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, pkgRootUsrBinDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgRootUsrBinDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -242,7 +242,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootUsrLocalApachedsDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootUsrLocalApachedsDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -252,7 +252,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootInstancesDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgRootInstancesDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -261,7 +261,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootInstancesDefaultDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootInstancesDefaultDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -272,7 +272,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootInstancesDefaultConfDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootInstancesDefaultConfDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -282,7 +282,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootInstancesDefaultDirectoryLog.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootInstancesDefaultDirectoryLog ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -293,7 +293,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootInstancesDefaultDirectoryPartitions.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootInstancesDefaultDirectoryPartitions ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -303,7 +303,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootInstancesDefaultDirectoryRun.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootInstancesDefaultDirectoryRun ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -313,7 +313,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgRootLibraryLaunchDaemons.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgRootLibraryLaunchDaemons ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -342,7 +342,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgResourcesEnglishDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY,
pkgResourcesEnglishDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
@@ -352,7 +352,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !pkgScriptsDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, pkgScriptsDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, pkgScriptsDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -415,7 +415,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !dmgDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, dmgDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, dmgDirectory ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -427,7 +427,7 @@ public class MacOsXPkgInstallerCommand extends AbstractMojoCommand<MacOsXPkgTarg
if ( !dmgDmgBackgroundDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, dmgDmgBackgroundDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_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 3344718434..212070b60f 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 class NsisInstallerCommand extends AbstractMojoCommand<NsisTarget>
if ( !targetDirectory.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, targetDirectory ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_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 4db8f6b685..96bf16d7bb 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 class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
// Creating the target directory
if ( !getTargetDirectory().mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, getTargetDirectory() ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -105,7 +105,7 @@ public class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
if ( !rpmBuild.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, rpmBuild ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmBuild ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -114,7 +114,7 @@ public class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
if ( !rpmRpms.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, rpmRpms ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmRpms ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -123,7 +123,7 @@ public class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
if ( !rpmSources.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, rpmSources ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmSources ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -132,7 +132,7 @@ public class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
if ( !rpmSpecs.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, rpmSpecs ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmSpecs ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
@@ -141,7 +141,7 @@ public class RpmInstallerCommand extends LinuxInstallerCommand<RpmTarget>
if ( !rpmSrpms.mkdirs() )
{
- Exception e = new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, rpmSrpms ) );
+ Exception e = new IOException( I18n.err( I18n.ERR_11000_COULD_NOT_CREATE_DIRECTORY, rpmSrpms ) );
log.error( e.getLocalizedMessage() );
throw new MojoFailureException( e.getMessage() );
}
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 a15f8ca44e..5064e25725 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 @@ public class JdbmPartition extends AbstractBTreePartition
if ( !partitionDir.exists() && !partitionDir.mkdirs() )
{
- throw new LdapOtherException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, partitionDir ) );
+ throw new LdapOtherException( I18n.err( I18n.ERR_31000_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 384f2bbdfc..883dedceb1 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 @@ public class LdifPartition extends AbstractLdifPartition
// We have to create the entry if it does not have a parent
if ( !dir.mkdir() )
{
- throw new LdapException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, dir ) );
+ throw new LdapException( I18n.err( I18n.ERR_33000_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 34c54d0ef2..1ffeb9a285 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 @@ public class MavibotPartition extends AbstractBTreePartition
if ( !partitionDir.exists() && !partitionDir.mkdirs() )
{
- throw new LdapOtherException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, partitionDir ) );
+ throw new LdapOtherException( I18n.err( I18n.ERR_34000_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 acd7d423a0..75051b6c5c 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 class SyncReplRequestHandler implements ReplicationRequestHandler
if ( !syncReplData.exists() && !syncReplData.mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, syncReplData ) );
+ throw new IOException( I18n.err( I18n.ERR_38000_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 8ab8bbe96c..38240e5e12 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 final class LdifConfigExtractor
LOG.debug( "creating non existing output directory {}", outputDirectory.getAbsolutePath() );
if ( !outputDirectory.mkdir() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, outputDirectory ) );
+ throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, outputDirectory ) );
}
}
@@ -96,7 +96,7 @@ public final class LdifConfigExtractor
LOG.debug( "creating non existing config directory {}", configDirectory.getAbsolutePath() );
if ( !configDirectory.mkdir() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, configDirectory ) );
+ throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, configDirectory ) );
}
}
else if ( !overwrite )
@@ -137,7 +137,7 @@ public final class LdifConfigExtractor
if ( !destination.getParentFile().exists() && !destination.getParentFile().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, destination.getParentFile() ) );
+ throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY, destination.getParentFile() ) );
}
if ( !source.getParentFile().exists() )
@@ -185,7 +185,7 @@ public final class LdifConfigExtractor
if ( !destination.getParentFile().exists() && !destination.getParentFile().mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY,
+ throw new IOException( I18n.err( I18n.ERR_42000_COULD_NOT_CREATE_DIRECTORY,
destination.getParentFile() ) );
}
@@ -283,7 +283,7 @@ public final class LdifConfigExtractor
if ( !configDir.mkdir() )
{
throw new RuntimeException(
- new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, configDir ) ) );
+ new IOException( I18n.err( I18n.ERR_42000_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 ca609fc2b7..36b1183efb 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 class ApacheDsService
if ( !partitionsDir.mkdirs() )
{
- throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECTORY, partitionsDir ) );
+ throw new IOException( I18n.err( I18n.ERR_45000_COULD_NOT_CREATE_DIRECTORY, partitionsDir ) );
}
}