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/19 14:26:22 UTC
(directory-server) branch master updated: Partial fix for DIRSERVER_1728: http-integration and core-avl
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 ac03f11e57 Partial fix for DIRSERVER_1728: http-integration and core-avl
ac03f11e57 is described below
commit ac03f11e57c7844bbbd92fdb2ae33ce6533dc864
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon Aug 19 16:26:18 2024 +0200
Partial fix for DIRSERVER_1728: http-integration and core-avl
---
.../directory/server/integration/http/HttpServer.java | 4 ++--
.../main/java/org/apache/directory/server/i18n/I18n.java | 4 ++--
.../org/apache/directory/server/i18n/errors.properties | 5 +++--
.../partition/impl/btree/jdbm/KeyTupleBTreeCursor.java | 8 ++++----
.../impl/btree/mavibot/KeyTupleValueCursor.java | 16 ++++++++--------
.../partition/impl/btree/mavibot/ValueTreeCursor.java | 10 +++++-----
.../directory/server/xdbm/KeyTupleArrayCursor.java | 8 ++++----
7 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
index 5254dac1fd..4afe62ed75 100644
--- a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
+++ b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
@@ -130,7 +130,7 @@ public class HttpServer
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_120 ) );
+ LOG.error( I18n.err( I18n.ERR_09000_FAILETO_CONFIGURE_JETTY_SERVER ) );
throw e;
}
}
@@ -283,7 +283,7 @@ public class HttpServer
}
catch ( Exception e )
{
- LOG.error( I18n.err( I18n.ERR_121 ), e );
+ LOG.error( I18n.err( I18n.ERR_09001_FAILED_TO_CONFIGURE_WEB_APPLICATION ), e );
}
}
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 58c49dd8a7..281de91f91 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
@@ -228,6 +228,8 @@ public enum I18n
// apacheds-http-directory-bridge errors 8000 - 8999
// apacheds-http-integration errors 9000 - 9999
+ ERR_09000_FAILETO_CONFIGURE_JETTY_SERVER("ERR_09000_FAILETO_CONFIGURE_JETTY_SERVER"),
+ ERR_09001_FAILED_TO_CONFIGURE_WEB_APPLICATION("ERR_09001_FAILED_TO_CONFIGURE_WEB_APPLICATION"),
// apacheds-installers errors 10000 - 10999
@@ -378,8 +380,6 @@ public enum I18n
ERR_116("ERR_116"),
ERR_118("ERR_118"),
ERR_119("ERR_119"),
- ERR_120("ERR_120"),
- ERR_121("ERR_121"),
ERR_122("ERR_122"),
// ERR_123( "ERR_123" ),
ERR_124("ERR_124"),
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 c3d9c208a6..b1a2620aa6 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
@@ -217,6 +217,9 @@ ERR_03019_ALREADY_IN_ORDERED_SET_MODE=Already in ordered set mode.
# apacheds-http-directory-bridge errors 8000 - 8999
# apacheds-http-integration errors 9000 - 9999
+ERR_09000_FAILETO_CONFIGURE_JETTY_SERVER=Failed to configure the jetty http server
+ERR_09001_FAILED_TO_CONFIGURE_WEB_APPLICATION=Failed to configure the web application(s)
+
# apacheds-installers errors 10000 - 10999
@@ -368,8 +371,6 @@ ERR_115=Failed to delete the working directory.
ERR_116=Failed to delete\:
ERR_118=Error encountered while delivering notifications.
ERR_119=Encountered exception during event handling.
-ERR_120=Failed to configure the jetty http server
-ERR_121=Failed to configure the web application(s)
ERR_122=Error encoding EncryptionKey.
# ERR_123=
ERR_124=Failed to close an index.
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
index 03d3c2122d..c8dfc37e45 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
@@ -102,7 +102,7 @@ public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
public void beforeKey( K key ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -111,7 +111,7 @@ public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
*/
public void afterKey( K key ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -123,7 +123,7 @@ public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
checkNotClosed();
if ( key != null && !key.equals( this.key ) )
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
browser = btree.browse( value );
@@ -139,7 +139,7 @@ public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
if ( key != null && !key.equals( this.key ) )
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
try
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
index 7ed0392e75..9d41d36b0c 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
@@ -90,25 +90,25 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
public void beforeKey( K key ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
public void afterKey( K key ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
public void beforeValue( K key, V value ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
public void afterValue( K key, V value ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -123,7 +123,7 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
*/
public void before( Tuple<K, V> element ) throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -132,7 +132,7 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
*/
public void after( Tuple<K, V> element ) throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -157,7 +157,7 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
*/
public boolean first() throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -166,7 +166,7 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
*/
public boolean last() throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/ValueTreeCursor.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/ValueTreeCursor.java
index 1ff606913d..697faf8545 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/ValueTreeCursor.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/ValueTreeCursor.java
@@ -62,14 +62,14 @@ public class ValueTreeCursor<V> extends AbstractCursor<V>
@Override
public void before( V element ) throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@Override
public void after( V element ) throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -82,21 +82,21 @@ public class ValueTreeCursor<V> extends AbstractCursor<V>
@Override
public void afterLast() throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@Override
public boolean first() throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@Override
public boolean last() throws LdapException, CursorException
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
diff --git a/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java b/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java
index 5844a46549..70c7b3d636 100644
--- a/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java
+++ b/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java
@@ -90,13 +90,13 @@ public class KeyTupleArrayCursor<K, V> extends AbstractCursor<Tuple<K, V>>
public void beforeKey( K key ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
public void afterKey( K key ) throws Exception
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
@@ -105,7 +105,7 @@ public class KeyTupleArrayCursor<K, V> extends AbstractCursor<Tuple<K, V>>
checkNotClosed();
if ( key != null && !key.equals( this.key ) )
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
wrapped.before( value );
@@ -118,7 +118,7 @@ public class KeyTupleArrayCursor<K, V> extends AbstractCursor<Tuple<K, V>>
checkNotClosed();
if ( key != null && !key.equals( this.key ) )
{
- throw new UnsupportedOperationException( I18n.err( I18n.ERR_446 ) );
+ throw new UnsupportedOperationException( I18n.err( I18n.ERR_03010_CURSOR_LOCK_KEY ) );
}
wrapped.after( value );