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/20 19:17:06 UTC
(directory-server) branch master updated (5123547aa7 -> de205999bd)
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
from 5123547aa7 Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
new 5ec54ffe4a Partial fix for DIRSERVER-1728: server-jndi
new de205999bd Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
i18n/src/main/java/org/apache/directory/server/i18n/I18n.java | 5 +++--
.../resources/org/apache/directory/server/i18n/errors.properties | 5 +++--
.../java/org/apache/directory/server/configuration/ApacheDS.java | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
(directory-server) 01/02: Partial fix for DIRSERVER-1728: server-jndi
Posted by el...@apache.org.
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
commit 5ec54ffe4a26c23a75291815985e4251faa2926d
Merge: 6de8e2f09a dfdee686df
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Tue Aug 20 18:49:39 2024 +0200
Partial fix for DIRSERVER-1728: server-jndi
i18n/src/main/java/org/apache/directory/server/i18n/I18n.java | 5 +++--
.../resources/org/apache/directory/server/i18n/errors.properties | 5 +++--
.../java/org/apache/directory/server/configuration/ApacheDS.java | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --cc i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
index 96b07d1f33,e3e7e6568b..2c5a1a0d2a
--- a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
@@@ -388,6 -354,6 +388,9 @@@ public enum I18
// apacheds-server-integ errors 43000 - 43999
// apacheds-server-jndi errors 44000 - 44999
++ ERR_44000_COULD_NOT_GET_CANONICAL_PATH("ERR_44000_COULD_NOT_GET_CANONICAL_PATH"),
++ ERR_44001_CANNOT_LOAD_LDIF_FILE("ERR_44001_CANNOT_LOAD_LDIF_FILE"),
++
// apacheds-service errors 45000 - 45999
// apacheds-service-builder errors 46000 - 46999
@@@ -536,8 -513,8 +539,6 @@@
ERR_176("ERR_176"),
ERR_177("ERR_177"),
ERR_178("ERR_178"),
-- ERR_179("ERR_179"),
-- ERR_180("ERR_180"),
ERR_181("ERR_181"),
ERR_182("ERR_182"),
ERR_183("ERR_183"),
diff --cc i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
index 1566ee6045,c39266a5ba..20622aa2b6
--- a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
+++ b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
@@@ -381,6 -348,6 +381,9 @@@ ERR_40003_INVALID_KRB5KEY_VALUE=Accoun
# apacheds-server-integ errors 43000 - 43999
# apacheds-server-jndi errors 44000 - 44999
++ERR_44000_COULD_NOT_GET_CANONICAL_PATH=could not get canonical path
++ERR_44001_CANNOT_LOAD_LDIF_FILE=Cannot load the ldif file ''{0}'', error \: {1}
++
# apacheds-service errors 45000 - 45999
# apacheds-service-builder errors 46000 - 46999
@@@ -554,8 -532,8 +557,6 @@@ ERR_175=failed to close strea
ERR_176=Error closing NamingEnumeration on PSearchListener
ERR_177=Error closing connection on PSearchListener
ERR_178=PSearchListener encountered error
--ERR_179=could not get canonical path
--ERR_180=Cannot load the ldif file ''{0}'', error \: {1}
ERR_181=Failed to run the class {0}
ERR_182=Failed to run the method {0}
ERR_183=Error while scanning index on attribute {0} using a {1} cursor type with a key constraint of ''{2}''\:\n" + {3}
diff --cc server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
index 90ecf6a54e,90ecf6a54e..db538fd5b6
--- a/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
+++ b/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
@@@ -332,7 -332,7 +332,7 @@@ public class ApacheD
}
catch ( IOException e )
{
-- LOG.error( I18n.err( I18n.ERR_179 ), e );
++ LOG.error( I18n.err( I18n.ERR_44000_COULD_NOT_GET_CANONICAL_PATH ), e );
return null;
}
@@@ -417,7 -417,7 +417,7 @@@
{
// If the file can't be read, log the error, and stop
// loading LDIFs.
-- LOG.error( I18n.err( I18n.ERR_180, ldifDirectory.getAbsolutePath(), ne.getLocalizedMessage() ) );
++ LOG.error( I18n.err( I18n.ERR_44001_CANNOT_LOAD_LDIF_FILE, ldifDirectory.getAbsolutePath(), ne.getLocalizedMessage() ) );
throw new LdapException( ne.getMessage(), ne );
}
}
@@@ -464,7 -464,7 +464,7 @@@
{
// If the file can't be read, log the error, and stop
// loading LDIFs.
-- LOG.error( I18n.err( I18n.ERR_180, ldifFile.getAbsolutePath(), ne.getLocalizedMessage() ) );
++ LOG.error( I18n.err( I18n.ERR_44001_CANNOT_LOAD_LDIF_FILE, ldifFile.getAbsolutePath(), ne.getLocalizedMessage() ) );
throw new LdapException( ne.getMessage(), ne );
}
}
(directory-server) 02/02: Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
Posted by el...@apache.org.
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
commit de205999bdc3cb79726901ec0f6af5872fe15259
Merge: 5ec54ffe4a 5123547aa7
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Tue Aug 20 21:16:54 2024 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server